Merge branch '1.9.4.x' into topic-extjs

Author: fballiano

.ddev/commands/web/vendor-patches

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+## Description: create Vendor Patches
+## Usage: vendor-patches
+## Example: ddev vendor-patches
+
+php vendor/bin/vendor-patches generate

.github/dependabot.yml

@@ -3,7 +3,7 @@ updates:
   - package-ecosystem: "composer"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "daily"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

.github/workflows/release.yml

@@ -26,6 +26,10 @@ jobs:
         key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
         restore-keys: ${{ runner.os }}-composer-
 
+    - name: Require legacy frontend themes on v19
+      if: startsWith(github.event.release.tag_name, 'v19')
+      run: composer require --no-install --prefer-dist --no-progress --ignore-platform-req=ext-* openmage/legacy-frontend-themes
+
     - name: Require Mage_Backup on v19
       if: startsWith(github.event.release.tag_name, 'v19')
       run: composer require --no-install --prefer-dist --no-progress --ignore-platform-req=ext-* openmage/module-mage-backup

.htaccess

@@ -197,6 +197,7 @@
     ExpiresByType text/x-javascript "access plus 1 month"
     ExpiresByType application/x-shockwave-flash "access plus 1 month"
     ExpiresByType image/x-icon "access plus 1 year"
+    ExpiresByType image/svg+xml "access plus 1 year"
     ExpiresDefault "access plus 2 days"
 </IfModule>
 

README.md

@@ -1,6 +1,6 @@
 <p align="center">
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href="#contributors-"><img src="https://img.shields.io/badge/all_contributors-151-orange.svg" alt="All Contributors"></a>
+<a href="#contributors-"><img src="https://img.shields.io/badge/all_contributors-152-orange.svg" alt="All Contributors"></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 <a href="https://packagist.org/packages/openmage/magento-lts"><img src="https://poser.pugx.org/openmage/magento-lts/d/total.svg" alt="Total Downloads"></a>
 <a href="https://packagist.org/packages/openmage/magento-lts"><img src="https://poser.pugx.org/openmage/magento-lts/license.svg" alt="License"></a>
@@ -21,8 +21,8 @@ level of backwards compatibility to the official releases.
 ## Table of contents
 
 - [Requirements](#requirements)
-  - [Optional](#optional)
 - [Installation](#installation)
+  - [Manual Install](#manual-install)
   - [Composer](#composer)
   - [Git](#git)
 - [Secure your installation](#secure-your-installation)
@@ -36,7 +36,7 @@ level of backwards compatibility to the official releases.
   - [New Events](#new-events)
   - [Changes to SOAP/WSDL](#changes-to-soapwsdl)
 - [Development Environment with ddev](#development-environment-with-ddev)
-- [Development with PHP 8.1](#development-with-php-81)
+- [Development with PHP 8.1+](#development-with-php-81)
 - [PhpStorm Factory Helper](#phpstorm-factory-helper)
 - [Versioning](#versioning)
 - [Public Communication](#public-communication)
@@ -46,36 +46,74 @@ level of backwards compatibility to the official releases.
 
 ## Requirements
 
-- PHP 7.3+ (PHP 8.0 is supported, PHP 8.1 is work in progress)
+- PHP 7.3+ (PHP 8.0 is supported, PHP 8.1 supported but some warnings may be shown/logged, PHP 8.2 is usable but still being tested)
 - MySQL 5.6+ (8.0+ recommended) or MariaDB
+- optional: Redis 5.x, 6.x and 7.0.x are supported
 
 
 - PHP extension `intl` <small>since 1.9.4.19 & 20.0.17</small>
 - Command `patch` 2.7+ (or `gpatch` on MacOS/HomeBrew) <small>since 1.9.5.0 & 20.1.0</small>
 
-__Please be aware that although OpenMage is compatible that one or more extensions may not be.__
-
-### Optional
+## Installation
 
-- Redis 5+ (6.x recommended, latest verified compatible 6.0.7 with 20.x)
+### Manual Install
 
-## Installation
+Download the latest [release archive](https://github.com/OpenMage/magento-lts/releases) and extract it over your existing install. **Important:** you must download the ZIP file from a tagged version on the releases page, otherwise there will be missing dependencies.
 
 ### Composer
 
-Download the latest archive and extract it, clone the repo, or add a composer dependency to your existing project like so:
+Step 1: Create a new composer project:
 
 ```bash
-composer require "openmage/magento-lts":"^19.5.0"
+composer init
+```
+
+Step 2: Configure composer. **The below options are required.** You can see all options [here](https://github.com/AydinHassan/magento-core-composer-installer#configuration).
+
+```bash
+# Allow composer to apply patches to dependencies of magento-lts
+composer config --json extra.enable-patching true
+
+# Configure Magento core composer installer to use magento-lts as the Magento source package
+composer config extra.magento-core-package-type magento-source
+
+# Configure the root directory that magento-lts will be installed to, such as "pub", "htdocs", or "www"
+composer config extra.magento-root-dir pub
+```
+
+Step 3: Require `magento-core-composer-installer`:
+
+``` bash
+# PHP 7
+composer require "aydin-hassan/magento-core-composer-installer":"~2.0.0"
+
+# PHP 8
+composer require "aydin-hassan/magento-core-composer-installer":"^2.1.0"
 ```
 
-To get the latest changes use:
+<small>Note: be sure to select `y` if composer asks you to trust `aydin-hassan/magento-core-composer-installer`.</small>
+
+Step 4: Require `magento-lts`:
 
 ```bash
-composer require "openmage/magento-lts":"dev-main"
+# OpenMage v19
+composer require "openmage/magento-lts":"^19.4.0"
+
+# OpenMage v20
+composer require "openmage/magento-lts":"^20.0.0"
 ```
 
-<small>Note: `dev-main` is just an alias for current `1.9.4.x` branch and may change</small>
+<small>Note: be sure to select `y` if composer asks you to trust `magento-hackathon/magento-composer-installer` or `cweagans/composer-patches`.</small>
+
+To install the latest development version (may be unstable):
+
+```bash
+# OpenMage v19
+composer require "openmage/magento-lts":"1.9.4.x-dev"
+
+# OpenMage v20
+composer require "openmage/magento-lts":"20.0.x-dev"
+```
 
 ### Git
 
@@ -129,7 +167,7 @@ Most important changes will be listed here, all other changes since `19.4.0` can
 
 ### Between Magento 1.9.4.5 and OpenMage 19.x
 
-- bug fixes and PHP 7.x, 8.0 and 8.1 compatibility
+- bug fixes and PHP 7.x, 8.0, 8.1 and 8.2 compatibility
 - added config cache for system.xml ([#1916](https://github.com/OpenMage/magento-lts/pull/1916))
 - search for "NULL" in backend grids ([#1203](https://github.com/OpenMage/magento-lts/pull/1203))
 - removed `lib/flex` containing unused ActionScript "file uploader" files ([#2271](https://github.com/OpenMage/magento-lts/pull/2271))
@@ -145,6 +183,7 @@ Most important changes will be listed here, all other changes since `19.4.0` can
 _If you rely on those modules you can reinstall them with composer:_
 - `Mage_Backup`: `composer require openmage/module-mage-backup`
 - `Mage_PageCache`: `composer require openmage/module-mage-pagecache`
+- `Legacy frontend themes`: `composer require openmage/legacy-frontend-themes`
 
 ### Between OpenMage 19.4.18 / 20.0.16 and 19.4.19 / 20.0.17
 
@@ -161,7 +200,8 @@ Do not use 20.x.x if you need IE support.
 - reduce needless saves by avoiding setting `_hasDataChanges` flag ([#2066](https://github.com/OpenMage/magento-lts/pull/2066))
 - removed support for `global/sales/old_fields_map` defined in XML ([#921](https://github.com/OpenMage/magento-lts/pull/921))
 - enabled website level config cache ([#2355](https://github.com/OpenMage/magento-lts/pull/2355))
-- make overrides of Mage_Core_Model_Resource_Db_Abstract::delete respect parent api ([#1257](https://github.com/OpenMage/magento-lts/pull/1257))
+- made overrides of Mage_Core_Model_Resource_Db_Abstract::delete respect parent api ([#1257](https://github.com/OpenMage/magento-lts/pull/1257))
+- rewrote Mage_Eav_Model_Config as cache for all eav entity and attribute reads ([#2993](https://github.com/OpenMage/magento-lts/pull/2993))
 
 For full list of changes, you can [compare tags](https://github.com/OpenMage/magento-lts/compare/1.9.4.x...20.0).
 
@@ -178,14 +218,18 @@ If your project uses OpenMage through composer then all dependencies will be man
 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:
   ```bash
-  rm -rf lib/Cm lib/Credis lib/mcryptcompat lib/Pelago lib/phpseclib lib/Zend
+  rm -rf app/code/core/Zend 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
 
+We also decided to remove our Zend_DB patches (that were stored in `app/code/core/Zend`) because they were very old and
+not compatible with the new implementations made by ZF1-Future, which is much more advanced and feature rich.
+This may generate a problem with `Zend_Db_Select' statements that do not use 'Zend_Db_Expr' to quote expressions.
+If you see SQL errors after upgrading please remember to check for this specific issue in your code.
+
 ### New Config Options
 
 - `admin/design/use_legacy_theme`
@@ -253,11 +297,11 @@ grep -rn 'urn:Magento' --include \*.xml
   ddev launch
   ```
 
-## Development with PHP 8.1
+## Development with PHP 8.1+
 
 Deprecation errors are supressed by default.
 
-If you want to work on PHP 8.1 support, set environment variable `DEV_PHP_STRICT` to `1`, to show all errors.  
+If you want to work on PHP 8.1+ support, set environment variable `DEV_PHP_STRICT` to `1`, to show all errors.  
 
 ## PhpStorm Factory Helper
 
@@ -501,6 +545,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/discountscott"><img src="https://avatars.githubusercontent.com/u/5454596?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Scott Moore</b></sub></a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/rfeese"><img src="https://avatars.githubusercontent.com/u/7074181?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Roger Feese</b></sub></a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/AGelzer"><img src="https://avatars.githubusercontent.com/u/34437931?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Alexander Gelzer</b></sub></a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://gitlab.com/davidhiendl"><img src="https://avatars.githubusercontent.com/u/11006964?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>David Hiendl</b></sub></a></td>
     </tr>
   </tbody>
 </table>

api.php

@@ -19,11 +19,6 @@
  * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-if (version_compare(phpversion(), '7.3.0', '<') === true) {
-    echo 'It looks like you have an invalid PHP version. OpenMage supports PHP 7.3.0 or newer';
-    exit;
-}
-
 $magentoRootDir = getcwd();
 $bootstrapFilename = $magentoRootDir . '/app/bootstrap.php';
 $mageFilename = $magentoRootDir . '/app/Mage.php';

app/Mage.php

@@ -214,7 +214,7 @@ public static function getOpenMageVersionInfo(): array
                 'major'     => '20',
                 'minor'     => '1',
                 'patch'     => '0',
-                'stability' => 'rc1', // beta,alpha,rc
+                'stability' => 'rc2', // beta,alpha,rc
                 'number'    => '', // 1,2,3,0.3.7,x.7.z.92 @see https://semver.org/#spec-item-9
             ];
         }
@@ -223,7 +223,7 @@ public static function getOpenMageVersionInfo(): array
             'major'     => '19',
             'minor'     => '5',
             'patch'     => '0',
-            'stability' => 'rc1', // beta,alpha,rc
+            'stability' => 'rc2', // 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/Catalog/Category/Abstract.php

@@ -132,9 +132,7 @@ public function getRootByIds($ids)
             $tree   = $categoryTreeResource->loadByIds($ids);
             $rootId = Mage_Catalog_Model_Category::TREE_ROOT_ID;
             $root   = $tree->getNodeById($rootId);
-            if ($root && $rootId != Mage_Catalog_Model_Category::TREE_ROOT_ID) {
-                $root->setIsVisible(true);
-            } elseif ($root && $root->getId() == Mage_Catalog_Model_Category::TREE_ROOT_ID) {
+            if ($root && $root->getId() == Mage_Catalog_Model_Category::TREE_ROOT_ID) {
                 $root->setName(Mage::helper('catalog')->__('Root'));
             }
 
@@ -148,9 +146,7 @@ public function getNode($parentNodeCategory, $recursionLevel = 2)
     {
         $tree = Mage::getResourceModel('catalog/category_tree');
 
-        $nodeId     = $parentNodeCategory->getId();
-        $parentId   = $parentNodeCategory->getParentId();
-
+        $nodeId = $parentNodeCategory->getId();
         $node = $tree->loadNode($nodeId);
         $node->loadChildren($recursionLevel);
 

app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php

@@ -33,7 +33,7 @@ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
         $_months = [];
         for ($i = 1; $i <= 12; $i++) {
             $_months[$i] = Mage::app()->getLocale()
-                ->date(mktime(null, null, null, $i))
+                ->date(mktime(0, null, null, $i))
                 ->get(Zend_Date::MONTH_NAME);
         }
 

app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php

@@ -406,7 +406,7 @@ public function relatedGridAction()
         $this->_initProduct();
         $this->loadLayout();
         $this->getLayout()->getBlock('catalog.product.edit.tab.related')
-            ->setProductsRelated($this->getRequest()->getPost('products_related', null));
+            ->setProductsRelated($this->getRequest()->getPost('products_related', []));
         $this->renderLayout();
     }
 
@@ -419,7 +419,7 @@ public function upsellGridAction()
         $this->_initProduct();
         $this->loadLayout();
         $this->getLayout()->getBlock('catalog.product.edit.tab.upsell')
-            ->setProductsRelated($this->getRequest()->getPost('products_upsell', null));
+            ->setProductsUpsell($this->getRequest()->getPost('products_upsell', []));
         $this->renderLayout();
     }
 
@@ -432,7 +432,7 @@ public function crosssellGridAction()
         $this->_initProduct();
         $this->loadLayout();
         $this->getLayout()->getBlock('catalog.product.edit.tab.crosssell')
-            ->setProductsRelated($this->getRequest()->getPost('products_crosssell', null));
+            ->setProductsCrossSell($this->getRequest()->getPost('products_crosssell', []));
         $this->renderLayout();
     }
 
@@ -445,7 +445,7 @@ public function superGroupAction()
         $this->_initProduct();
         $this->loadLayout();
         $this->getLayout()->getBlock('catalog.product.edit.tab.super.group')
-            ->setProductsGrouped($this->getRequest()->getPost('products_grouped', null));
+            ->setProductsGrouped($this->getRequest()->getPost('products_grouped', []));
         $this->renderLayout();
     }
 

app/code/core/Mage/Adminhtml/controllers/PollController.php

@@ -141,48 +141,44 @@ public function validateAction()
                     Mage::throwException(Mage::helper('adminhtml')->__('Please, select "Visible in Stores" for this poll first.'));
                 }
 
-                if (is_array($stores)) {
-                    $storeIds = [];
-                    foreach ($stores as $storeIdList) {
-                        $storeIdList = explode(',', $storeIdList);
-                        if (!$storeIdList) {
-                            continue;
-                        }
-                        foreach ($storeIdList as $storeId) {
-                            if ($storeId > 0) {
-                                $storeIds[] = $storeId;
-                            }
-                        }
+                $storeIds = [];
+                foreach ($stores as $storeIdList) {
+                    $storeIdList = explode(',', $storeIdList);
+                    if (!$storeIdList) {
+                        continue;
                     }
-                    if (count($storeIds) === 0) {
-                        Mage::throwException(Mage::helper('adminhtml')->__('Please, select "Visible in Stores" for this poll first.'));
+                    foreach ($storeIdList as $storeId) {
+                        if ($storeId > 0) {
+                            $storeIds[] = $storeId;
+                        }
                     }
-                    $pollModel->setStoreIds($storeIds);
                 }
+                if (count($storeIds) === 0) {
+                    Mage::throwException(Mage::helper('adminhtml')->__('Please, select "Visible in Stores" for this poll first.'));
+                }
+                $pollModel->setStoreIds($storeIds);
 
                 $answers = $this->getRequest()->getParam('answer');
 
                 if (!is_array($answers) || !count($answers)) {
                     Mage::throwException(Mage::helper('adminhtml')->__('Please, add some answers to this poll first.'));
                 }
 
-                if (is_array($answers)) {
-                    $_titles = [];
-                    foreach ($answers as $key => $answer) {
-                        if (in_array($answer['title'], $_titles)) {
-                            Mage::throwException(Mage::helper('adminhtml')->__('Your answers contain duplicates.'));
-                        }
-                        $_titles[] = $answer['title'];
-
-                        $answerModel = Mage::getModel('poll/poll_answer');
-                        if ((int) $key > 0) {
-                            $answerModel->setId($key);
-                        }
-                        $answerModel->setAnswerTitle($answer['title'])
-                            ->setVotesCount($answer['votes']);
+                $_titles = [];
+                foreach ($answers as $key => $answer) {
+                    if (in_array($answer['title'], $_titles)) {
+                        Mage::throwException(Mage::helper('adminhtml')->__('Your answers contain duplicates.'));
+                    }
+                    $_titles[] = $answer['title'];
 
-                        $pollModel->addAnswer($answerModel);
+                    $answerModel = Mage::getModel('poll/poll_answer');
+                    if ((int) $key > 0) {
+                        $answerModel->setId($key);
                     }
+                    $answerModel->setAnswerTitle($answer['title'])
+                        ->setVotesCount($answer['votes']);
+
+                    $pollModel->addAnswer($answerModel);
                 }
 
                 $pollModel->save();