diff --git a/.ddev/commands/web/magerun b/.ddev/commands/web/magerun index a03899bf01f..3d0409eb2c2 100755 --- a/.ddev/commands/web/magerun +++ b/.ddev/commands/web/magerun @@ -8,7 +8,7 @@ if [ ! -f vendor/bin/n98-magerun ]; then read -r -p "n98-magerun is not installed. Do you want to install it? [y/N] " INSTALL_MAGERUN INSTALL_MAGERUN=${INSTALL_MAGERUN,,} # to lower if [[ "${INSTALL_MAGERUN}" =~ ^(yes|y) ]]; then - composer require --dev n98/magerun:dev-develop + composer require --dev n98/magerun else exit 1 fi diff --git a/.vendor-patches/MAG-1.9.3.0.patch b/.vendor-patches/MAG-1.9.3.0.patch index 6ce7eb64213..aaf02402462 100644 --- a/.vendor-patches/MAG-1.9.3.0.patch +++ b/.vendor-patches/MAG-1.9.3.0.patch @@ -1,4 +1,4 @@ ---- /dev/null +--- ../library/Zend/Validate/Hostname.php +++ ../library/Zend/Validate/Hostname.php @@ -2188,7 +2188,9 @@ $this->_tld = $matches[1]; diff --git a/.vendor-patches/MAG-1.9.3.7.patch b/.vendor-patches/MAG-1.9.3.7.patch index 5c23f7857e5..dc60bf404bc 100644 --- a/.vendor-patches/MAG-1.9.3.7.patch +++ b/.vendor-patches/MAG-1.9.3.7.patch @@ -1,4 +1,4 @@ ---- /dev/null +--- ../library/Zend/Form/Decorator/Form.php +++ ../library/Zend/Form/Decorator/Form.php @@ -129,6 +129,12 @@ $attribs = $this->getOptions(); diff --git a/.vendor-patches/MAG-1.9.3.9.patch b/.vendor-patches/MAG-1.9.3.9.patch deleted file mode 100644 index 03acc1cd426..00000000000 --- a/.vendor-patches/MAG-1.9.3.9.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- /dev/null -+++ ../library/Zend/Validate/EmailAddress.php -@@ -429,7 +429,9 @@ - // Quoted-string characters are: DQUOTE *(qtext/quoted-pair) DQUOTE - $qtext = '\x20-\x21\x23-\x5b\x5d-\x7e'; // %d32-33 / %d35-91 / %d93-126 - $quotedPair = '\x20-\x7e'; // %d92 %d32-126 -- if (preg_match('/^"(['. $qtext .']|\x5c[' . $quotedPair . '])*"$/', $this->localPart)) { -+ if ((0 === (strcmp($this->localPart, strip_tags($this->localPart)))) -+ && (0 === (strcmp($this->localPart, htmlspecialchars_decode($this->localPart)))) -+ && (preg_match('/^"(['. $qtext .']|\x5c[' . $quotedPair . '])*"$/', $this->localPart))) { - $result = true; - } else { - $this->_error(self::DOT_ATOM); diff --git a/.vendor-patches/OM-1081.patch b/.vendor-patches/OM-1081.patch index 0c2524e8b60..b4bf4c0197f 100644 --- a/.vendor-patches/OM-1081.patch +++ b/.vendor-patches/OM-1081.patch @@ -1,4 +1,4 @@ ---- /dev/null +--- ../library/Zend/Controller/Request/Http.php +++ ../library/Zend/Controller/Request/Http.php @@ -1041,7 +1041,9 @@ */ diff --git a/.vendor-patches/OM-2047.patch b/.vendor-patches/OM-2047.patch index 0f5590f24ff..df67d17065d 100644 --- a/.vendor-patches/OM-2047.patch +++ b/.vendor-patches/OM-2047.patch @@ -1,4 +1,4 @@ ---- /dev/null +--- ../library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php +++ ../library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php @@ -525,7 +525,7 @@ */ @@ -10,7 +10,7 @@ } } ---- /dev/null +--- ../library/Zend/Db/Statement.php +++ ../library/Zend/Db/Statement.php @@ -185,11 +185,11 @@ // e.g. \' or '' @@ -24,7 +24,7 @@ - $escapeChar = preg_quote($escapeChar); + $escapeChar = preg_quote($escapeChar, '/'); // this segfaults only after 65,000 characters instead of 9,000 - $sql = preg_replace("/$q([^$q{$escapeChar}]*|($qe)*)*$q/s", '', $sql); + $sql = preg_replace("/$q([^$q{$escapeChar}]*|($qe)*)*$q/s", '', (string) $sql); } @@ -207,7 +207,7 @@ // e.g. \" or "" or \` @@ -33,10 +33,10 @@ - $de = preg_quote($de); + $de = preg_quote($de, '/'); // Note: $de and $d where never used..., now they are: - $sql = preg_replace("/$d($de|\\\\{2}|[^$d])*$d/Us", '', $sql); + $sql = preg_replace("/$d($de|\\\\{2}|[^$d])*$d/Us", '', (string) $sql); return $sql; ---- /dev/null +--- ../library/Zend/Http/Cookie.php +++ ../library/Zend/Http/Cookie.php @@ -396,7 +396,7 @@ diff --git a/.vendor-patches/OM-2050.patch b/.vendor-patches/OM-2050.patch index a208019cbd8..8ffbc68f626 100644 --- a/.vendor-patches/OM-2050.patch +++ b/.vendor-patches/OM-2050.patch @@ -1,4 +1,4 @@ ---- /dev/null +--- ../library/Zend/Date.php +++ ../library/Zend/Date.php @@ -541,7 +541,8 @@ } diff --git a/.vendor-patches/OM-4297.patch b/.vendor-patches/OM-4297.patch index 6ae07c4baf9..3c6829c9d0c 100644 --- a/.vendor-patches/OM-4297.patch +++ b/.vendor-patches/OM-4297.patch @@ -1,4 +1,4 @@ ---- /dev/null +--- ../library/Zend/Auth/Adapter/Http/Resolver/File.php +++ ../library/Zend/Auth/Adapter/Http/Resolver/File.php @@ -157,7 +157,7 @@ diff --git a/.vendor-patches/OM-918.patch b/.vendor-patches/OM-918.patch index ab653eea1d9..dee67d4e356 100644 --- a/.vendor-patches/OM-918.patch +++ b/.vendor-patches/OM-918.patch @@ -1,4 +1,4 @@ ---- /dev/null +--- ../library/Zend/Locale/Data.php +++ ../library/Zend/Locale/Data.php @@ -75,6 +75,13 @@ private static $_cacheDisabled = false; @@ -38,7 +38,7 @@ + $data = serialize($temp); if (self::$_cacheTags) { - self::$_cache->save( serialize($temp), $id, ['Zend_Locale']); -+ self::$_cache->save( $data, $id, ['Zend_Locale']); ++ self::$_cache->save($data, $id, ['Zend_Locale']); } else { - self::$_cache->save( serialize($temp), $id); + self::$_cache->save( $data, $id); @@ -47,7 +47,7 @@ } return $temp; -@@ -984,8 +1000,15 @@ +@@ -985,8 +1001,15 @@ } $val = urlencode((string) $val); $id = self::_filterCacheId('Zend_LocaleC_' . $locale . '_' . $path . '_' . $val); @@ -63,18 +63,18 @@ + return $result; } - switch(strtolower($path)) { -@@ -1499,11 +1522,13 @@ + switch(strtolower((string) $path)) { +@@ -1500,11 +1523,13 @@ $temp = current($temp); } if (isset(self::$_cache)) { + $data = serialize($temp); if (self::$_cacheTags) { - self::$_cache->save( serialize($temp), $id, ['Zend_Locale']); -+ self::$_cache->save( $data, $id, ['Zend_Locale']); ++ self::$_cache->save($data, $id, ['Zend_Locale']); } else { - self::$_cache->save( serialize($temp), $id); -+ self::$_cache->save( $data, $id); ++ self::$_cache->save($data, $id); } + static::$_localCache[$id] = $temp; } diff --git a/.vendor-patches/PHPSTAN-ZF1F.patch b/.vendor-patches/PHPSTAN-ZF1F.patch index 1cce5077caa..44c63787b41 100644 --- a/.vendor-patches/PHPSTAN-ZF1F.patch +++ b/.vendor-patches/PHPSTAN-ZF1F.patch @@ -1,4 +1,4 @@ ---- /dev/null +--- ../library/Zend/Cache/Backend.php +++ ../library/Zend/Cache/Backend.php @@ -137,7 +137,7 @@ * if $specificLifetime is not false, the given specific life time is used @@ -10,7 +10,7 @@ */ public function getLifetime($specificLifetime) ---- /dev/null +--- ../library/Zend/Controller/Response/Abstract.php +++ ../library/Zend/Controller/Response/Abstract.php @@ -454,7 +454,7 @@ * $spec is a string and matches a named segment, returns the contents of @@ -22,7 +22,7 @@ */ public function getBody($spec = false) ---- /dev/null +--- ../library/Zend/Currency.php +++ ../library/Zend/Currency.php @@ -138,8 +138,8 @@ /** @@ -36,7 +36,7 @@ * @return string */ ---- /dev/null +--- ../library/Zend/Db/Select.php +++ ../library/Zend/Db/Select.php @@ -486,7 +486,7 @@ * @param string $cond Join on this condition. @@ -48,7 +48,7 @@ public function joinStraight($name, $cond, $cols = self::SQL_WILDCARD, $schema = null) { ---- /dev/null +--- ../library/Zend/Measure/Abstract.php +++ ../library/Zend/Measure/Abstract.php @@ -75,7 +75,7 @@ * Zend_Measure_Abstract is an abstract class for the different measurement types @@ -60,7 +60,7 @@ * @throws Zend_Measure_Exception */ ---- /dev/null +--- ../library/Zend/Cache/Backend/Memcached.php +++ ../library/Zend/Cache/Backend/Memcached.php @@ -205,10 +205,10 @@ * Note : $data is always "string" (serialization is done by the @@ -78,7 +78,7 @@ */ public function save($data, $id, $tags = [], $specificLifetime = false) ---- /dev/null +--- ../library/Zend/Translate.php +++ ../library/Zend/Translate.php @@ -63,7 +63,7 @@ /** diff --git a/composer.json b/composer.json index 87b4560a2f4..07fb2f632a9 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "colinmollenhour/cache-backend-redis": "^1.14", "colinmollenhour/magento-redis-session": "^3.2.0", "components/jquery": "^3.7.1", - "cweagans/composer-patches": "^1.7", + "cweagans/composer-patches": "^2.0", "empiricompany/openmage_ignition": "^1.5", "ezyang/htmlpurifier": "^4.17", "flowjs/flowjs": "dev-master", @@ -141,17 +141,17 @@ "extra": { "patches": { "shardj/zf1-future": { - "MAG-1.9.3.0": "https://raw.githubusercontent.com/OpenMage/magento-lts/11031e2c29310d621b63458f2075a688d535f1f8/.vendor-patches/MAG-1.9.3.0.patch", - "MAG-1.9.3.7 - SUPEE-10415": "https://raw.githubusercontent.com/OpenMage/magento-lts/11031e2c29310d621b63458f2075a688d535f1f8/.vendor-patches/MAG-1.9.3.7.patch", - "OM-918 - Add runtime cache to Zend_Locale_Data": "https://raw.githubusercontent.com/OpenMage/magento-lts/11031e2c29310d621b63458f2075a688d535f1f8/.vendor-patches/OM-918.patch", - "OM-1081 - Not detecting HTTPS behind a proxy": "https://raw.githubusercontent.com/OpenMage/magento-lts/11031e2c29310d621b63458f2075a688d535f1f8/.vendor-patches/OM-1081.patch", - "OM-2047 - Pass delimiter char to preg_quote": "https://raw.githubusercontent.com/OpenMage/magento-lts/11031e2c29310d621b63458f2075a688d535f1f8/.vendor-patches/OM-2047.patch", - "OM-2050 - Prevent checking known date codes": "https://raw.githubusercontent.com/OpenMage/magento-lts/11031e2c29310d621b63458f2075a688d535f1f8/.vendor-patches/OM-2050.patch", - "OM-4297 - PHP 8.4 compability": "https://raw.githubusercontent.com/OpenMage/magento-lts/11031e2c29310d621b63458f2075a688d535f1f8/.vendor-patches/OM-4297.patch", - "PHPSTAN-ZF1F - temporary fixes": "https://raw.githubusercontent.com/OpenMage/magento-lts/8e345d5907d2b6881a0ed84d5cf9863e4bf93d02/.vendor-patches/PHPSTAN-ZF1F.patch" + "MAG-1.9.3.0": "https://raw.githubusercontent.com/OpenMage/magento-lts/de83e28a673e3c1a249b51433abf6dc93e59063c/.vendor-patches/MAG-1.9.3.0.patch", + "MAG-1.9.3.7 - SUPEE-10415": "https://raw.githubusercontent.com/OpenMage/magento-lts/de83e28a673e3c1a249b51433abf6dc93e59063c/.vendor-patches/MAG-1.9.3.7.patch", + "OM-918 - Add runtime cache to Zend_Locale_Data": "https://raw.githubusercontent.com/OpenMage/magento-lts/f28ab75b1df7d1497ed775e33b77d7957c9b85c4/.vendor-patches/OM-918.patch", + "OM-1081 - Not detecting HTTPS behind a proxy": "https://raw.githubusercontent.com/OpenMage/magento-lts/de83e28a673e3c1a249b51433abf6dc93e59063c/.vendor-patches/OM-1081.patch", + "OM-2047 - Pass delimiter char to preg_quote": "https://raw.githubusercontent.com/OpenMage/magento-lts/5479577ef5207ace4f5842a2f1a636f689db9194/.vendor-patches/OM-2047.patch", + "OM-2050 - Prevent checking known date codes": "https://raw.githubusercontent.com/OpenMage/magento-lts/de83e28a673e3c1a249b51433abf6dc93e59063c/.vendor-patches/OM-2050.patch", + "OM-4297 - PHP 8.4 compability": "https://raw.githubusercontent.com/OpenMage/magento-lts/de83e28a673e3c1a249b51433abf6dc93e59063c/.vendor-patches/OM-4297.patch", + "PHPSTAN-ZF1F - temporary fixes": "https://raw.githubusercontent.com/OpenMage/magento-lts/de83e28a673e3c1a249b51433abf6dc93e59063c/.vendor-patches/PHPSTAN-ZF1F.patch" }, "magento-ecg/coding-standard": { - "ECG-72 - Fix LoopSniff": "https://raw.githubusercontent.com/OpenMage/magento-lts/11031e2c29310d621b63458f2075a688d535f1f8/.vendor-patches/ECG-72.patch" + "ECG-72 - Fix LoopSniff": ".vendor-patches/ECG-72.patch" } }, "magento-root-dir": ".", @@ -172,6 +172,9 @@ "openmage/composer-plugin": true, "phpstan/extension-installer": true }, + "audit": { + "block-insecure": false + }, "platform": { "php": "8.1" }, @@ -214,4 +217,4 @@ "vendor:patch": "Create patch file", "test": "Run php-cs-fixer, phpstan & phpunit" } -} +} \ No newline at end of file diff --git a/composer.lock b/composer.lock index 194e7a2d0d0..80902535cc7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d7988405c4b1964b9592e10335bbc070", + "content-hash": "3d2884fb6b100bea77886d668d670ea1", "packages": [ { "name": "carbonphp/carbon-doctrine-types", @@ -299,31 +299,100 @@ }, "time": "2023-09-22T01:43:46+00:00" }, + { + "name": "cweagans/composer-configurable-plugin", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/cweagans/composer-configurable-plugin.git", + "reference": "15433906511a108a1806710e988629fd24b89974" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cweagans/composer-configurable-plugin/zipball/15433906511a108a1806710e988629fd24b89974", + "reference": "15433906511a108a1806710e988629fd24b89974", + "shasum": "" + }, + "require": { + "php": ">=8.0.0" + }, + "require-dev": { + "codeception/codeception": "~4.0", + "codeception/module-asserts": "^2.0", + "composer/composer": "~2.0", + "php-coveralls/php-coveralls": "~2.0", + "php-parallel-lint/php-parallel-lint": "^1.0.0", + "phpro/grumphp": "^1.8.0", + "sebastian/phpcpd": "^6.0", + "squizlabs/php_codesniffer": "^3.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "cweagans\\Composer\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Cameron Eagans", + "email": "me@cweagans.net" + } + ], + "description": "Provides a lightweight configuration system for Composer plugins.", + "support": { + "issues": "https://github.com/cweagans/composer-configurable-plugin/issues", + "source": "https://github.com/cweagans/composer-configurable-plugin/tree/2.0.0" + }, + "funding": [ + { + "url": "https://github.com/cweagans", + "type": "github" + } + ], + "time": "2023-02-12T04:58:58+00:00" + }, { "name": "cweagans/composer-patches", - "version": "1.7.3", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/cweagans/composer-patches.git", - "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db" + "reference": "bfa6018a5f864653d9ed899b902ea72f858a2cf7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/e190d4466fe2b103a55467dfa83fc2fecfcaf2db", - "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db", + "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/bfa6018a5f864653d9ed899b902ea72f858a2cf7", + "reference": "bfa6018a5f864653d9ed899b902ea72f858a2cf7", "shasum": "" }, "require": { - "composer-plugin-api": "^1.0 || ^2.0", - "php": ">=5.3.0" + "composer-plugin-api": "^2.0", + "cweagans/composer-configurable-plugin": "^2.0", + "ext-json": "*", + "php": ">=8.0.0" }, "require-dev": { - "composer/composer": "~1.0 || ~2.0", - "phpunit/phpunit": "~4.6" + "codeception/codeception": "~4.0", + "codeception/module-asserts": "^2.0", + "codeception/module-cli": "^2.0", + "codeception/module-filesystem": "^2.0", + "composer/composer": "~2.0", + "php-coveralls/php-coveralls": "~2.0", + "php-parallel-lint/php-parallel-lint": "^1.0.0", + "phpro/grumphp": "^1.8.0", + "sebastian/phpcpd": "^6.0", + "squizlabs/php_codesniffer": "^4.0" }, "type": "composer-plugin", "extra": { - "class": "cweagans\\Composer\\Patches" + "_": "The following two lines ensure that composer-patches is loaded as early as possible.", + "class": "cweagans\\Composer\\Plugin\\Patches", + "plugin-modifies-downloads": true, + "plugin-modifies-install-path": true }, "autoload": { "psr-4": { @@ -343,9 +412,15 @@ "description": "Provides a way to patch Composer packages.", "support": { "issues": "https://github.com/cweagans/composer-patches/issues", - "source": "https://github.com/cweagans/composer-patches/tree/1.7.3" + "source": "https://github.com/cweagans/composer-patches/tree/2.0.0" }, - "time": "2022-12-20T22:53:13+00:00" + "funding": [ + { + "url": "https://github.com/cweagans", + "type": "github" + } + ], + "time": "2025-10-30T23:44:22+00:00" }, { "name": "doctrine/inflector", @@ -1065,16 +1140,16 @@ }, { "name": "justinrainbow/json-schema", - "version": "5.3.0", + "version": "5.3.1", "source": { "type": "git", "url": "https://github.com/jsonrainbow/json-schema.git", - "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8" + "reference": "b5a44b6391a3bbb75c9f2b73e1ef03d6045e1e20" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8", - "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8", + "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/b5a44b6391a3bbb75c9f2b73e1ef03d6045e1e20", + "reference": "b5a44b6391a3bbb75c9f2b73e1ef03d6045e1e20", "shasum": "" }, "require": { @@ -1124,9 +1199,9 @@ ], "support": { "issues": "https://github.com/jsonrainbow/json-schema/issues", - "source": "https://github.com/jsonrainbow/json-schema/tree/5.3.0" + "source": "https://github.com/jsonrainbow/json-schema/tree/5.3.1" }, - "time": "2024-07-06T21:00:26+00:00" + "time": "2025-12-12T08:56:22+00:00" }, { "name": "magento-hackathon/magento-composer-installer", @@ -3042,16 +3117,16 @@ }, { "name": "symfony/finder", - "version": "v6.4.27", + "version": "v6.4.31", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "a1b6aa435d2fba50793b994a839c32b6064f063b" + "reference": "5547f2e1f0ca8e2e7abe490156b62da778cfbe2b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/a1b6aa435d2fba50793b994a839c32b6064f063b", - "reference": "a1b6aa435d2fba50793b994a839c32b6064f063b", + "url": "https://api.github.com/repos/symfony/finder/zipball/5547f2e1f0ca8e2e7abe490156b62da778cfbe2b", + "reference": "5547f2e1f0ca8e2e7abe490156b62da778cfbe2b", "shasum": "" }, "require": { @@ -3086,7 +3161,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.4.27" + "source": "https://github.com/symfony/finder/tree/v6.4.31" }, "funding": [ { @@ -3106,20 +3181,20 @@ "type": "tidelift" } ], - "time": "2025-10-15T18:32:00+00:00" + "time": "2025-12-11T14:52:17+00:00" }, { "name": "symfony/http-foundation", - "version": "v6.4.29", + "version": "v6.4.31", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "b03d11e015552a315714c127d8d1e0f9e970ec88" + "reference": "a35ee6f47e4775179704d7877a8b0da3cb09241a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b03d11e015552a315714c127d8d1e0f9e970ec88", - "reference": "b03d11e015552a315714c127d8d1e0f9e970ec88", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a35ee6f47e4775179704d7877a8b0da3cb09241a", + "reference": "a35ee6f47e4775179704d7877a8b0da3cb09241a", "shasum": "" }, "require": { @@ -3167,7 +3242,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.4.29" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.31" }, "funding": [ { @@ -3187,20 +3262,20 @@ "type": "tidelift" } ], - "time": "2025-11-08T16:40:12+00:00" + "time": "2025-12-17T10:10:57+00:00" }, { "name": "symfony/mime", - "version": "v6.4.24", + "version": "v6.4.30", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "664d5e844a2de5e11c8255d0aef6bc15a9660ac7" + "reference": "69aeef5d2692bb7c18ce133b09f67b27260b7acf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/664d5e844a2de5e11c8255d0aef6bc15a9660ac7", - "reference": "664d5e844a2de5e11c8255d0aef6bc15a9660ac7", + "url": "https://api.github.com/repos/symfony/mime/zipball/69aeef5d2692bb7c18ce133b09f67b27260b7acf", + "reference": "69aeef5d2692bb7c18ce133b09f67b27260b7acf", "shasum": "" }, "require": { @@ -3256,7 +3331,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.4.24" + "source": "https://github.com/symfony/mime/tree/v6.4.30" }, "funding": [ { @@ -3276,7 +3351,7 @@ "type": "tidelift" } ], - "time": "2025-07-15T12:02:45+00:00" + "time": "2025-11-16T09:57:53+00:00" }, { "name": "symfony/polyfill-php82", @@ -3600,16 +3675,16 @@ }, { "name": "symfony/process", - "version": "v6.4.26", + "version": "v6.4.31", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "48bad913268c8cafabbf7034b39c8bb24fbc5ab8" + "reference": "8541b7308fca001320e90bca8a73a28aa5604a6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/48bad913268c8cafabbf7034b39c8bb24fbc5ab8", - "reference": "48bad913268c8cafabbf7034b39c8bb24fbc5ab8", + "url": "https://api.github.com/repos/symfony/process/zipball/8541b7308fca001320e90bca8a73a28aa5604a6e", + "reference": "8541b7308fca001320e90bca8a73a28aa5604a6e", "shasum": "" }, "require": { @@ -3641,7 +3716,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.26" + "source": "https://github.com/symfony/process/tree/v6.4.31" }, "funding": [ { @@ -3661,7 +3736,7 @@ "type": "tidelift" } ], - "time": "2025-09-11T09:57:09+00:00" + "time": "2025-12-15T19:26:35+00:00" }, { "name": "symfony/service-contracts", @@ -3841,16 +3916,16 @@ }, { "name": "symfony/translation", - "version": "v6.4.24", + "version": "v6.4.31", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "300b72643e89de0734d99a9e3f8494a3ef6936e1" + "reference": "81579408ecf7dc5aa2d8462a6d5c3a430a80e6f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/300b72643e89de0734d99a9e3f8494a3ef6936e1", - "reference": "300b72643e89de0734d99a9e3f8494a3ef6936e1", + "url": "https://api.github.com/repos/symfony/translation/zipball/81579408ecf7dc5aa2d8462a6d5c3a430a80e6f2", + "reference": "81579408ecf7dc5aa2d8462a6d5c3a430a80e6f2", "shasum": "" }, "require": { @@ -3916,7 +3991,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.4.24" + "source": "https://github.com/symfony/translation/tree/v6.4.31" }, "funding": [ { @@ -3936,7 +4011,7 @@ "type": "tidelift" } ], - "time": "2025-07-30T17:30:48+00:00" + "time": "2025-12-18T11:37:55+00:00" }, { "name": "symfony/translation-contracts", @@ -4022,16 +4097,16 @@ }, { "name": "symfony/validator", - "version": "v6.4.29", + "version": "v6.4.31", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "99df8a769e64e399f510166141ea74f450e8dd1d" + "reference": "0c3f60adce4e6fc86583b0c7e363ce90fe3ca3e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/99df8a769e64e399f510166141ea74f450e8dd1d", - "reference": "99df8a769e64e399f510166141ea74f450e8dd1d", + "url": "https://api.github.com/repos/symfony/validator/zipball/0c3f60adce4e6fc86583b0c7e363ce90fe3ca3e7", + "reference": "0c3f60adce4e6fc86583b0c7e363ce90fe3ca3e7", "shasum": "" }, "require": { @@ -4099,7 +4174,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v6.4.29" + "source": "https://github.com/symfony/validator/tree/v6.4.31" }, "funding": [ { @@ -4119,20 +4194,20 @@ "type": "tidelift" } ], - "time": "2025-11-06T20:26:06+00:00" + "time": "2025-12-24T09:35:58+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.4.25", + "version": "v6.4.26", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "c6cd92486e9fc32506370822c57bc02353a5a92c" + "reference": "cfae1497a2f1eaad78dbc0590311c599c7178d4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c6cd92486e9fc32506370822c57bc02353a5a92c", - "reference": "c6cd92486e9fc32506370822c57bc02353a5a92c", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/cfae1497a2f1eaad78dbc0590311c599c7178d4a", + "reference": "cfae1497a2f1eaad78dbc0590311c599c7178d4a", "shasum": "" }, "require": { @@ -4187,7 +4262,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.25" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.26" }, "funding": [ { @@ -4207,7 +4282,7 @@ "type": "tidelift" } ], - "time": "2025-08-13T09:41:44+00:00" + "time": "2025-09-25T15:37:27+00:00" }, { "name": "thecodingmachine/safe", @@ -4633,16 +4708,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.5.8", + "version": "1.5.10", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "719026bb30813accb68271fee7e39552a58e9f65" + "reference": "961a5e4056dd2e4a2eedcac7576075947c28bf63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/719026bb30813accb68271fee7e39552a58e9f65", - "reference": "719026bb30813accb68271fee7e39552a58e9f65", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/961a5e4056dd2e4a2eedcac7576075947c28bf63", + "reference": "961a5e4056dd2e4a2eedcac7576075947c28bf63", "shasum": "" }, "require": { @@ -4689,7 +4764,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.5.8" + "source": "https://github.com/composer/ca-bundle/tree/1.5.10" }, "funding": [ { @@ -4701,26 +4776,26 @@ "type": "github" } ], - "time": "2025-08-20T18:49:47+00:00" + "time": "2025-12-08T15:06:51+00:00" }, { "name": "composer/class-map-generator", - "version": "1.6.2", + "version": "1.7.1", "source": { "type": "git", "url": "https://github.com/composer/class-map-generator.git", - "reference": "ba9f089655d4cdd64e762a6044f411ccdaec0076" + "reference": "8f5fa3cc214230e71f54924bd0197a3bcc705eb1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/class-map-generator/zipball/ba9f089655d4cdd64e762a6044f411ccdaec0076", - "reference": "ba9f089655d4cdd64e762a6044f411ccdaec0076", + "url": "https://api.github.com/repos/composer/class-map-generator/zipball/8f5fa3cc214230e71f54924bd0197a3bcc705eb1", + "reference": "8f5fa3cc214230e71f54924bd0197a3bcc705eb1", "shasum": "" }, "require": { "composer/pcre": "^2.1 || ^3.1", "php": "^7.2 || ^8.0", - "symfony/finder": "^4.4 || ^5.3 || ^6 || ^7" + "symfony/finder": "^4.4 || ^5.3 || ^6 || ^7 || ^8" }, "require-dev": { "phpstan/phpstan": "^1.12 || ^2", @@ -4728,7 +4803,7 @@ "phpstan/phpstan-phpunit": "^1 || ^2", "phpstan/phpstan-strict-rules": "^1.1 || ^2", "phpunit/phpunit": "^8", - "symfony/filesystem": "^5.4 || ^6" + "symfony/filesystem": "^5.4 || ^6 || ^7 || ^8" }, "type": "library", "extra": { @@ -4758,7 +4833,7 @@ ], "support": { "issues": "https://github.com/composer/class-map-generator/issues", - "source": "https://github.com/composer/class-map-generator/tree/1.6.2" + "source": "https://github.com/composer/class-map-generator/tree/1.7.1" }, "funding": [ { @@ -4770,7 +4845,7 @@ "type": "github" } ], - "time": "2025-08-20T18:52:43+00:00" + "time": "2025-12-29T13:15:25+00:00" }, { "name": "composer/composer", @@ -5773,16 +5848,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.6.1", + "version": "v5.7.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2" + "reference": "dca41cd15c2ac9d055ad70dbfd011130757d1f82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2", - "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dca41cd15c2ac9d055ad70dbfd011130757d1f82", + "reference": "dca41cd15c2ac9d055ad70dbfd011130757d1f82", "shasum": "" }, "require": { @@ -5825,9 +5900,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.7.0" }, - "time": "2025-08-13T20:13:15+00:00" + "time": "2025-12-06T11:56:16+00:00" }, { "name": "openmage/dev-meta-package", @@ -6811,16 +6886,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.29", + "version": "9.6.31", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "9ecfec57835a5581bc888ea7e13b51eb55ab9dd3" + "reference": "945d0b7f346a084ce5549e95289962972c4272e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9ecfec57835a5581bc888ea7e13b51eb55ab9dd3", - "reference": "9ecfec57835a5581bc888ea7e13b51eb55ab9dd3", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/945d0b7f346a084ce5549e95289962972c4272e5", + "reference": "945d0b7f346a084ce5549e95289962972c4272e5", "shasum": "" }, "require": { @@ -6894,7 +6969,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.29" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.31" }, "funding": [ { @@ -6918,7 +6993,7 @@ "type": "tidelift" } ], - "time": "2025-09-24T06:29:11+00:00" + "time": "2025-12-06T07:45:52+00:00" }, { "name": "psr/event-dispatcher", @@ -7044,16 +7119,16 @@ }, { "name": "react/child-process", - "version": "v0.6.6", + "version": "v0.6.7", "source": { "type": "git", "url": "https://github.com/reactphp/child-process.git", - "reference": "1721e2b93d89b745664353b9cfc8f155ba8a6159" + "reference": "970f0e71945556422ee4570ccbabaedc3cf04ad3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/child-process/zipball/1721e2b93d89b745664353b9cfc8f155ba8a6159", - "reference": "1721e2b93d89b745664353b9cfc8f155ba8a6159", + "url": "https://api.github.com/repos/reactphp/child-process/zipball/970f0e71945556422ee4570ccbabaedc3cf04ad3", + "reference": "970f0e71945556422ee4570ccbabaedc3cf04ad3", "shasum": "" }, "require": { @@ -7107,7 +7182,7 @@ ], "support": { "issues": "https://github.com/reactphp/child-process/issues", - "source": "https://github.com/reactphp/child-process/tree/v0.6.6" + "source": "https://github.com/reactphp/child-process/tree/v0.6.7" }, "funding": [ { @@ -7115,7 +7190,7 @@ "type": "open_collective" } ], - "time": "2025-01-01T16:37:48+00:00" + "time": "2025-12-23T15:25:20+00:00" }, { "name": "react/dns", @@ -8821,16 +8896,16 @@ }, { "name": "symfony/config", - "version": "v6.4.24", + "version": "v6.4.28", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "80e2cf005cf17138c97193be0434cdcfd1b2212e" + "reference": "15947c18ef3ddb0b2f4ec936b9e90e2520979f62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/80e2cf005cf17138c97193be0434cdcfd1b2212e", - "reference": "80e2cf005cf17138c97193be0434cdcfd1b2212e", + "url": "https://api.github.com/repos/symfony/config/zipball/15947c18ef3ddb0b2f4ec936b9e90e2520979f62", + "reference": "15947c18ef3ddb0b2f4ec936b9e90e2520979f62", "shasum": "" }, "require": { @@ -8876,7 +8951,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v6.4.24" + "source": "https://github.com/symfony/config/tree/v6.4.28" }, "funding": [ { @@ -8896,20 +8971,20 @@ "type": "tidelift" } ], - "time": "2025-07-26T13:50:30+00:00" + "time": "2025-11-01T19:52:02+00:00" }, { "name": "symfony/dependency-injection", - "version": "v6.4.25", + "version": "v6.4.31", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "900da8a42eceeb4a13a0ec34caa7db49328daff3" + "reference": "10058832a74a33648870aa2057e3fdc8796a6566" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/900da8a42eceeb4a13a0ec34caa7db49328daff3", - "reference": "900da8a42eceeb4a13a0ec34caa7db49328daff3", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/10058832a74a33648870aa2057e3fdc8796a6566", + "reference": "10058832a74a33648870aa2057e3fdc8796a6566", "shasum": "" }, "require": { @@ -8961,7 +9036,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.4.25" + "source": "https://github.com/symfony/dependency-injection/tree/v6.4.31" }, "funding": [ { @@ -8981,7 +9056,7 @@ "type": "tidelift" } ], - "time": "2025-08-13T09:41:44+00:00" + "time": "2025-12-23T13:34:50+00:00" }, { "name": "symfony/event-dispatcher", @@ -9282,16 +9357,16 @@ }, { "name": "symfony/var-exporter", - "version": "v6.4.25", + "version": "v6.4.26", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "4ff50a1b7c75d1d596aca50899d0c8c7e3de8358" + "reference": "466fcac5fa2e871f83d31173f80e9c2684743bfc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/4ff50a1b7c75d1d596aca50899d0c8c7e3de8358", - "reference": "4ff50a1b7c75d1d596aca50899d0c8c7e3de8358", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/466fcac5fa2e871f83d31173f80e9c2684743bfc", + "reference": "466fcac5fa2e871f83d31173f80e9c2684743bfc", "shasum": "" }, "require": { @@ -9339,7 +9414,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v6.4.25" + "source": "https://github.com/symfony/var-exporter/tree/v6.4.26" }, "funding": [ { @@ -9359,7 +9434,7 @@ "type": "tidelift" } ], - "time": "2025-08-18T13:06:32+00:00" + "time": "2025-09-11T09:57:09+00:00" }, { "name": "symplify/vendor-patches", @@ -9406,16 +9481,16 @@ }, { "name": "theseer/tokenizer", - "version": "1.2.3", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" + "reference": "b7489ce515e168639d17feec34b8847c326b0b3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", - "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b7489ce515e168639d17feec34b8847c326b0b3c", + "reference": "b7489ce515e168639d17feec34b8847c326b0b3c", "shasum": "" }, "require": { @@ -9444,7 +9519,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.3" + "source": "https://github.com/theseer/tokenizer/tree/1.3.1" }, "funding": [ { @@ -9452,7 +9527,7 @@ "type": "github" } ], - "time": "2024-03-03T12:36:25+00:00" + "time": "2025-11-17T20:03:58+00:00" } ], "aliases": [], @@ -9491,5 +9566,5 @@ "platform-overrides": { "php": "8.1" }, - "plugin-api-version": "2.9.0" + "plugin-api-version": "2.6.0" } diff --git a/patches.lock.json b/patches.lock.json new file mode 100644 index 00000000000..30dfabea249 --- /dev/null +++ b/patches.lock.json @@ -0,0 +1,99 @@ +{ + "_hash": "a66f814b6279e83972f6b06e3cfa1d96be1d3a98a5b95a69b1eacd08451ad923", + "patches": { + "shardj/zf1-future": [ + { + "package": "shardj/zf1-future", + "description": "MAG-1.9.3.0", + "url": "https://raw.githubusercontent.com/OpenMage/magento-lts/de83e28a673e3c1a249b51433abf6dc93e59063c/.vendor-patches/MAG-1.9.3.0.patch", + "sha256": "02e8483ded77ceff2deaf0e1e68276dfd5f4427a2577867fc378b3e5851fc386", + "depth": 1, + "extra": { + "provenance": "root" + } + }, + { + "package": "shardj/zf1-future", + "description": "MAG-1.9.3.7 - SUPEE-10415", + "url": "https://raw.githubusercontent.com/OpenMage/magento-lts/de83e28a673e3c1a249b51433abf6dc93e59063c/.vendor-patches/MAG-1.9.3.7.patch", + "sha256": "ab35564f6d49993021efa816157d276621ed116e9040b8a9b727149f6a935624", + "depth": 1, + "extra": { + "provenance": "root" + } + }, + { + "package": "shardj/zf1-future", + "description": "OM-918 - Add runtime cache to Zend_Locale_Data", + "url": "https://raw.githubusercontent.com/OpenMage/magento-lts/f28ab75b1df7d1497ed775e33b77d7957c9b85c4/.vendor-patches/OM-918.patch", + "sha256": "6e9394e95639941d096e6c80cf2106234d864b26d2eee3bb44fa159295629f43", + "depth": 1, + "extra": { + "provenance": "root" + } + }, + { + "package": "shardj/zf1-future", + "description": "OM-1081 - Not detecting HTTPS behind a proxy", + "url": "https://raw.githubusercontent.com/OpenMage/magento-lts/de83e28a673e3c1a249b51433abf6dc93e59063c/.vendor-patches/OM-1081.patch", + "sha256": "a3d0e71e9c5593d86acd478aaca5a2148ba74ceacc27c644e4eaa60d2c7ec904", + "depth": 1, + "extra": { + "provenance": "root" + } + }, + { + "package": "shardj/zf1-future", + "description": "OM-2047 - Pass delimiter char to preg_quote", + "url": "https://raw.githubusercontent.com/OpenMage/magento-lts/5479577ef5207ace4f5842a2f1a636f689db9194/.vendor-patches/OM-2047.patch", + "sha256": "e5398fd3b9cdbe2ccad2fa68b71d34daee0e5f7ae392b3db950326d5a61ec06a", + "depth": 1, + "extra": { + "provenance": "root" + } + }, + { + "package": "shardj/zf1-future", + "description": "OM-2050 - Prevent checking known date codes", + "url": "https://raw.githubusercontent.com/OpenMage/magento-lts/de83e28a673e3c1a249b51433abf6dc93e59063c/.vendor-patches/OM-2050.patch", + "sha256": "417fcce2d3e5162ee701dcbcf5fc4e30628f07a5833381b7d29d6ebc8dbc5d30", + "depth": 1, + "extra": { + "provenance": "root" + } + }, + { + "package": "shardj/zf1-future", + "description": "OM-4297 - PHP 8.4 compability", + "url": "https://raw.githubusercontent.com/OpenMage/magento-lts/de83e28a673e3c1a249b51433abf6dc93e59063c/.vendor-patches/OM-4297.patch", + "sha256": "c23f5befdb031c11109c134e11d97b7d1170c722aecf84e62942a9e79091025c", + "depth": 1, + "extra": { + "provenance": "root" + } + }, + { + "package": "shardj/zf1-future", + "description": "PHPSTAN-ZF1F - temporary fixes", + "url": "https://raw.githubusercontent.com/OpenMage/magento-lts/de83e28a673e3c1a249b51433abf6dc93e59063c/.vendor-patches/PHPSTAN-ZF1F.patch", + "sha256": "0bbf88d953377254379448c309b5cee16ac1585d31f34736b1e533f13a0c2b23", + "depth": 1, + "extra": { + "provenance": "root" + } + } + ], + "magento-ecg/coding-standard": [ + { + "package": "magento-ecg/coding-standard", + "description": "ECG-72 - Fix LoopSniff", + "url": ".vendor-patches/ECG-72.patch", + "sha256": "c24c480d3e5a0257d75650ec13841594c1d3fa7f80d9adfcd4e95e5aeab2e139", + "depth": 1, + "extra": { + "provenance": "root" + } + } + ] + } +}