From 68725749e5966d0814258b43d85f8c58120afd07 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Sun, 25 Dec 2022 16:31:47 +0000 Subject: [PATCH 1/8] Added notes about 19.5 and 20.1 in README --- README.md | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index cfb134ab8b3..3aad707feec 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ __Please be aware that although OpenMage is compatible that one or more extensio Download the latest archive and extract it, clone the repo, or add a composer dependency to your existing project like so: ```bash -composer require "openmage/magento-lts":"^19.4.0" +composer require "openmage/magento-lts":"^19.5.0" ``` To get the latest changes use: @@ -116,9 +116,8 @@ Most important changes will be listed here, all other changes since `19.4.0` can - `Mage_Xmlconnect` - `Phoenix_Moneybookers` - -_If you rely on that modules you can reinstall them with composer:_ -- `Mage_PageCache`: `composer require openmage/bc-mage-pagecache:dev-master` +_If you rely on those modules you can reinstall them with composer:_ +- `Mage_PageCache`: `composer require openmage/module-mage-pagecache` ### Between OpenMage 19.4.18 / 20.0.16 and 19.4.19 / 20.0.17 @@ -140,6 +139,23 @@ Do not use 20.x.x if you need IE support. For full list of changes, you can [compare tags](https://github.com/OpenMage/magento-lts/compare/1.9.4.x...20.0). +### Since OpenMage 19.5.0 / 20.1.0 + +Most of the 3rd party libraries/modules that were bundled in our repository were removed and migrated to composer dependencies. +This allows for better maintenance and upgradability. + +Specifically: +- phpseclib, mcrypt_compat, Cm_RedisSession, Cm_Cache_Backend_Redis, Pelago_Emogrifier (#2411) +- Zend Framework 1 (#2827) + +If your project uses OpenMage through composer then all dependencies will be managed automatically. +If you just extracted the release zip/tarball in your project's main folder then be sure to: +- remove the old copy of aforementioned libraries from your project, you can do that with this command: + `rm -rf lib/Cm lib/Credis lib/mcryptcompat lib/Pelago lib/phpseclib lib/Zend` +- download the new release zip file that is named `openmage-VERSIONNUMBER.zip`, this one is built to contain the `vendor` + folder generated by composer, with all the dependencies in it +- extract the zip file in your project's repository as you always did + ### New Config Options - `admin/design/use_legacy_theme` From ae5e715eb719ddf3d054a15a76d75ae729663fb5 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Sun, 25 Dec 2022 23:22:29 +0100 Subject: [PATCH 2/8] Removed note for mcrypt It was removed from PHP7.2 --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 3aad707feec..07945063e37 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,7 @@ to do so (based on available resources). For example, Magento version `1.9.4.5` ## Requirements -- PHP 7.3+ (PHP 8.0 is supported)
-`mcrypt` extension needs to be disabled to fallback on `mcryptcompat` and `phpseclib`. +- PHP 7.3+ (PHP 8.0 is supported) - MySQL 5.6+ (8.0+ recommended) or MariaDB __Please be aware that although OpenMage is compatible that one or more extensions may not be.__ From ca158fcb0eb52fca03bcc46e88af99ca202679bd Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Sun, 25 Dec 2022 23:31:47 +0100 Subject: [PATCH 3/8] Moved versioning section --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 07945063e37..c67476fb648 100644 --- a/README.md +++ b/README.md @@ -24,13 +24,6 @@ level of backwards compatibility to the official releases. **Pull requests with unofficial bug fixes and security patches from the community are encouraged and welcome!** -### Versioning - -Though Magento does __not__ follow [Semantic Versioning](http://semver.org/) we aim to provide a workable system for -dependency definition. Each Magento `1..` release will get its own branch (named `1...x`) -that will be independently maintained with upstream patches and community bug fixes for as long as it makes sense -to do so (based on available resources). For example, Magento version `1.9.4.5` was merged into the `1.9.4.x` branch. - ## Requirements - PHP 7.3+ (PHP 8.0 is supported) @@ -236,6 +229,13 @@ You can add additional meta files in this directory to cover your own project fi [PhpStorm advanced metadata](https://www.jetbrains.com/help/phpstorm/ide-advanced-metadata.html) for more information. +## Versioning + +Though Magento does __not__ follow [Semantic Versioning](http://semver.org/) we aim to provide a workable system for +dependency definition. Each Magento `1..` release will get its own branch (named `1...x`) +that will be independently maintained with upstream patches and community bug fixes for as long as it makes sense +to do so (based on available resources). For example, Magento version `1.9.4.5` was merged into the `1.9.4.x` branch. + ## Public Communication * [Discord](https://discord.gg/EV8aNbU) (maintained by Flyingmana) From 805cf4ab4a05f6f14ad805f2ea3908fe18864605 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Sun, 25 Dec 2022 23:37:01 +0100 Subject: [PATCH 4/8] Updated requirements --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index c67476fb648..890ed034eef 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,10 @@ level of backwards compatibility to the official releases. - PHP 7.3+ (PHP 8.0 is supported) - MySQL 5.6+ (8.0+ recommended) or MariaDB + +- PHP extension `intl` since 1.9.4.19 & 20.0.17 +- Command `patch` (v2.7+) since 1.9.5.0 & 20.1.0 + __Please be aware that although OpenMage is compatible that one or more extensions may not be.__ ### Optional From 8b5c583df1581f8e9e5a31df6381f0a0d7594b3e Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Sun, 25 Dec 2022 23:54:46 +0100 Subject: [PATCH 5/8] Updated badges --- README.md | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 890ed034eef..cdb7df86328 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,11 @@

-All Contributors +All Contributors Total Downloads License -
PHP Security workflow Badge -Composer workflow Badge -PHP Syntax Check workflow badge -XML Syntax Check workflow badge -PHPCS workflow badge -PHP-CS-Fixer workflow badge -PHPStan workflow badge -Sonar workflow badge -PHPUnit workflow badge +CI workflow Badge

# Magento - Long Term Support From ad20f9570a339a9290e99662d5444a5a2dd1b563 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Mon, 26 Dec 2022 00:03:13 +0000 Subject: [PATCH 6/8] No need for the "unofficial" word --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cdb7df86328..b058c5ec163 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ This repository is the home of an **unofficial** community-driven project. It's to the Magento CE official releases which integrates improvements directly from the community while maintaining a high level of backwards compatibility to the official releases. -**Pull requests with unofficial bug fixes and security patches from the community are encouraged and welcome!** +**Pull requests with bug fixes and security patches from the community are encouraged and welcome!** ## Requirements From b81e9e178f2e9b86540ee46cff1ddf8e7737515c Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Mon, 26 Dec 2022 00:13:24 +0000 Subject: [PATCH 7/8] Added note about gpatch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b058c5ec163..65b1043a2f9 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ level of backwards compatibility to the official releases. - PHP extension `intl` since 1.9.4.19 & 20.0.17 -- Command `patch` (v2.7+) since 1.9.5.0 & 20.1.0 +- Command `patch` 2.7+ (or `gpatch on MacOS/HomeBrew) since 1.9.5.0 & 20.1.0 __Please be aware that although OpenMage is compatible that one or more extensions may not be.__ From 23706fa8015e98b35b65fe7b3564ea35fde019e7 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Mon, 26 Dec 2022 00:15:19 +0000 Subject: [PATCH 8/8] Typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 65b1043a2f9..53a77f46240 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ level of backwards compatibility to the official releases. - PHP extension `intl` since 1.9.4.19 & 20.0.17 -- Command `patch` 2.7+ (or `gpatch on MacOS/HomeBrew) since 1.9.5.0 & 20.1.0 +- Command `patch` 2.7+ (or `gpatch` on MacOS/HomeBrew) since 1.9.5.0 & 20.1.0 __Please be aware that although OpenMage is compatible that one or more extensions may not be.__