Merged 1.9.4.x

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:

README.md

@@ -179,14 +179,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`

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/Block/Sales/Order/View/Info.php

@@ -74,6 +74,9 @@ public function getCustomerGroupName()
 
     public function getCustomerViewUrl()
     {
+        if (!Mage::getSingleton('admin/session')->isAllowed('customer/manage')) {
+            return false;
+        }
         if ($this->getOrder()->getCustomerIsGuest() || !$this->getOrder()->getCustomerId()) {
             return false;
         }

app/code/core/Mage/Catalog/Helper/Image.php

@@ -645,7 +645,7 @@ public function validateUploadFile($filePath)
             Mage::throwException($this->__('Disallowed file format.'));
         }
 
-        $_processor = new Varien_Image($filePath);
+        $_processor = Mage::getModel('varien/image', $filePath);
         $mimeType = $_processor->getMimeType();
 
         // Force garbage collection since image handler resource uses memory without counting toward memory limit

app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php

@@ -69,7 +69,7 @@ protected function _create(array $data)
             // try to create Image object to check if image data is valid
             try {
                 $filePath = $apiTempDir . DS . $imageFileName;
-                new Varien_Image($filePath);
+                Mage::getModel('varien/image', $filePath);
                 Mage::getModel('core/file_validator_image')->validate($filePath);
             } catch (Exception $e) {
                 $ioAdapter->rmdir($apiTempDir, true);

app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php

@@ -158,7 +158,7 @@ public function create($productId, $data, $store = null, $identifierType = null)
             // try to create Image object - it fails with Exception if image is not supported
             try {
                 $filePath = $tmpDirectory . DS . $fileName;
-                new Varien_Image($filePath);
+                Mage::getModel('varien/image', $filePath);
                 Mage::getModel('core/file_validator_image')->validate($filePath);
             } catch (Exception $e) {
                 // Remove temporary directory

app/code/core/Mage/Catalog/Model/Product/Image.php

@@ -451,7 +451,7 @@ public function setImageProcessor($processor)
     public function getImageProcessor()
     {
         if (!$this->_processor) {
-            $this->_processor = new Varien_Image($this->getBaseFile());
+            $this->_processor = Mage::getModel('varien/image', $this->getBaseFile());
         }
         $this->_processor->keepAspectRatio($this->_keepAspectRatio);
         $this->_processor->keepFrame($this->_keepFrame);

app/code/core/Mage/CatalogIndex/Model/Indexer.php

@@ -717,7 +717,7 @@ public function buildEntityFilter($attributes, $values, &$filteredAttributes, $p
                                 if (isset($values[$code]['from']) && isset($values[$code]['to'])) {
                                     if ($values[$code]['from']) {
                                         if (!is_numeric($values[$code]['from'])) {
-                                            $_date = date("Y-m-d H:i:s", strtotime($values[$code]['from']));
+                                            $_date = date(Varien_Db_Adapter_Pdo_Mysql::TIMESTAMP_FORMAT, strtotime($values[$code]['from']));
                                             $values[$code]['from'] = $_date;
                                         }
 
@@ -726,7 +726,7 @@ public function buildEntityFilter($attributes, $values, &$filteredAttributes, $p
 
                                     if ($values[$code]['to']) {
                                         if (!is_numeric($values[$code]['to'])) {
-                                            $values[$code]['to'] = date("Y-m-d H:i:s", strtotime($values[$code]['to']));
+                                            $values[$code]['to'] = date(Varien_Db_Adapter_Pdo_Mysql::TIMESTAMP_FORMAT, strtotime($values[$code]['to']));
                                         }
                                         $filter[$code]->where("value <= ?", $values[$code]['to']);
                                     }