Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump phpstan/phpstan from 1.10.58 to 1.10.59 #3856

Merged
merged 5 commits into from
Feb 27, 2024
Merged

Bump phpstan/phpstan from 1.10.58 to 1.10.59 #3856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
17cab0e
Bump phpstan/phpstan from 1.10.58 to 1.10.59
dependabot[bot] Feb 26, 2024
74819cf
removed ignored errors
fballiano Feb 26, 2024
556b4ab
phpstan
fballiano Feb 26, 2024
778c6f3
phpstan
fballiano Feb 26, 2024
c579e04
Merge branch 'main' into dependabot/composer/phpstan/phpstan-1.10.59
fballiano Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,12 @@ protected function _prepareLayout()
'after_html' => '</div>'
]);
$this->setChild('top_button', $button);
}

if ($this->getCustomerId()) {
$button = clone $button;
$button->unsId();
$this->setChild('bottom_button', $button);
}

return parent::_prepareLayout();
}

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Catalog/Block/Product/List.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
10 changes: 5 additions & 5 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 0 additions & 35 deletions phpstan.dist.baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading