Merge branch 'main' into patch-17

Author: sreichel

.all-contributorsrc

@@ -6,11 +6,13 @@
   "files": [
     "README.md"
   ],
-  "imageSize": 100,
+  "imageSize": 35,
   "commit": true,
   "commitConvention": "none",
+  "contributorsPerLine": 20
   "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",

.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

.github/PULL_REQUEST_TEMPLATE.md

@@ -17,13 +17,14 @@
 
 ### Related Pull Requests
 <!-- related pull request placeholder -->
+- see OpenMage/magento-lts#<issue_number>
 
 ### Fixed Issues (if relevant)
 <!---
     If relevant, please provide a list of fixed issues in the format OpenMage/magento-lts#<issue_number>.
     There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
 -->
-1. Fixes OpenMage/magento-lts#<issue_number>
+- fixes OpenMage/magento-lts#<issue_number>
 
 ### Manual testing scenarios (*)
 <!---
@@ -43,11 +44,3 @@
  - [ ] Pull request has a meaningful description of its purpose
  - [ ] All commits are accompanied by meaningful commit messages
  - [ ] All automated tests passed successfully (all builds are green)
- - [ ] Add yourself to contributors list
- <!--- 
-    Install: `yarn add --dev all-contributors-cli`
-    Add yourself: `yarn all-contributors add @YOUR_NAME <types>`
-    This updates `.all-contributorsrc, README.md` and commits this changes automatically
-    contribution types: code, doc, design
-    See other contributions type at https://allcontributors.org/docs/en/emoji-key
- -->

.github/labeler.yml

@@ -5,6 +5,13 @@
       .github/**/*
     ]
 
+'git':
+  - changed-files:
+    - any-glob-to-any-file: [
+      .gitattributes,
+      .gitignore
+    ]
+
 'htaccess':
   - changed-files:
     - any-glob-to-any-file: [
@@ -861,7 +868,15 @@
 'Documentation':
   - changed-files:
     - any-glob-to-any-file: [
-      '*.md'
+      docs/*.md,
+      docs/**/*.md,
+      docs_includes/*.md
+    ]
+
+'README':
+  - changed-files:
+    - any-glob-to-any-file: [
+      README.md
     ]
 
 'PHPStorm':
@@ -884,19 +899,26 @@
       .github/workflows/php-cs-fixer.yml
     ]
 
+'phpmd':
+  - changed-files:
+    - any-glob-to-any-file: [
+      .phpmd*,
+      .github/workflows/phpmd.yml
+    ]
+
 'phpstan':
   - changed-files:
     - any-glob-to-any-file: [
       .phpstan*,
-      phpstan*,
       .github/workflows/phpstan.yml
     ]
 
 'phpunit':
   - changed-files:
     - any-glob-to-any-file: [
-      phpunit*,
+      .phpunit*,
       tests/*,
+      tests/**/*,
       .github/workflows/phpunit.yml
     ]
 
@@ -910,6 +932,6 @@
 'rector':
   - changed-files:
       - any-glob-to-any-file: [
-        rector.php,
+        .rector.php,
         .github/workflows/rector.yml
       ]

.github/release-drafter.yml

@@ -0,0 +1,35 @@
+name-template: 'v$RESOLVED_VERSION 🌈'
+tag-template: 'v$RESOLVED_VERSION'
+categories:
+  - title: '🚀 Features'
+    labels:
+      - 'enhancement'
+      - 'new feature'
+  - title: '🐛 Bug Fixes'
+    labels:
+      - 'fix'
+      - 'bugfix'
+      - 'bug'
+  - title: '📖 Documentation'
+    labels:
+      - 'Documentation'
+  - title: '↗️ Dependencies'
+    labels:
+      - 'dependencies'
+change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
+change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
+version-resolver:
+  major:
+    labels:
+      - 'major'
+  minor:
+    labels:
+      - 'minor'
+  patch:
+    labels:
+      - 'patch'
+  default: patch
+template: |
+  ## Changes
+
+  $CHANGES

.github/workflows/check-files.yml

@@ -12,6 +12,9 @@ on:
       php:
         description: "Count changed PHP files"
         value: ${{ jobs.check.outputs.php }}
+      phtml:
+        description: "Count changed Template files"
+        value: ${{ jobs.check.outputs.phtml }}
       xml:
         description: "Count changed XML files"
         value: ${{ jobs.check.outputs.xml }}
@@ -24,6 +27,9 @@ on:
       php-cs-fixer:
         description: "Count changed PHP-CS-Fixer files"
         value: ${{ jobs.check.outputs.php-cs-fixer }}
+      phpmd:
+        description: "Count changed PHPMD files"
+        value: ${{ jobs.check.outputs.phpmd }}
       phpstan:
         description: "Count changed PHPStan files"
         value: ${{ jobs.check.outputs.phpstan }}
@@ -44,10 +50,12 @@ jobs:
       composer: ${{ steps.changes-composer.outputs.composer }}
       js: ${{ steps.changes-js.outputs.js }}
       php: ${{ steps.changes-php.outputs.php }}
+      phtml: ${{ steps.all.outputs.phtml }}
       xml: ${{ steps.changes-xml.outputs.xml }}
       workflow: ${{ steps.changes-workflow.outputs.workflow }}
       phpcs: ${{ steps.changes-phpcs.outputs.phpcs }}
       php-cs-fixer: ${{ steps.changes-php-cs-fixer.outputs.php-cs-fixer }}
+      phpmd: ${{ steps.changes-phpstan.outputs.phpmd }}
       phpstan: ${{ steps.changes-phpstan.outputs.phpstan }}
       phpunit-test: ${{ steps.changes-phpunit-test.outputs.phpunit-test }}
       phpunit: ${{ steps.changes-phpunit.outputs.phpunit }}
@@ -77,13 +85,15 @@ jobs:
             composer.*
             *.php
             **/*.php
+            **/*.phtml
             **/*.xml
             **/*.js
             .github/workflows/**
             **phpcs**
             **php-cs-fixer**
+            **phpmd**
             **phpstan**
-            rector.php
+            .rector.php
             tests/
             phpunit*
 
@@ -113,6 +123,14 @@ jobs:
           echo "$count PHP file(s) changed"
           echo "php=$count" >> $GITHUB_OUTPUT
 
+      - name: Check if Template files changed
+        id: changes-phtml
+        if: steps.changed-files-specific.outputs.any_modified == 'true'
+        run: |
+          count="$(grep -oE "*.phtml" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
+          echo "$count Template file(s) changed"
+          echo "phtml=$count" >> $GITHUB_OUTPUT
+
       - name: Check if XML files changed
         id: changes-xml
         if: steps.changed-files-specific.outputs.any_modified == 'true'
@@ -145,6 +163,14 @@ jobs:
           echo "$count PHP-CS-Fixer file(s) changed"
           echo "php-cs-fixer=$count" >> $GITHUB_OUTPUT
 
+      - name: Check if PHPMD files changed
+        id: changes-phpmd
+        if: steps.changed-files-specific.outputs.any_modified == 'true'
+        run: |
+          count="$(grep -oE "**phpmd**" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
+          echo "$count PHPMD file(s) changed"
+          echo "phpmd=$count" >> $GITHUB_OUTPUT
+
       - name: Check if PHPStan files changed
         id: changes-phpstan
         if: steps.changed-files-specific.outputs.any_modified == 'true'
@@ -165,6 +191,6 @@ jobs:
         id: changes-phpunit
         if: steps.changed-files-specific.outputs.any_modified == 'true'
         run: |
-          count="$(grep -oE "phpunit*" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
+          count="$(grep -oE "**phpunit**" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
           echo "$count PHPUnit file(s) changed"
           echo "phpunit=$count" >> $GITHUB_OUTPUT