Merge branch 'main' into paypal

Author: hirale

.all-contributorsrc

@@ -1707,6 +1707,24 @@
       "contributions": [
         "bug"
       ]
+    },
+    {
+      "login": "warleyelias",
+      "name": "Warley Elias",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5356619?v=4",
+      "profile": "https://www.linkedin.com/in/warley-elias-531a4116/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "vernad",
+      "name": "vernad",
+      "avatar_url": "https://avatars.githubusercontent.com/u/51973447?v=4",
+      "profile": "https://github.com/vernad",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "commitType": "docs"

.ddev/commands/web/openmage-install

@@ -3,8 +3,8 @@
 ## ProjectTypes: magento
 ## Description: Install OpenMage
 ## Usage: openmage-install [-d|--default] [-s|--sampledata] [-k|--keep] [-q|--quiet]
-## Example: ddev openmage-install -d -s -k
-## Flags: [{"Name":"default","Shorthand":"d","Usage":"use default values"},{"Name":"sampledata","Shorthand":"s","Usage":"install sample data"},{"Name":"keep","Shorthand":"k","Usage":"keep sample data package"},{"Name":"quiet","Shorthand":"q","Usage":"silent install with sample data"}]
+## Example: ddev openmage-install -d -s -k -x
+## Flags: [{"Name":"default","Shorthand":"d","Usage":"use default values"},{"Name":"sampledata","Shorthand":"s","Usage":"install sample data"},{"Name":"keep","Shorthand":"k","Usage":"keep sample data package"},{"Name":"quiet","Shorthand":"q","Usage":"silent install with sample data"},{"Name":"extra","Shorthand":"x","Usage":"install with updated sample data (ddev)"}]
 
 ROOT="${PWD}"
 
@@ -26,6 +26,8 @@ while :; do
             USE_DEFAULT_FLAG='true'
             SAMPLE_DATA_FLAG='true'
             ;;
+         -x|--extra)
+            SAMPLE_DATA_EXTRA_FLAG='true' ;;
          --)              # End of all options.
              shift
              break
@@ -69,10 +71,14 @@ else
 fi
 
 if [[ $INSTALL_SAMPLE_DATA =~ ^(yes|y) ]]; then
-  SAMPLE_DATA_URL=https://github.com/Vinai/compressed-magento-sample-data/raw/master/compressed-magento-sample-data-1.9.2.4.tgz
   SAMPLE_DATA_DIRECTORY="${ROOT}/.ddev/.sampleData"
+
+  SAMPLE_DATA_URL=https://github.com/Vinai/compressed-magento-sample-data/raw/master/compressed-magento-sample-data-1.9.2.4.tgz
   SAMPLE_DATA_FILE=sample_data.tgz
 
+  SAMPLE_DATA_OM_URL=https://github.com/sreichel/openmage-sample-data/blob/main/src/sample-data.sql?raw=true
+  SAMPLE_DATA_OM_FILE=sample_data_om.sql
+
   if [[ ! -d "${SAMPLE_DATA_DIRECTORY}" ]]; then
     echo "Creating Sample Data directory..."
     mkdir -p "${SAMPLE_DATA_DIRECTORY}"
@@ -84,6 +90,13 @@ if [[ $INSTALL_SAMPLE_DATA =~ ^(yes|y) ]]; then
     wget "${SAMPLE_DATA_URL}" -O "${SAMPLE_DATA_FILE}"
   fi
 
+if [[ "${SAMPLE_DATA_EXTRA_FLAG}" ]]; then
+  if [[ ! -f "${SAMPLE_DATA_DIRECTORY}/${SAMPLE_DATA_OM_FILE}" ]]; then
+    echo "Downloading extra Sample Data..."
+    wget "${SAMPLE_DATA_OM_URL}" -O "${SAMPLE_DATA_OM_FILE}"
+  fi
+fi
+
   echo "Uncompressing Sample Data..."
   tar xf "${SAMPLE_DATA_FILE}"
 
@@ -96,14 +109,18 @@ if [[ $INSTALL_SAMPLE_DATA =~ ^(yes|y) ]]; then
   rm -rf "${ROOT}"/"${DDEV_DOCROOT}/var/cache/"*
 
   echo "Importing Sample Data into the database..."
-  mysql -u db -pdb -h db db < "${SAMPLE_DATA_DIRECTORY}"/magento-sample-data-1.9.2.4/magento_sample_data_for_1.9.2.4.sql
+  if [[ "${SAMPLE_DATA_EXTRA_FLAG}" ]]; then
+    mysql -u db -pdb -h db db < "${SAMPLE_DATA_DIRECTORY}/${SAMPLE_DATA_OM_FILE}"
+  else
+    mysql -u db -pdb -h db db < "${SAMPLE_DATA_DIRECTORY}"/magento-sample-data-1.9.2.4/magento_sample_data_for_1.9.2.4.sql
+  fi
 
   # 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/
+    rm -rf "${SAMPLE_DATA_DIRECTORY}"/magento-sample-data-1.9.2.4/
   else
     cd "${ROOT}" || exit
     echo "Removing sample data..."

.ddev/commands/web/vendor-patches

@@ -4,4 +4,4 @@
 ## Usage: vendor-patches
 ## Example: ddev vendor-patches
 
-php vendor/bin/vendor-patches generate
+php vendor/bin/vendor-patches generate --patches-folder=.vendor-patches "$@"

.github/labeler.yml

@@ -939,5 +939,6 @@
 'cypress':
   - changed-files:
       - any-glob-to-any-file: [
-        cypress/*
+        cypress/*,
+        cypress/**/*
       ]

.github/release-drafter.yml

@@ -4,15 +4,18 @@ categories:
   - title: '🚨 Security'
     labels:
       - 'security'
-  - title: '🚀 Features'
-    labels:
-      - 'enhancement'
-      - 'new feature'
   - title: '🐛 Bug Fixes'
     labels:
       - 'fix'
       - 'bugfix'
       - 'bug'
+  - title: '🚀 Features'
+    labels:
+      - 'new feature'
+  - title: '🦾 Enhancements'
+    labels:
+      - 'enhancement'
+      - 'improvement'
   - title: '📖 Documentation'
     labels:
       - 'documentation'

.github/workflows/codeql-analysis.yml

@@ -38,7 +38,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         config-file: ./.github/codeql-config.yml
@@ -53,7 +53,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -66,6 +66,6 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/cypress.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: [ubuntu-latest]
     strategy:
       matrix:
-        webserver: ['apache-fpm', 'nginx-fpm']
+        webserver: ['nginx-fpm']
 
     steps:
       - uses: actions/checkout@v5
@@ -21,7 +21,7 @@ jobs:
           autostart: false
 
       # install DDEV configuration
-      - run: ddev config --project-type=magento --php-version=8.1 --webserver-type=${{ matrix.webserver }}
+      - run: ddev config --project-type=magento --php-version=8.1 --webserver-type=${{ matrix.webserver }} --web-environment="MAGE_IS_DEVELOPER_MODE=1,OPENMAGE_CONFIG_OVERRIDE_ALLOWED=1,OPENMAGE_CONFIG__DEFAULT__GENERAL__STORE_INFORMATION__NAME=ENV name default,OPENMAGE_CONFIG__WEBSITES__BASE__GENERAL__STORE_INFORMATION__PHONE=ENV phone website,OPENMAGE_CONFIG__STORES__GERMAN__GENERAL__STORE_INFORMATION__ADDRESS=ENV address store"
 
       # install composer dependencies
       - run: ddev composer install
@@ -37,3 +37,10 @@ jobs:
 
         # run cypress
       - run: ddev cypress-run --config-file .cypress.config.js
+
+      - name: Upload screenshots
+        uses: actions/upload-artifact@v5
+        if: ${{ !success() }}
+        with:
+          name: cypress-screenshots
+          path: cypress/screenshots

.github/workflows/phpunit.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['8.1', '8.4']
+        php-versions: ['8.1', '8.5']
         mysql-version: ['5.7', '8.0', '8.4']
 
     services:

.github/workflows/spellcheck.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v5
       - name: Check Spelling
-        uses: rojopolis/spellcheck-github-actions@0.52.0
+        uses: rojopolis/spellcheck-github-actions@0.54.0
         with:
           config_path: .github/spellcheck.yml
           task_name: Markdown

.github/workflows/syntax-php.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        php: ['8.1', '8.4']
+        php: ['8.1', '8.5']
 
     name: PHP Syntax ${{ matrix.php }}