Merge branch 'main' into drop-php7

# Conflicts:
#	.github/workflows/phpstan.yml
#	.phpstan.dist.baseline.neon
#	README.md

Author: sreichel

.all-contributorsrc

@@ -9,16 +9,19 @@
   "imageSize": 100,
   "commit": true,
   "commitConvention": "none",
+  "contributorsPerLine": 7,
   "contributorTemplate": "<a href=\"<%= contributor.profile %>\"><img src=\"<%= contributor.avatar_url %>\" loading=\"lazy\" width=\"<%= options.imageSize %>\" alt=\"\"/><br /><sub><b><%= contributor.name %></b></sub></a>",
   "badgeTemplate": "<a href=\"#contributors-\"><img src=\"https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg\" alt=\"All Contributors\"></a>",
+  "wrapperTemplate": "\n<table>\n  <tbody><%= bodyContent %>  </tbody>\n<%= tableFooterContent %></table>\n\n",
   "contributors": [
     {
       "login": "sreichel",
       "name": "sv3n",
       "avatar_url": "https://avatars1.githubusercontent.com/u/5022236?v=4",
       "profile": "https://magento.stackexchange.com/users/46249/sv3n",
       "contributions": [
-        "code"
+        "code",
+        "maintenance"
       ]
     },
     {
@@ -1472,7 +1475,16 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "bucha",
+      "name": "Alexander Buch",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1931120?v=4",
+      "profile": "http://www.cartware.de",
+      "contributions": [
+        "code"
+      ]
     }
   ],
-  "contributorsPerLine": 7
+  "commitType": "docs"
 }

.ddev/commands/web/openmage-install

@@ -43,7 +43,7 @@ while :; do
 echo "Enable maintenance mode..."
 touch maintenance.flag
 
-LOCALXML="${ROOT}/app/etc/local.xml"
+LOCALXML="${ROOT}"/"${DDEV_DOCROOT}/app/etc/local.xml"
 if [ -f "${LOCALXML}" ]; then
   if [[ "${QUIET_INSTALL_FLAG}" ]]; then
     DELETE='y'
@@ -88,21 +88,25 @@ if [[ $INSTALL_SAMPLE_DATA =~ ^(yes|y) ]]; then
   tar xf "${SAMPLE_DATA_FILE}"
 
   echo "Copying Sample Data into the OpenMage directory..."
-  cp -r magento-sample-data-1.9.2.4/media/* "${ROOT}/media/"
-  cp -r magento-sample-data-1.9.2.4/skin/* "${ROOT}/skin/"
+  cd "${ROOT}" || exit
+  cp -r "${SAMPLE_DATA_DIRECTORY}"/magento-sample-data-1.9.2.4/media/* "${ROOT}"/"${DDEV_DOCROOT}/media/"
+  cp -r "${SAMPLE_DATA_DIRECTORY}"/magento-sample-data-1.9.2.4/skin/* "${ROOT}"/"${DDEV_DOCROOT}/skin/"
 
   echo "Clearing var/cache..."
-  rm -rf "${ROOT}/var/cache/"*
+  rm -rf "${ROOT}"/"${DDEV_DOCROOT}/var/cache/"*
 
   echo "Importing Sample Data into the database..."
-  mysql -u db -h db db < "${SAMPLE_DATA_DIRECTORY}/magento-sample-data-1.9.2.4/magento_sample_data_for_1.9.2.4.sql"
+  mysql -u db -h db db < "${SAMPLE_DATA_DIRECTORY}"/magento-sample-data-1.9.2.4/magento_sample_data_for_1.9.2.4.sql
 
   # remove sample data
   if [[ "${SAMPLE_DATA_KEEP_FLAG}" ]]; then
     # shellcheck disable=SC2046
+    cd "${ROOT}" || exit
+    echo "Removing uncompressed files..."
     rm -rf magento-sample-data-1.9.2.4/
   else
     cd "${ROOT}" || exit
+    echo "Removing sample data..."
     rm -rf "${SAMPLE_DATA_DIRECTORY}"
   fi
 fi
@@ -138,7 +142,7 @@ else
   fi
 fi
 
-php -f install.php -- \
+php -f "${ROOT}"/"${DDEV_DOCROOT}/"install.php -- \
   --license_agreement_accepted 'yes' \
   --locale 'en_US' \
   --timezone 'America/New_York' \

.ddev/commands/web/phpcs

@@ -4,4 +4,4 @@
 ## Usage: phpcs
 ## Example: ddev phpcs <path-to-files>
 
-php vendor/bin/phpcs -s -p --report=full,summary "$@"
+php vendor/bin/phpcs -s -p --standard=.phpcs.dist.xml --cache=.phpcs.result.cache --report=full,summary "$@"

.ddev/commands/web/phpmd

@@ -4,4 +4,4 @@
 ## Usage: phpmd
 ## Example: ddev phpmd <path-to-files>
 
-php vendor/bin/phpmd "$@" text .phpmd.dist.xml
+php vendor/bin/phpmd "$@" text .phpmd.dist.xml --color --cache --baseline-file .phpmd.dist.baseline.xml

.ddev/commands/web/phpmd-no-baseline

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+## Description: run PHPMD
+## Usage: phpmd-no-baseline
+## Example: ddev phpmd-no-baseline <path-to-files>
+
+php vendor/bin/phpmd "$@" text .phpmd.dist.xml

.ddev/commands/web/phpunit

@@ -4,4 +4,4 @@
 ## Usage: phpunit
 ## Example: ddev phpunit
 
-php vendor/bin/phpunit --no-coverage "$@" --testdox
+php vendor/bin/phpunit --configuration .phpunit.dist.xml --no-coverage "$@" --testdox

.ddev/commands/web/phpunit-coverage

@@ -5,5 +5,5 @@
 ## Example: ddev phpunit-coverage
 
 enable_xdebug
-XDEBUG_MODE=coverage php vendor/bin/phpunit "$@" --testdox
+XDEBUG_MODE=coverage php vendor/bin/phpunit --configuration .phpunit.dist.xml --testdox "$@"
 disable_xdebug

.ddev/commands/web/phpunit-coverage-local

@@ -5,5 +5,5 @@
 ## Example: ddev phpunit-coverage-local
 
 enable_xdebug
-XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-html build/coverage "$@" --testdox
+XDEBUG_MODE=coverage php vendor/bin/phpunit --configuration .phpunit.dist.xml --coverage-html build/coverage --testdox "$@"
 disable_xdebug

.ddev/commands/web/rector

@@ -4,4 +4,4 @@
 ## Usage: rector
 ## Example: ddev rector <path-to-files>
 
-php vendor/bin/rector process "$@"
+php vendor/bin/rector process --config .rector.php "$@"

.gitattributes

@@ -3,21 +3,24 @@
 /.github export-ignore
 /dev export-ignore
 /docs export-ignore
+/docs_includes export-ignore
 /tests export-ignore
 
 /.all-contributorsrc export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/.gitpod.yml export-ignore
 
 /.php-cs-fixer.dist.php export-ignore
 /.phpcs.ecg.xml.dist export-ignore
 /.phpcs.php.xml.dist export-ignore
 /.phpcs.xml.dist export-ignore
+/.phpmd.dist.baseline.xml export-ignore
 /.phpmd.dist.xml export-ignore
 /.phpstan.dist.baseline.neon export-ignore
 /.phpstan.dist.neon export-ignore
-/rector.php export-ignore
+/.rector.php export-ignore
+
+/CNAME export-ignore
 
 /README.md export-ignore
 
@@ -35,4 +38,4 @@
 *.sql text eol=lf
 *.svg text eol=lf
 *.txt text eol=lf
-*.phtml text eol=lf
+*.phtml text eol=lf