[pull] 5.7 from shopware:5.7

.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');
+        }
+    })
+;

.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

.envrc

@@ -0,0 +1,4 @@
+watch_file devenv.nix 
+watch_file devenv.yaml 
+watch_file devenv.lock
+eval "$(devenv print-dev-env)"

.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

.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

.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

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.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

.github/check-mysql.sh

@@ -0,0 +1,4 @@
+while ! mysqladmin ping -u shopware -pshopware; do
+    echo Check mysql
+	sleep 5
+done

.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);

.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 "$@"