diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php
index 042117158c3..5916951616f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php
@@ -31,13 +31,12 @@ protected function _prepareLayout()
'after_html' => ''
]);
$this->setChild('top_button', $button);
- }
- if ($this->getCustomerId()) {
$button = clone $button;
$button->unsId();
$this->setChild('bottom_button', $button);
}
+
return parent::_prepareLayout();
}
diff --git a/app/code/core/Mage/Catalog/Block/Product/List.php b/app/code/core/Mage/Catalog/Block/Product/List.php
index 0f16169fa92..8e6a05a1228 100644
--- a/app/code/core/Mage/Catalog/Block/Product/List.php
+++ b/app/code/core/Mage/Catalog/Block/Product/List.php
@@ -44,7 +44,7 @@ class Mage_Catalog_Block_Product_List extends Mage_Catalog_Block_Product_Abstrac
/**
* Product Collection
*
- * @var Mage_Eav_Model_Entity_Collection_Abstract|null
+ * @var Mage_Catalog_Model_Resource_Product_Collection|null
*/
protected $_productCollection;
diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php
index ff8c566997b..e8b6c69a9fc 100644
--- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php
+++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php
@@ -445,7 +445,7 @@ public function getRowUrl($row)
* Prepare collection by setting page number, sorting etc..
*
* @param Mage_Eav_Model_Resource_Entity_Attribute_Collection $collection
- * @return Mage_Eav_Model_Resource_Entity_Attribute_Collection
+ * @return Mage_Core_Model_Resource_Db_Collection_Abstract|null
*/
public function prepareCollection(Mage_Eav_Model_Resource_Entity_Attribute_Collection $collection)
{
diff --git a/composer.lock b/composer.lock
index 69f3d71cf59..6d5b1ec0e1e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3220,16 +3220,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "1.10.58",
+ "version": "1.10.59",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "a23518379ec4defd9e47cbf81019526861623ec2"
+ "reference": "e607609388d3a6d418a50a49f7940e8086798281"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a23518379ec4defd9e47cbf81019526861623ec2",
- "reference": "a23518379ec4defd9e47cbf81019526861623ec2",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e607609388d3a6d418a50a49f7940e8086798281",
+ "reference": "e607609388d3a6d418a50a49f7940e8086798281",
"shasum": ""
},
"require": {
@@ -3278,7 +3278,7 @@
"type": "tidelift"
}
],
- "time": "2024-02-12T20:02:57+00:00"
+ "time": "2024-02-20T13:59:13+00:00"
},
{
"name": "phpunit/php-code-coverage",
diff --git a/phpstan.dist.baseline.neon b/phpstan.dist.baseline.neon
index f0669bbea72..680df1d4e0c 100644
--- a/phpstan.dist.baseline.neon
+++ b/phpstan.dist.baseline.neon
@@ -500,11 +500,6 @@ parameters:
count: 2
path: app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
- -
- message: "#^Right side of && is always true\\.$#"
- count: 2
- path: app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
-
-
message: "#^Variable \\$billingAddress might not be defined\\.$#"
count: 2
@@ -1210,11 +1205,6 @@ parameters:
count: 1
path: app/code/core/Mage/Catalog/Block/Product/Compare/List.php
- -
- message: "#^Method Mage_Catalog_Block_Product_List\\:\\:_getProductCollection\\(\\) should return Mage_Catalog_Model_Resource_Product_Collection but returns Mage_Eav_Model_Entity_Collection_Abstract\\.$#"
- count: 1
- path: app/code/core/Mage/Catalog/Block/Product/List.php
-
-
message: "#^Property Mage_Catalog_Block_Product_List_Crosssell\\:\\:\\$_itemCollection \\(Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection\\) does not accept Mage_Catalog_Model_Resource_Product_Link_Product_Collection\\.$#"
count: 1
@@ -4490,11 +4480,6 @@ parameters:
count: 1
path: app/code/core/Mage/Sales/Model/Quote/Item.php
- -
- message: "#^Negated boolean expression is always true\\.$#"
- count: 1
- path: app/code/core/Mage/Sales/Model/Quote/Item.php
-
-
message: "#^Return type \\(void\\) of method Mage_Sales_Model_Quote_Item\\:\\:__clone\\(\\) should be compatible with return type \\(\\$this\\(Mage_Sales_Model_Quote_Item_Abstract\\)\\) of method Mage_Sales_Model_Quote_Item_Abstract\\:\\:__clone\\(\\)$#"
count: 1
@@ -4690,11 +4675,6 @@ parameters:
count: 1
path: app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php
- -
- message: "#^If condition is always false\\.$#"
- count: 1
- path: app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php
-
-
message: "#^Comparison operation \"\\<\" between \\(array\\|float\\|int\\) and float results in an error\\.$#"
count: 1
@@ -5190,11 +5170,6 @@ parameters:
count: 1
path: app/code/core/Mage/Weee/Model/Tax.php
- -
- message: "#^If condition is always false\\.$#"
- count: 1
- path: app/code/core/Mage/Weee/Model/Total/Quote/Weee.php
-
-
message: "#^PHPDoc type Mage_Weee_Helper_Data of property Mage_Weee_Model_Total_Quote_Weee\\:\\:\\$_helper is not covariant with PHPDoc type Mage_Tax_Helper_Data of overridden property Mage_Tax_Model_Sales_Total_Quote_Tax\\:\\:\\$_helper\\.$#"
count: 1
@@ -5240,11 +5215,6 @@ parameters:
count: 1
path: app/code/core/Mage/Wishlist/Helper/Data.php
- -
- message: "#^Negated boolean expression is always true\\.$#"
- count: 1
- path: app/code/core/Mage/Wishlist/Model/Item.php
-
-
message: "#^Method Mage_Wishlist_Model_Item_Option\\:\\:__clone\\(\\) with return type void returns \\$this\\(Mage_Wishlist_Model_Item_Option\\) but should not return anything\\.$#"
count: 1
@@ -5395,11 +5365,6 @@ parameters:
count: 1
path: lib/Varien/Data/Collection/Db.php
- -
- message: "#^Empty array passed to foreach\\.$#"
- count: 1
- path: lib/Varien/Data/Collection/Filesystem.php
-
-
message: "#^Property Varien_Data_Form_Abstract\\:\\:\\$_elements \\(Varien_Data_Form_Element_Collection\\) in empty\\(\\) is not falsy\\.$#"
count: 1