From 54671aea0e1fa8aac7afd43aaa264aa83e22fc15 Mon Sep 17 00:00:00 2001 From: kyrena <78410399+kyrena@users.noreply.github.com> Date: Fri, 9 Jun 2023 08:26:49 +0200 Subject: [PATCH 1/6] Fixed passing null is deprecated for htmlspecialchars in Mage_Adminhtml_Block_System_Config_Form_Field (#3296) Co-authored-by: Ng Kiat Siong --- app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php index f449c0ee0bd..38ae307abaa 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php @@ -78,7 +78,7 @@ public function render(Varien_Data_Form_Element_Abstract $element) $html .= ''; if ($addInheritCheckbox) { - $defText = $element->getDefaultValue(); + $defText = (string)$element->getDefaultValue(); if ($options) { $defTextArr = []; foreach ($options as $k => $v) { From 9f42a8aad44884a4af789412f01145f740eeb005 Mon Sep 17 00:00:00 2001 From: kyrena <78410399+kyrena@users.noreply.github.com> Date: Fri, 9 Jun 2023 08:27:39 +0200 Subject: [PATCH 2/6] "Product Tags" tab is hidden in customer admin mask if Mage_Tag is disabled (#3298) --- .../Mage/Adminhtml/Block/Customer/Edit/Tabs.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php index 256c104c1c3..1202e42ab08 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php @@ -73,15 +73,13 @@ protected function _beforeToHtml() 'url' => $this->getUrl('*/*/wishlist', ['_current' => true]), ]); - if (Mage::helper('core')->isModuleOutputEnabled('Mage_Newsletter')) { + if (Mage::helper('core')->isModuleOutputEnabled('Mage_Newsletter') && Mage::getSingleton('admin/session')->isAllowed('newsletter/subscriber')) { /** @var Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter $block */ $block = $this->getLayout()->createBlock('adminhtml/customer_edit_tab_newsletter'); - if (Mage::getSingleton('admin/session')->isAllowed('newsletter/subscriber')) { - $this->addTab('newsletter', [ - 'label' => Mage::helper('customer')->__('Newsletter'), - 'content' => $block->initForm()->toHtml() - ]); - } + $this->addTab('newsletter', [ + 'label' => Mage::helper('customer')->__('Newsletter'), + 'content' => $block->initForm()->toHtml() + ]); } if (Mage::getSingleton('admin/session')->isAllowed('catalog/reviews_ratings')) { @@ -92,7 +90,7 @@ protected function _beforeToHtml() ]); } - if (Mage::getSingleton('admin/session')->isAllowed('catalog/tag')) { + if (Mage::helper('core')->isModuleEnabled('Mage_Tag') && Mage::getSingleton('admin/session')->isAllowed('catalog/tag')) { $this->addTab('tags', [ 'label' => Mage::helper('customer')->__('Product Tags'), 'class' => 'ajax', From f9a6159c6cada9ceae776f3c8e458562db2375fe Mon Sep 17 00:00:00 2001 From: Justin Beaty <51970393+justinbeaty@users.noreply.github.com> Date: Sat, 10 Jun 2023 04:58:47 -0700 Subject: [PATCH 3/6] Fix #3312 ExtJS Tree Checkbox Update (#3314) --- js/extjs/ext-tree-checkbox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/extjs/ext-tree-checkbox.js b/js/extjs/ext-tree-checkbox.js index 3067adb1515..503d4e65462 100644 --- a/js/extjs/ext-tree-checkbox.js +++ b/js/extjs/ext-tree-checkbox.js @@ -65,7 +65,7 @@ Ext.extend(Ext.tree.CheckboxNodeUI, Ext.tree.TreeNodeUI, { render : function(bulkRender){ var n = this.node; var targetNode = n.parentNode ? - n.parentNode.ui.getContainer() : n.ownerTree.container.dom; /* in later svn builds this changes to n.ownerTree.innerCt.dom */ + n.parentNode.ui.getContainer() : n.ownerTree.innerCt.dom; /* in previous svn builds this was n.ownerTree.container.dom */ if(!this.rendered){ this.rendered = true; var a = n.attributes; From a366da59b3db77f5e17be44ce9a8ddc40215d601 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 08:48:05 +0100 Subject: [PATCH 4/6] Bump phpunit/phpunit from 9.6.8 to 9.6.9 (#3317) --- composer.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.lock b/composer.lock index 480b282b38b..0f28d9d6e8a 100644 --- a/composer.lock +++ b/composer.lock @@ -2891,16 +2891,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.15.4", + "version": "v4.15.5", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290" + "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290", - "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e", + "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e", "shasum": "" }, "require": { @@ -2941,9 +2941,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.4" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5" }, - "time": "2023-03-05T19:49:14+00:00" + "time": "2023-05-19T20:20:00+00:00" }, { "name": "openmage/dev-copyright", @@ -3748,16 +3748,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.8", + "version": "9.6.9", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e" + "reference": "a9aceaf20a682aeacf28d582654a1670d8826778" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/17d621b3aff84d0c8b62539e269e87d8d5baa76e", - "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a9aceaf20a682aeacf28d582654a1670d8826778", + "reference": "a9aceaf20a682aeacf28d582654a1670d8826778", "shasum": "" }, "require": { @@ -3831,7 +3831,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.8" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.9" }, "funding": [ { @@ -3847,7 +3847,7 @@ "type": "tidelift" } ], - "time": "2023-05-11T05:14:45+00:00" + "time": "2023-06-11T06:13:56+00:00" }, { "name": "psr/cache", From 64e59040a8a9f9be0721ab969b20e1bb9c687ad3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 10:45:14 +0100 Subject: [PATCH 5/6] Bump phpstan/phpstan from 1.10.15 to 1.10.18 (#3316) Co-authored-by: Fabrizio Balliano --- app/code/core/Mage/Catalog/Model/Product/Image.php | 2 +- composer.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/code/core/Mage/Catalog/Model/Product/Image.php b/app/code/core/Mage/Catalog/Model/Product/Image.php index ef8f9135bfe..2b55eb4720c 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Image.php +++ b/app/code/core/Mage/Catalog/Model/Product/Image.php @@ -295,7 +295,7 @@ protected function _getNeedMemoryForFile($file = null) $imageInfo = getimagesize($file); - if (!isset($imageInfo[0]) || !isset($imageInfo[1])) { + if ($imageInfo === false) { return 0; } if (!isset($imageInfo['channels'])) { diff --git a/composer.lock b/composer.lock index 0f28d9d6e8a..1b9d808a397 100644 --- a/composer.lock +++ b/composer.lock @@ -3368,16 +3368,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.15", + "version": "1.10.18", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "762c4dac4da6f8756eebb80e528c3a47855da9bd" + "reference": "52b6416c579663eebdd2f1d97df21971daf3b43f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/762c4dac4da6f8756eebb80e528c3a47855da9bd", - "reference": "762c4dac4da6f8756eebb80e528c3a47855da9bd", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/52b6416c579663eebdd2f1d97df21971daf3b43f", + "reference": "52b6416c579663eebdd2f1d97df21971daf3b43f", "shasum": "" }, "require": { @@ -3426,7 +3426,7 @@ "type": "tidelift" } ], - "time": "2023-05-09T15:28:01+00:00" + "time": "2023-06-07T22:00:43+00:00" }, { "name": "phpunit/php-code-coverage", From dc52061a72c639c66dc581e8c1d455bcfcdc82f2 Mon Sep 17 00:00:00 2001 From: kyrena <78410399+kyrena@users.noreply.github.com> Date: Mon, 12 Jun 2023 12:05:05 +0200 Subject: [PATCH 6/6] Fixed display of products count for categories tree (#3313) --- .../catalog/product/edit/categories.phtml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml index d5ddd8ed85f..7601d7fca33 100644 --- a/app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml +++ b/app/design/adminhtml/default/default/template/catalog/product/edit/categories.phtml @@ -26,7 +26,7 @@