Merge branch 'main' into validation

# Conflicts:
#	composer.lock

Author: sreichel

.github/spellcheck-wordlist.txt

@@ -1,6 +1,9 @@
 ACL
 ActionScript
+analytics
 bool
+boolean
+backorders
 Braintree
 Browsersync
 Captcha
@@ -10,6 +13,7 @@ CMS
 Cron
 CVE
 CodeQL
+config
 DevOps
 DDEV
 DNS
@@ -18,10 +22,13 @@ EAV
 Emmet
 FireGento
 FPC
+frontend
 Gitpod
 HiPay
 Homebrew
 HMAC
+HTTP
+HTTPS
 ImageMagick
 IntelliSense
 jQuery
@@ -50,19 +57,25 @@ PHPStan
 PhpStorm
 PHPUnit
 PLAINTEXT
+programmatically
 RCE
 reCaptcha
 Redis
 RPC
 RSS
 RWD
+runtime
 SCSS
 SHA
+sku
+SKU
+SKUs
 SMTP
 SSL
 TinyMCE
 toc
 URI
+un
 Varien
 VMware
 WAMP

.github/workflows/check-files.yml

@@ -55,7 +55,7 @@ jobs:
     outputs:
       composer: ${{ steps.changes-composer.outputs.composer }}
       js: ${{ steps.changes-js.outputs.js }}
-      markdown: ${{ steps.changes-php.outputs.markdown }}
+      markdown: ${{ steps.changes-markdown.outputs.markdown }}
       php: ${{ steps.changes-php.outputs.php }}
       phtml: ${{ steps.all.outputs.phtml }}
       xml: ${{ steps.changes-xml.outputs.xml }}

.github/workflows/spellcheck.yml

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

.github/workflows/update-copyright.yml

@@ -6751,7 +6751,7 @@ parameters:
 			path: lib/Varien/Data/Collection/Db.php
 
 		-
-			message: '#^Parameter \#2 \$callback of function array_filter expects \(callable\(mixed\)\: bool\)\|null, Closure\(mixed\)\: array\<int\<0, max\>, string\> given\.$#'
+			message: '#^Parameter \#2 \$callback of function array_filter expects \(callable\(mixed\)\: bool\)\|null, Closure\(mixed\)\: array\<int\<0, max\>, non\-empty\-string\> given\.$#'
 			identifier: argument.type
 			count: 1
 			path: lib/Varien/Data/Collection/Db.php

.phpstan.dist.baseline.neon

@@ -0,0 +1,20 @@
+COPYRIGHT
+
+    OpenMage - an eCommerce platform
+
+    Copyright © 2006-2020 Magento, Inc. (https://magento.com)
+    Copyright © 2016-2025 The OpenMage Contributors (https://openmage.org)
+
+SOFTWARE LICENSE
+
+    The free software license of OpenMage themes (located in app/design/) and skins (located in skin/) is the
+    Academic Free License (AFL 3.0) that is bundled with this package in the file LICENSE_AFL.txt.
+    It is also available at https://opensource.org/license/afl-3-0-php
+
+    The free software license of TinyMCE that may be bundled and used exclusively with this project is a proprietary license
+    that is bundled with this package in the file LICENSE_TINYMCE.txt.
+    It is also available at https://github.com/OpenMage/magento-lts/blob/main/LICENSE_TINYMCE.txt
+
+    The free software license of all other OpenMage code included with this package unless otherwise noted in the source file
+    or source file directory is The Open Software License 3.0 (OSL 3.0) that is bundled with this package in the file LICENSE.txt.
+    It is also available at https://opensource.org/license/osl-3.0.php

COPYING.txt

@@ -23,7 +23,7 @@ See: https://docs.openmage.org/
 
 ## Sponsorship
 
-* [opencollective](https://opencollective.com/openmage) (maintained by [Daniel Fahlke](https://github.com/Flyingmana) and [Colin Mollenhour](https://github.com/colinmollenhour))
+* [opencollective](https://opencollective.com/openmage) [Colin Mollenhour](https://github.com/colinmollenhour))
 
 ## License
 

README.md

@@ -1,17 +1,10 @@
 <?php
 
 /**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
+ * @copyright  For copyright and license information, read the COPYING.txt file.
+ * @link       /COPYING.txt
+ * @license    Open Software License (OSL 3.0)
  * @package    Mage
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 $magentoRootDir = getcwd();

api.php

@@ -1,2 +1,11 @@
-Order deny,allow
-Deny from all
+<IfModule mod_authz_host.c>
+    <IfModule !mod_authz_core.c>
+        #Apache 2.2
+        order deny,allow
+        deny from all
+    </IfModule>
+    <IfModule mod_authz_core.c>
+        #Apache 2.3+
+        Require all denied
+    </IfModule>
+</IfModule>

app/.htaccess

@@ -1,17 +1,10 @@
 <?php
 
 /**
- * OpenMage
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available at https://opensource.org/license/osl-3-0-php
- *
- * @category   Mage
+ * @copyright  For copyright and license information, read the COPYING.txt file.
+ * @link       /COPYING.txt
+ * @license    Open Software License (OSL 3.0)
  * @package    Mage
- * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2017-2025 The OpenMage Contributors (https://www.openmage.org)
- * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 defined('DS') || define('DS', DIRECTORY_SEPARATOR);