Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace ZF1Future with ZF1S #4118

Draft
wants to merge 18 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 64 additions & 17 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,40 @@
"pelago/emogrifier": "^7.0",
"phpseclib/mcrypt_compat": "^2.0.3",
"phpseclib/phpseclib": "^3.0.14",
"shardj/zf1-future": "1.24.0",
"shardj/zf1-future": "^1.24",
"symfony/polyfill-php74": "^1.29",
"symfony/polyfill-php80": "^1.29",
"symfony/polyfill-php81": "^1.29",
"symfony/polyfill-php82": "^1.29"
"symfony/polyfill-php82": "^1.29",
"zf1s/zend-acl": "^1.15",
"zf1s/zend-cache": "^1.15",
"zf1s/zend-captcha": "^1.15",
"zf1s/zend-config": "^1.15",
"zf1s/zend-controller": "^1.15",
"zf1s/zend-currency": "^1.15",
"zf1s/zend-date": "^1.15",
"zf1s/zend-db": "^1.15",
"zf1s/zend-exception": "^1.15",
"zf1s/zend-feed": "^1.15",
"zf1s/zend-file-transfer": "^1.15",
"zf1s/zend-filter": "^1.15",
"zf1s/zend-form": "^1.15",
"zf1s/zend-http": "^1.15",
"zf1s/zend-json": "^1.15",
"zf1s/zend-locale": "^1.15",
"zf1s/zend-log": "^1.15",
"zf1s/zend-mail": "^1.15",
"zf1s/zend-measure": "^1.15",
"zf1s/zend-mime": "^1.15",
"zf1s/zend-oauth": "^1.15",
"zf1s/zend-pdf": "^1.15",
"zf1s/zend-session": "^1.15",
"zf1s/zend-soap": "^1.15",
"zf1s/zend-translate": "^1.15",
"zf1s/zend-uri": "^1.15",
"zf1s/zend-validate": "^1.15",
"zf1s/zend-wildfire": "^1.15",
"zf1s/zend-xmlrpc": "^1.15"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
Expand All @@ -53,7 +82,7 @@
"n98/n98_layouthelper": "*"
},
"minimum-stability": "dev",
"prefer-stable" : true,
"prefer-stable": true,
"authors": [
{
"name": "Lee Saferite",
Expand Down Expand Up @@ -92,6 +121,34 @@
}
},
"extra": {
"patches": {
"zf1s/zend-controller": {
"FI1": "patches/zf1s-zend-controller-library-zend-controller-request-abstract-php-fluent-interface.patch",
"FI2": "patches/zf1s-zend-controller-library-zend-controller-response-abstract-php-fluent-interface.patch",
"FI3": "patches/zf1s-zend-controller-library-zend-controller-request-http-php-fluent-interface.patch",
"OM-1081 - Not detecting HTTPS behind a proxy": "patches/zf1s-zend-controller-library-zend-controller-request-http-php-OM-1081.patch"
},
"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"
},
"zf1s/zend-mime": {
"MAG-1.1.1": "patches/zf1s-zend-mime-library-zend-mime-php-MAG-1.1.1.patch"
},
"zf1s/zend-validate": {
"MAG-1.9.3.0": "patches/zf1s-zend-validate-library-zend-validate-hostname-php-MAG-1.9.3.0.patch"
},
"zf1s/zend-db": [
"patches/zf1s-zend-db-library-zend-db-adapter-abstract-php-return-type.patch",
"patches/zf1s-zend-db-library-zend-db-select-php-fluent-interface.patch"
],
"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-2047 - Pass delimiter char to preg_quote": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/OM-2047.patch"
}
},
"magento-root-dir": ".",
"magento-deploystrategy": "copy",
"magento-deploystrategy-dev": "symlink",
Expand All @@ -100,18 +157,7 @@
"openmage/dev-translations": "copy",
"openmage/legacy-frontend-themes": "copy"
},
"magento-force": true,
"patches": {
"shardj/zf1-future": {
"MAG-1.1.1": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/MAG-1.1.1.patch",
"MAG-1.9.3.0": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/MAG-1.9.3.0.patch",
"MAG-1.9.3.7 - SUPEE-10415": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/MAG-1.9.3.7.patch",
"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"
}
}
"magento-force": true
},
"config": {
"allow-plugins": {
Expand All @@ -122,6 +168,7 @@
"platform": {
"php": "7.4"
},
"sort-packages": true
"sort-packages": true,
"prepend-autoloader": false
}
}
}
Loading
Loading