Merge branch 'main' into cs

# Conflicts:
#	.php-cs-fixer.dist.php
#	composer.lock
#	lib/3Dsecure/CentinelClient.php

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' \

.gitattributes

@@ -9,7 +9,6 @@
 /.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

.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

@@ -868,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':
@@ -910,6 +918,7 @@
     - any-glob-to-any-file: [
       .phpunit*,
       tests/*,
+      tests/**/*,
       .github/workflows/phpunit.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/phpcs.yml

@@ -7,19 +7,9 @@ on:
 
 jobs:
   phpcs:
-    name: ${{ matrix.rules.label }}
+    name: Validation
     runs-on: [ubuntu-latest]
 
-    strategy:
-      matrix:
-        rules:
-          - label: Default
-            path: .phpcs.dist.xml
-          - label: Ecg
-            path: .phpcs.dist.ecg.xml
-          - label: PhpCompatibility
-            path: .phpcs.dist.php.xml
-
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -44,4 +34,4 @@ jobs:
         run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-*
 
       - name: PHPCodeSniffer
-        run: php vendor/bin/phpcs -s -p --report=full --standard=${{ matrix.rules.path }}
+        run: php vendor/bin/phpcs -s -p --report=full --standard=.phpcs.dist.xml

.github/workflows/release-drafter.yml

@@ -0,0 +1,28 @@
+name: Release Drafter
+
+on:
+  push:
+    # branches to consider in the event; optional, defaults to all
+    branches:
+      - main
+      - next
+
+permissions:
+  contents: read
+
+jobs:
+  update_release_draft:
+    permissions:
+      # write permission is required to create a github release
+      contents: write
+      # write permission is required for autolabeler
+      # otherwise, read permission is required at least
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      # Drafts your next Release notes as Pull Requests are merged into "master"
+      - uses: release-drafter/release-drafter@v6
+        with:
+          disable-autolabeler: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/workflow.yml

@@ -121,7 +121,7 @@ jobs:
 
   rector:
     name: Rector
-    needs: [check, phpcs, php-cs-fixer]
+    needs: [check, php-cs-fixer]
     if: |
       needs.check.outputs.php > 0 ||
       needs.check.outputs.workflow > 0

.gitignore

@@ -23,10 +23,8 @@
 /app/etc/modules/Cm_RedisSession.xml
 /lib/Credis
 
-# Add Gitpod online IDE config
-# https://github.com/OpenMage/magento-lts/pull/1836
-/dev/gitpod/docker-magento
-/dev/gitpod/.env
+# TinyMCE library
+/js/tinymce
 
 # Add development environment setup files and README
 # https://github.com/OpenMage/magento-lts/pull/1012