Merge tag 'v19.4.11' into 20.0

.github/changelog/version_19.txt

@@ -1,5 +1,20 @@
 
-## v19.4.11 - unreleased
+## v19.4.12 - unreleased
+
+
+## v19.4.11 - 2021-02-14
+
+#1248 mark trigger_recollect before collectTotals
+#1418 Fix regression in configuration scope code. Refs #1417
+#1281 remove-reference-to-magentocommerce
+#1383 Remove latest occurrences of XmlConnect
+#1429 Revert "Removed 2 unneeded function calls. Local var is already there."
+Ignore media/captcha directory.
+#1412 Update static-code-analyses.yml
+#1441 Fixed menu cursor
+#1160 Updated README.md, closes #985 #992
+#1407 Reduced multiple dispatch events in login form for other themes.
+
 
 ## v19.4.10 - 2021-01-21
 

.github/changelog/version_20.txt

@@ -3,6 +3,15 @@
 
 ## v20.0.6 - unreleased
 
+## v20.0.7 - 2021-02-14
+
+#1149 add logging to lockfile related Exceptions
+merged changes from v19.4.11
+
+## v20.0.6 - 2021-01-19
+
+merged changes from v19.4.10
+
 ## v20.0.5 - 2020-12-29
 
 merged changes from v19.4.9
@@ -11,7 +20,7 @@ merged changes from v19.4.9
 ## v20.0.4 - 2020-10-20
 
 merged changes from v19.4.8
-including 
+including
 CVE-2020-15244 RCE via PHP Object injection via SOAP Requests
 
 
@@ -23,7 +32,7 @@ merged changes from v19.4.7
 ## v20.0.2 - 2020-08-18
 
 merged changes from v19.4.6
-including 
+including
 CVE-2020-15151 Observable Timing Discrepancy - Improve validation of secret keys (#1138)
 
 ## v20.0.1 - 2020-07-07

.github/workflows/static-code-analyses.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Check PHP Version
         run: php -v
       - name: Check .php files
-        run: '! find . -not \( -path ./.phpstorm.meta.php -prune \) -not \( -path ./lib/PEAR -prune \) -not \( -path ./lib/phpseclib -prune \) -not \( -path ./lib/Zend -prune \) -type f -name "*.php" -exec php -d error_reporting=32767 -l {} \; 2>&1 1> /dev/null | grep "^"'
+        run: '! find . -not \( -path ./.phpstorm.meta.php -prune \) -type f -name "*.php" -exec php -d error_reporting=32767 -l {} \; 2>&1 1> /dev/null | grep "^"'
       - name: Check .phtml files
         run: '! find app/design -type f -name "*.phtml" -exec php -d error_reporting=32767 -l {} \; 2>&1 1> /dev/null | grep "^"'
 
@@ -39,7 +39,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['7.0', '7.4', '8.0']
+        php-versions: ['8.0']
     steps:
       - uses: actions/checkout@v1
       - name: Setup PHP

.gitignore

@@ -1,4 +1,5 @@
 /app/etc/local.xml
 /media/catalog
+/media/captcha
 /dev/tests/functional/generated
 /dev/tests/functional/vendor

README.md

@@ -21,59 +21,79 @@ dependency definition. Each Magento `1.<minor>.<revision>` release will get its
 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.3.4` was merged into the `1.9.3.x` branch.
 
-Note, the branches older than `1.9.3.x` that were created before this strategy came into practice are **not maintained**.
+Note, the branches older than `1.9.4.x` and that were created before this strategy came into practice are **not maintained**.
+
+## Requirements
+
+- PHP 7.0+ (PHP 7.3 and OpenSSL extension strongly recommended)
+- MySQL 5.6+ (8.0+ Recommended)
+
+If using php 7.2+ then mcrypt needs to be disabled in php.ini or pecl to fallback on mcryptcompat and phpseclib. mcrypt is deprecated from 7.2+ onwards.
 
 ## Installation
 
 ### Using Composer
 Download the latest archive and extract it, clone the repo, or add a composer dependency to your existing project like so:
 
-```json
-"openmage/magento-lts": "1.9.4.x"
 ```
+composer require openmage/magento-lts":"^19.4.0"
+```
+
+To get the latest changes use:
+
+```
+composer require openmage/magento-lts":"dev-main"
+```
+
+<small>Note: `dev-main` is just an alias for current `1.9.4.x` branch and may change</small>
 
 ### Using Git
-Go to `https://github.com/OpenMage/magento-lts` and fork the project. Enter your web directory and start a new git project utilizing `git init`. Set git remote to your forked repo using `git remote add origin https://github.com/<YOUR GIT USERNAME>/magento-lts`. Issue `git pull origin master`. Then add the official LTS repo as an upstream using `git remote add upstream https://github.com/OpenMage/magento-lts`. Issue `git pull upstream v19.4.4` or the latest version you want to pull. Be sure to check for conflicts before merging all in the next step. Dont forget to git commit and add files to your own forked repo.
 
-When using git you have the ability to fix and test your own code in your own repo. In addition you can periodically sync with the official upstream Magento LTS repo.
+If you want to contribute to the project:
 
 ```
 git init
 git remote add origin https://github.com/<YOUR GIT USERNAME>/magento-lts
 git pull origin master
 git remote add upstream https://github.com/OpenMage/magento-lts
-git pull upstream v19.4.4
+git pull upstream 1.9.4.x
 git add -A && git commit
 ```
 
 [More Information](http://openmage.github.io/magento-lts/install.html)
 
-## Requirements
+## Changes
 
-- PHP 7.0+ (PHP 7.3 and OpenSSL extension strongly recommended)
-- MySQL 5.6+ (8.0+ Recommended)
+Most important changes will be listed here, all other changes since `19.4.0` can be found in
+[release](https://github.com/OpenMage/magento-lts/releases) notes.
 
-If using php 7.2+ then mcrypt needs to be disabled in php.ini or pecl to fallback on mcryptcompat and phpseclib. mcrypt is deprecated from 7.2+ onwards.
+### Performance
+<small>ToDo: Please add performance related changes as run-time cache, ...</small>
 
-## Translations
+### New Config Options
+- `admin/design/use_legacy_theme`
+- `admin/emails/admin_notification_email_template`
+- `catalog/product_image/progressive_threshold`
 
-There are some new or changed tranlations, if you want add them to your locale pack please check:
+### New Events
+- 'adminhtml_sales_order_create_save_before'
+- `checkout_cart_product_add_before`
+- `sitemap_cms_pages_generating_before`
+- `sitemap_urlset_generating_before`
 
-- `app/locale/en_US/*_LTS.csv`
+### New Translations
 
-## PhpStorm Factory Helper
+There are some new or changed translations, if you want add them to your locale pack please check:
 
-This repo includes class maps for the core Magento files in `.phpstorm.meta.php`.
-This file is generated using the following commands:
+- `app/locale/en_US/Adminhtml_LTS.csv`
+- `app/locale/en_US/Core_LTS.csv`
+- `app/locale/en_US/Sales_LTS.csv`
 
-```
-$ wget https://files.magerun.net/n98-magerun.phar
-$ docker run --rm -u $UID -v $PWD:/var/www/html php:7.0-apache php n98-magerun.phar dev:ide:phpstorm:meta
-```
-
-You can add additional meta files in this directory to cover your own project files. See
-[PhpStorm advanced metadata](https://www.jetbrains.com/help/phpstorm/ide-advanced-metadata.html)
-for more information.
+### Removed Modules
+- `Mage_Compiler`
+- `Mage_GoogleBase`
+- `Mage_Xmlconnect`
+- `Phoenix_Moneybookers`
 
 ## Development Environment with ddev
 - Install [ddev](https://ddev.com/get-started/)
@@ -84,17 +104,21 @@ for more information.
 - Navigate to https://magento-lts.ddev.site
 - When you are done you can stop the test system by typing ```$ ddev stop```
 
-## Removed Modules
+### PhpStorm Factory Helper
 
-- Phoenix_Moneybookers
+This repo includes class maps for the core Magento files in `.phpstorm.meta.php`. 
+To add class maps for installed extensions, you have to install [N98-magerun](https://github.com/netz98/n98-magerun)
+and run command:
 
-    Re-install: `$ composer require openmage-module-fostering/phoenix_moneybookers`
-
-## License
+```
+n98-magerun dev:ide:phpstorm:meta
+```
 
-[OSL v3.0](http://opensource.org/licenses/OSL-3.0)
+You can add additional meta files in this directory to cover your own project files. See
+[PhpStorm advanced metadata](https://www.jetbrains.com/help/phpstorm/ide-advanced-metadata.html)
+for more information.
 
-## Public Communication and online Community places
+## Public Communication
 
 * [Discord](https://discord.gg/EV8aNbU) (maintained by Flyingmana)
 
@@ -105,7 +129,11 @@ for more information.
 * [Daniel Fahlke aka Flyingmana](https://github.com/Flyingmana)
 * [Tymoteusz Motylewski](https://github.com/tmotyl)
 * [Sven Reichel](https://github.com/sreichel)
-* Pull requests are welcome
+
+## License
+
+- [OSL v3.0](http://opensource.org/licenses/OSL-3.0)
+- [AFL v3.0](http://opensource.org/licenses/AFL-3.0)
 
 ## Contributors ✨
 

app/Mage.php

@@ -215,7 +215,7 @@ public static function getOpenMageVersionInfo()
         return array(
             'major'     => '20',
             'minor'     => '0',
-            'patch'     => '6',
+            'patch'     => '7',
             'stability' => '', // beta,alpha,rc
             'number'    => '', // 1,2,3,0.3.7,x.7.z.92 @see https://semver.org/#spec-item-9
         );

app/code/core/Mage/Adminhtml/Block/System/Config/Form.php

@@ -627,11 +627,11 @@ protected function _canShowField($field)
 
         switch ($this->getScope()) {
             case self::SCOPE_DEFAULT:
-                return (bool)$field->show_in_default;
+                return (bool)(int)$field->show_in_default;
             case self::SCOPE_WEBSITES:
-                return (bool)$field->show_in_website;
+                return (bool)(int)$field->show_in_website;
             case self::SCOPE_STORES:
-                return (bool)$field->show_in_store;
+                return (bool)(int)$field->show_in_store;
         }
         return true;
     }