Apply OM-2050-patch

sreichel · Jul 25, 2024 · fd738d3 · fd738d3
1 parent f53875c
commit fd738d3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -122,6 +122,9 @@
     },
     "extra": {
         "patches": {
+            "zf1s/zend-date": {
+                "OM-2050 - Prevent checking known date codes": "patches/zf1s-zend-date-library-zend-date-php-OM-2050.patch"
+            },
             "zf1s/zend-form": {
                 "MAG-1.9.3.7 - SUPEE-10415": "patches/zf1s-zend-form-library-zend-form-decorator-form-php-MAG-1.9.3.7.patch"
             },
@@ -143,8 +146,7 @@
             "shardj/zf1-future": {
                 "OM-918 - Add runtime cache to Zend_Locale_Data": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/OM-918.patch",
                 "OM-1081 - Not detecting HTTPS behind a proxy": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/OM-1081.patch",
-                "OM-2047 - Pass delimiter char to preg_quote": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/OM-2047.patch",
-                "OM-2050 - Prevent checking known date codes": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/OM-2050.patch"
+                "OM-2047 - Pass delimiter char to preg_quote": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/OM-2047.patch"
             }
         },
         "magento-root-dir": ".",

diff --git a/composer.lock b/composer.lock
diff --git a/patches/zf1s-zend-date-library-zend-date-php-OM-2050.patch b/patches/zf1s-zend-date-library-zend-date-php-OM-2050.patch
@@ -0,0 +1,12 @@
+--- /dev/null
++++ ../library/Zend/Date.php
+@@ -531,7 +531,8 @@
+         }
+
+         if (($part !== null) && !defined($part)
+-            && ($part != 'ee') && ($part != 'ss') && ($part != 'GG') && ($part != 'MM') && ($part != 'EE') && ($part != 'TT')
++            && ($part !== 'ee') && ($part !== 'ss') && ($part !== 'GG') && ($part !== 'MM') && ($part !== 'EE') && ($part !== 'TT')
++            && ($part !== 'U') && ($part !== 'X') && ($part !== 'c')
+             && Zend_Locale::isLocale($part, null, false)) {
+             $locale = $part;
+             $part = null;