Merge branch 'main' into topic-phpstan

# Conflicts:
#	app/code/core/Mage/Core/Model/Layout.php
#	composer.json
#	composer.lock

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",

.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':

.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/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 }}

.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

.phpcs.dist.xml

@@ -145,7 +145,9 @@
         <exclude name="Squiz.PHP.Eval.Discouraged"/>
     </rule>
 
-    <rule ref="PHPCompatibility" />
+    <rule ref="PHPCompatibility">
+        <exclude name="PHPCompatibility.Keywords.ForbiddenNamesAsDeclared.resourceFound"/>
+    </rule>
     <rule ref="PHPCompatibility.FunctionNameRestrictions.ReservedFunctionNames.MethodDoubleUnderscore">
         <exclude-pattern>*/Varien/Object.php*</exclude-pattern>
         <exclude-pattern>*/Varien/Data/Form/Abstract.php*</exclude-pattern>