Merge branch 'main' into phpstan/mixed-4

sreichel · sreichel · commit 733d14ca541d · 2025-11-16T12:55:45.000+01:00
# Conflicts:
#	composer.lock
diff --git a/app/code/core/Mage/Install/etc/install.xml b/app/code/core/Mage/Install/etc/install.xml
@@ -75,8 +75,10 @@
                     <openssl/>
                     <mcrypt/>
                 </mcrypt>
+                <mysqli/>
                 <pdo/>
                 <pdo_mysql/>
+                <posix/>
                 <simplexml/>
                 <soap/>
                 <spl/>
diff --git a/composer.json b/composer.json
@@ -26,6 +26,7 @@
         "ext-posix": "*",
         "ext-simplexml": "*",
         "ext-soap": "*",
+        "ext-spl": "*",
         "ext-zlib": "*",
         "composer-runtime-api": "^2",
         "colinmollenhour/cache-backend-redis": "^1.14",
diff --git a/composer.lock b/composer.lock
