merged 1.9.4.x

.github/phpstan.neon

@@ -2,6 +2,7 @@ includes:
     - ../vendor/macopedia/phpstan-magento1/extension.neon
     - phpstan-baseline.neon
 parameters:
+    phpVersion: 80000 # PHP 8.0
     magentoRootPath: %currentWorkingDirectory%
     paths:
          - %currentWorkingDirectory%/app/code/core/Mage

.github/workflows/phpstan.yml

@@ -6,9 +6,13 @@ on:
   push:
     paths:
       - '**.php'
+      - '.github/phpstan*'
+      - '.github/workflows/phpstan*'
   pull_request:
     paths:
       - '**.php'
+      - '.github/phpstan*'
+      - '.github/workflows/phpstan*'
   # Allow manually triggering the workflow.
   workflow_dispatch:
 

.github/workflows/phpunit.yml

@@ -6,9 +6,11 @@ on:
   push:
     paths:
       - '**.php'
+      - '.github/workflows/phpunit*'
   pull_request:
     paths:
       - '**.php'
+      - '.github/workflows/phpunit*'
   # Allow manually triggering the workflow.
   workflow_dispatch:
 
@@ -23,7 +25,7 @@ jobs:
           path: ./
 
       - name: Validate composer
-        run: composer validate --strict
+        run: composer validate
 
       - name: Get composer cache directory
         id: composer-cache

.github/workflows/syntax-php.yml

@@ -7,10 +7,12 @@ on:
     paths:
       - '**.php'
       - '**.phtml'
+      - '.github/workflows/syntax-php.yml'
   pull_request:
     paths:
       - '**.php'
       - '**.phtml'
+      - '.github/workflows/syntax-php.yml'
   # Allow manually triggering the workflow.
   workflow_dispatch:
 

.github/workflows/syntax-xml.yml

@@ -6,9 +6,11 @@ on:
   push:
     paths:
       - '**.xml'
+      - '.github/workflows/syntax-xml.yml'
   pull_request:
     paths:
       - '**.xml'
+      - '.github/workflows/syntax-xml.yml'
   # Allow manually triggering the workflow.
   workflow_dispatch:
 

app/Mage.php

@@ -222,7 +222,7 @@ public static function getOpenMageVersionInfo()
             return [
                 'major'     => '20',
                 'minor'     => '0',
-                'patch'     => '16',
+                'patch'     => '17',
                 'stability' => '', // beta,alpha,rc
                 'number'    => '', // 1,2,3,0.3.7,x.7.z.92 @see https://semver.org/#spec-item-9
             ];
@@ -231,7 +231,7 @@ public static function getOpenMageVersionInfo()
         return [
             'major'     => '19',
             'minor'     => '4',
-            'patch'     => '18',
+            'patch'     => '19',
             '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/Admin/etc/config.xml

@@ -23,7 +23,7 @@
 <config>
     <modules>
         <Mage_Admin>
-            <version>1.6.1.3</version>
+            <version>1.6.1.4</version>
         </Mage_Admin>
     </modules>
     <global>

app/code/core/Mage/Admin/sql/admin_setup/upgrade-1.6.1.3-1.6.1.4.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * OpenMage
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magento.com so we can send you a copy immediately.
+ *
+ * @category   Mage
+ * @package    Mage_Admin
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
+ * @copyright  Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/** @var Mage_Core_Model_Resource_Setup $installer */
+$installer = $this;
+$installer->startSetup();
+
+$obsoleteAcl = [
+    'admin/page_cache',
+    'admin/system/config/moneybookers',
+    'admin/system/extensions',
+    'admin/system/extensions/local',
+    'admin/system/extensions/custom',
+    'admin/system/tools/backup',
+    'admin/system/tools/backup/rollback',
+    'admin/system/tools/compiler',
+    'admin/xmlconnect',
+    'admin/xmlconnect/mobile',
+    'admin/xmlconnect/admin_connect',
+    'admin/xmlconnect/queue',
+    'admin/xmlconnect/history',
+    'admin/xmlconnect/templates'
+];
+
+
+$installer->getConnection()->delete(
+    $installer->getTable('admin/rule'),
+    ['resource_id IN (?)' => $obsoleteAcl]
+);
+
+$installer->endSetup();

app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php

@@ -101,6 +101,10 @@ protected function _initCreditmemo($update = false)
         $orderId = $this->getRequest()->getParam('order_id');
         if ($creditmemoId) {
             $creditmemo = Mage::getModel('sales/order_creditmemo')->load($creditmemoId);
+            if (!$creditmemo->getId()) {
+                $this->_getSession()->addError($this->__('The credit memo no longer exists.'));
+                return false;
+            }
         } elseif ($orderId) {
             $data   = $this->getRequest()->getParam('creditmemo');
             $order  = Mage::getModel('sales/order')->load($orderId);
@@ -193,7 +197,7 @@ public function viewAction()
             $this->_setActiveMenu('sales/order')
                 ->renderLayout();
         } else {
-            $this->_forward('noRoute');
+            $this->_redirect('*/*');
         }
     }
 

app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php

@@ -53,6 +53,10 @@ protected function _initShipment()
         $orderId = $this->getRequest()->getParam('order_id');
         if ($shipmentId) {
             $shipment = Mage::getModel('sales/order_shipment')->load($shipmentId);
+            if (!$shipment->getId()) {
+                $this->_getSession()->addError($this->__('The shipment no longer exists.'));
+                return false;
+            }
         } elseif ($orderId) {
             $order      = Mage::getModel('sales/order')->load($orderId);
 
@@ -133,7 +137,7 @@ public function viewAction()
             $this->_setActiveMenu('sales/order')
                 ->renderLayout();
         } else {
-            $this->_forward('noRoute');
+            $this->_redirect('*/*/');
         }
     }
 

app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php

@@ -132,7 +132,7 @@ public function saveAction()
         $session = Mage::getSingleton('adminhtml/session');
         /** @var Mage_Adminhtml_Model_Session $session */
 
-        $groups = $this->getRequest()->getPost('groups');
+        $groups = $this->getRequest()->getPost('groups', []);
 
         if (isset($_FILES['groups']['name']) && is_array($_FILES['groups']['name'])) {
             /**
@@ -180,7 +180,10 @@ public function saveAction()
             Mage::dispatchEvent("admin_system_config_changed_section_{$section}",
                 ['website' => $website, 'store' => $store]
             );
-            $session->addSuccess(Mage::helper('adminhtml')->__('The configuration has been saved.'));
+
+            if (!empty($groups)) {
+                $session->addSuccess(Mage::helper('adminhtml')->__('The configuration has been saved.'));
+            }
         }
         catch (Mage_Core_Exception $e) {
             foreach(explode("\n", $e->getMessage()) as $message) {

app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php

@@ -51,7 +51,7 @@ public function run()
         if ($this->getController()->getRequest()->getParam('wsdl') !== null) {
             $this->wsdlConfig->setHandler($this->getHandler())
                 ->init();
-            
+
             $this->getController()->getResponse()
                 ->clearHeaders()
                 ->setHeader('Content-Type', 'text/xml; charset='.$apiConfigCharset)

app/code/core/Mage/Captcha/Block/Captcha.php

@@ -37,9 +37,12 @@ class Mage_Captcha_Block_Captcha extends Mage_Core_Block_Template
      */
     protected function _toHtml()
     {
-        $blockPath = Mage::helper('captcha')->getCaptcha($this->getFormId())->getBlockName();
-        $block = $this->getLayout()->createBlock($blockPath);
-        $block->setData($this->getData());
-        return $block->toHtml();
+        if (Mage::helper('captcha')->isEnabled()) {
+            $blockPath = Mage::helper('captcha')->getCaptcha($this->getFormId())->getBlockName();
+            $block = $this->getLayout()->createBlock($blockPath);
+            $block->setData($this->getData());
+            return $block->toHtml();
+        }
+        return '';
     }
 }

app/code/core/Mage/Captcha/Block/Captcha/Zend.php

@@ -68,7 +68,7 @@ public function getRefreshUrl()
      */
     protected function _toHtml()
     {
-        if ($this->getCaptchaModel()->isRequired()) {
+        if (Mage::helper('captcha')->isEnabled() && $this->getCaptchaModel()->isRequired()) {
             $this->getCaptchaModel()->generate();
             return parent::_toHtml();
         }

app/code/core/Mage/Captcha/Helper/Data.php

@@ -56,6 +56,16 @@ class Mage_Captcha_Helper_Data extends Mage_Core_Helper_Abstract
      */
     protected $_captcha = [];
 
+    /**
+     * @return bool
+     * @since 19.4.19 / 20.0.17
+     */
+    public function isEnabled(): bool
+    {
+        $path = Mage::app()->getStore()->isAdmin() ? 'admin/captcha/enable' : 'customer/captcha/enable';
+        return Mage::getStoreConfigFlag($path);
+    }
+
     /**
      * Get Captcha
      *

app/code/core/Mage/Catalog/Model/Resource/Category/Tree.php

@@ -143,9 +143,9 @@ public function addCollectionData(
         }
 
         $nodeIds = [];
-        foreach ($this->getNodes() as $node) {
-            if (!in_array($node->getId(), $exclude)) {
-                $nodeIds[] = $node->getId();
+        foreach ($this->getNodes() as $id => $node) {
+            if (!in_array($id, $exclude)) {
+                $nodeIds[] = $id;
             }
         }
         $collection->addIdFilter($nodeIds);
@@ -167,14 +167,14 @@ public function addCollectionData(
             $collection->load();
 
             foreach ($collection as $category) {
-                if ($this->getNodeById($category->getId())) {
-                    $this->getNodeById($category->getId())
-                        ->addData($category->getData());
+                $node = $this->getNodeById($category->getId());
+                if ($node) {
+                    $node->addData($category->getData());
                 }
             }
 
-            foreach ($this->getNodes() as $node) {
-                if (!$collection->getItemById($node->getId()) && $node->getParent()) {
+            foreach ($this->getNodes() as $id => $node) {
+                if (!$collection->getItemById($id) && $node->getParent()) {
                     $this->removeNode($node);
                 }
             }

app/code/core/Mage/Core/Model/Session/Abstract/Varien.php

@@ -156,7 +156,7 @@ public function start($sessionName = null)
         if (Mage::app()->getFrontController()->getRequest()->isSecure() && empty($cookieParams['secure'])) {
             $secureCookieName = $this->getSessionName() . '_cid';
             $cookieValue = $cookie->get($secureCookieName);
-          
+
             // Migrate old cookie from 'frontend'
             if ( ! $cookieValue
                 && $sessionName === \Mage_Core_Controller_Front_Action::SESSION_NAMESPACE
@@ -167,7 +167,7 @@ public function start($sessionName = null)
                 $cookie->set($secureCookieName, $cookieValue);
                 $cookie->delete('frontend_cid');
             }
-          
+
             // Set secure cookie check value in session if not yet set
             if (!isset($_SESSION[self::SECURE_COOKIE_CHECK_KEY])) {
                 $cookieValue = Mage::helper('core')->getRandomString(16);
@@ -569,7 +569,7 @@ public function getValidatorData()
 
         return $parts;
     }
-    
+
     /**
      * @return array
      */

app/code/core/Mage/Eav/Model/Entity/Abstract.php

@@ -985,7 +985,7 @@ protected function _loadModelAttributes($object)
                 } else {
                     $select = $selects;
                 }
-                
+
                 $values = $this->_getReadAdapter()->fetchAll($select);
                 foreach ($values as $valueRow) {
                     $this->_setAttributeValue($object, $valueRow);

app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php

@@ -165,7 +165,7 @@ protected function _initSelect()
         if ($this->getEntity()->getEntityTable() === Mage_Eav_Model_Entity::DEFAULT_ENTITY_TABLE && $this->getEntity()->getTypeId()) {
             $this->addAttributeToFilter('entity_type_id', $this->getEntity()->getTypeId());
         }
-        
+
         return $this;
     }
 
@@ -1128,7 +1128,7 @@ public function _loadAttributes($printQuery = false, $logQuery = false)
                     } else {
                         $select = $selects;
                     }
-                    
+
                     $values = $this->getConnection()->fetchAll($select);
                 } catch (Exception $e) {
                     Mage::printException($e, $select);

app/code/core/Mage/Newsletter/Model/Subscriber.php

@@ -359,20 +359,16 @@ public function subscribe($email)
 
         $this->setIsStatusChanged(true);
 
-        try {
-            $this->save();
-            if ($isConfirmNeed === true
-                && $isOwnSubscribes === false
-            ) {
-                $this->sendConfirmationRequestEmail();
-            } else {
-                $this->sendConfirmationSuccessEmail();
-            }
-
-            return $this->getStatus();
-        } catch (Exception $e) {
-            throw new Exception($e->getMessage());
+        $this->save();
+        if ($isConfirmNeed === true
+            && $isOwnSubscribes === false
+        ) {
+            $this->sendConfirmationRequestEmail();
+        } else {
+            $this->sendConfirmationSuccessEmail();
         }
+
+        return $this->getStatus();
     }
 
     /**

app/code/core/Mage/SalesRule/Model/Observer.php

@@ -154,7 +154,7 @@ public function sales_order_paymentCancel($observer)
                         $rule->setTimesUsed($rule->getTimesUsed() - 1);
                         $rule->save();
                     }
-                    
+
                     if ($customerId = $order->getCustomerId()) {
                         // Decrement coupon_usage times_used
                         Mage::getResourceModel('salesrule/coupon_usage')->updateCustomerCouponTimesUsed($customerId, $coupon->getId(), true);

app/design/adminhtml/default/default/template/bundle/product/edit/bundle/option/selection.phtml

@@ -48,7 +48,7 @@ var bundleTemplateRow ='<td>' +
                 '    <input type="hidden" name="<?php echo $this->getFieldName() ?>[{{parentIndex}}][{{index}}][delete]" value="" class="delete">' +
                 '    {{name}}<br />' +
                 '   <div  class="nobr">' +
-                '        <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong> {{sku}}' +
+                '        <strong><?php echo $this->helper('sales')->__('SKU') ?>:</strong> <a href="<?php echo $this->getUrl('*/catalog_product/edit', ['store' => $this->getRequest()->getParam('store')]) ?>id/{{product_id}}/">{{sku}}</a>' +
                 '    </div>' +
                 '</td>' +
                 <?php if ($this->getCanReadPrice() !== false) : ?>
@@ -122,10 +122,14 @@ Bundle.Selection.prototype = {
 
         var option_type = $(bOption.idLabel + '_' + parentIndex + '_type');
 
-        if(!data){
+        if (!data) {
             var data = {};
         }
 
+        if (data.selection_qty) {
+            data.selection_qty = parseFloat(data.selection_qty);
+        }
+
         if (data.can_read_price != undefined && !data.can_read_price) {
             data.selection_price_value = '';
         } else {

app/design/frontend/base/default/template/customer/address.phtml

@@ -80,10 +80,12 @@
     <button type="button" onclick="window.location='<?php echo $this->getUrl('customer/address/form') ?>';" class="button"><span><span><?php echo $this->__('New Address') ?></span></span></button>
 </div>
 <script type="text/javascript">
+//<![CDATA[
     function deleteAddress(addressId) {
-        if(confirm('<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Are you sure you want to delete this address?')) ?>')) {
-            window.location='<?php echo $this->getUrl("customer/address/delete") ?>address/'+addressId;
+        if (confirm('<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Are you sure you want to delete this address?')) ?>')) {
+            window.location="<?php echo $this->getUrl('customer/address/delete') ?>address/"+addressId;
         }
         return false;
     }
+//]]>
 </script>

app/design/frontend/base/default/template/customer/address/book.phtml

@@ -91,8 +91,8 @@
 <script type="text/javascript">
 //<![CDATA[
     function deleteAddress(addressId) {
-        if(confirm('<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Are you sure you want to delete this address?')) ?>')) {
-            window.location='<?php echo $this->getDeleteUrl() ?>id/'+addressId;
+        if (confirm('<?php echo Mage::helper('core')->jsQuoteEscape($this->__('Are you sure you want to delete this address?')) ?>')) {
+            window.location="<?php echo $this->getDeleteUrl() ?>id/"+addressId;
         }
         return false;
     }

app/locale/en_US/Mage_Adminhtml.csv

@@ -205,8 +205,10 @@
 "Cannot add tracking number.","Cannot add tracking number."
 "Cannot create an invoice without products.","Cannot create an invoice without products."
 "Cannot create credit memo for the order.","Cannot create credit memo for the order."
+"The credit memo no longer exists.","The credit memo no longer exists."
 "Cannot delete the design change.","Cannot delete the design change."
 "Cannot delete tracking number.","Cannot delete tracking number."
+"The shipment no longer exists.","The shipment no longer exists."
 "Cannot do shipment for the order separately from invoice.","Cannot do shipment for the order separately from invoice."
 "Cannot do shipment for the order.","Cannot do shipment for the order."
 "Cannot initialize shipment for adding tracking number.","Cannot initialize shipment for adding tracking number."

lib/Varien/Io/File.php

@@ -760,7 +760,7 @@ public function ls($grep=null)
                 }
 
                 $list_item['text'] = $entry;
-                $list_item['mod_date'] = date (Varien_Date::DATETIME_PHP_FORMAT, filectime($fullpath));
+                $list_item['mod_date'] = date(Varien_Date::DATETIME_PHP_FORMAT, filectime($fullpath));
                 $list_item['permissions'] = $this->_parsePermissions(fileperms($fullpath));
                 $list_item['owner'] = $this->_getFileOwner($fullpath);