Merge branch 'main' into phpunit-dates

# Conflicts:
#	.rector.php
#	app/code/core/Mage/Reports/Model/Resource/Report/Collection.php
#	composer.lock

.all-contributorsrc

@@ -9,7 +9,7 @@
   "imageSize": 35,
   "commit": true,
   "commitConvention": "none",
-  "contributorsPerLine": 20
+  "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",
@@ -20,7 +20,8 @@
       "avatar_url": "https://avatars1.githubusercontent.com/u/5022236?v=4",
       "profile": "https://magento.stackexchange.com/users/46249/sv3n",
       "contributions": [
-        "code"
+        "code",
+        "maintenance"
       ]
     },
     {
@@ -1476,5 +1477,5 @@
       ]
     }
   ],
-  "contributorsPerLine": 7
+  "commitType": "docs"
 }

.github/workflows/update-phpstorm-meta.yml

@@ -0,0 +1,60 @@
+name: Update PhpStorm Meta-Files
+
+on:
+  # Run automatically every month.
+  schedule:
+    - cron: '0 0 1 * *'
+  workflow_call:
+  # Allow manually triggering the workflow.
+  workflow_dispatch:
+
+jobs:
+  update_copyright:
+    name: Update Copyright
+    runs-on: [ubuntu-latest]
+
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          fetch-depth: 0
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache dependencies
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-*
+
+      - name: Install n98/magerun
+        run: composer require --dev n98/magerun:dev-develop
+
+      - name: Update PhpStorm Meta-Files
+        run: php -f vendor/bin/n98-magerun dev:ide:phpstorm:meta
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v7
+        with:
+          commit-message: update copyright
+          title: pdated PhpStorm Meta-Files
+          body: |
+            - Updated PhpStorm Meta-Files
+            
+            Thanks to [n98/magerun][1]
+            
+            [1]: https://github.com/netz98/n98-magerun
+          branch: phpstorm-meta
+          base: main

.gitignore

@@ -24,7 +24,7 @@
 /lib/Credis
 
 # TinyMCE library
-/js/tinymce
+/js/lib/tinymce
 
 # Add development environment setup files and README
 # https://github.com/OpenMage/magento-lts/pull/1012