Skip to content

Phpstan: some fixes #5009

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

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open

Phpstan: some fixes #5009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a78fe5c
fixes
sreichel Oct 15, 2025
3a617ba
minor
sreichel Oct 15, 2025
dbf118c
minor
sreichel Oct 15, 2025
5d597b4
minor
sreichel Oct 15, 2025
370f021
minor
sreichel Oct 15, 2025
9a2b4e5
minor
sreichel Oct 15, 2025
31a6223
Merge remote-tracking branch 'origin/phpstan/1025-1' into phpstan/1025-1
sreichel Oct 15, 2025
ea23532
minor
sreichel Oct 15, 2025
88a59cf
Update app/code/core/Mage/Core/Model/Domainpolicy.php
sreichel Oct 15, 2025
fbe3424
Update app/code/core/Mage/Sales/Model/Recurring/Profile.php
sreichel Oct 15, 2025
e24dd86
Merge branch 'main' into phpstan/1025-1
sreichel Oct 26, 2025
53dfad2
Merge branch 'main' into phpstan/1025-1
sreichel Oct 27, 2025
ace2e8f
Merge branch 'main' into phpstan/1025-1
sreichel Oct 30, 2025
5a1623a
phpstan baseline
sreichel Oct 30, 2025
2a51fa9
docblock: Mage_Log visitor
sreichel Oct 30, 2025
fdde7cc
docblock
sreichel Oct 30, 2025
9e14770
PhpStan: Baseline generated with 1311 errors.
sreichel Oct 31, 2025
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
482 changes: 1 addition & 481 deletions .phpstan.dist.baseline.neon
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Resource/Block/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ class Mage_Admin_Model_Resource_Block_Collection extends Mage_Core_Model_Resourc
{
/**
* Define resource model
*
*/
protected function _construct()
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Resource/User/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ class Mage_Admin_Model_Resource_User_Collection extends Mage_Core_Model_Resource
{
/**
* Define resource model
*
*/
protected function _construct()
{
Expand Down
1 change: 0 additions & 1 deletion app/code/core/Mage/Admin/Model/Resource/Variable/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ class Mage_Admin_Model_Resource_Variable_Collection extends Mage_Core_Model_Reso
{
/**
* Define resource model
*
*/
protected function _construct()
{
Expand Down
6 changes: 4 additions & 2 deletions app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Content.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,10 @@ protected function _prepareForm()
]);

// Setting custom renderer for content field to remove label column
$renderer = $this->getLayout()->createBlock('adminhtml/widget_form_renderer_fieldset_element')
->setTemplate('cms/page/edit/form/renderer/content.phtml');
/** @var Mage_Adminhtml_Block_Widget_Form_Renderer_Fieldset_Element $renderer */
$renderer = $this->getLayout()->createBlock('adminhtml/widget_form_renderer_fieldset_element');
$renderer->setTemplate('cms/page/edit/form/renderer/content.phtml');

$contentField->setRenderer($renderer);

$form->setValues($model->getData());
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ public function formatPrice($price)
/**
* Retrieve source
*
* @return Mage_Sales_Model_Order_Invoice
* @return Mage_Sales_Model_Abstract
*/
public function getSource()
{
Expand Down
3 changes: 3 additions & 0 deletions app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Abstract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,19 @@ protected function _prepareLayout()
{
parent::_prepareLayout();

/** @var Mage_Adminhtml_Block_Widget_Form_Renderer_Element $renderer */
$renderer = $this->getLayout()->createBlock('adminhtml/widget_form_renderer_element');
if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
Varien_Data_Form::setElementRenderer($renderer);
}

/** @var Mage_Adminhtml_Block_Widget_Form_Renderer_Fieldset $renderer */
$renderer = $this->getLayout()->createBlock('adminhtml/widget_form_renderer_fieldset');
if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
Varien_Data_Form::setFieldsetRenderer($renderer);
}

/** @var Mage_Adminhtml_Block_Widget_Form_Renderer_Fieldset_Element $renderer */
$renderer = $this->getLayout()->createBlock('adminhtml/widget_form_renderer_fieldset_element');
if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
Varien_Data_Form::setFieldsetElementRenderer($renderer);
Expand Down
4 changes: 3 additions & 1 deletion app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ protected function _getCollectionClass()

protected function _prepareCollection()
{
$collection = Mage::getResourceModel($this->_getCollectionClass())
/** @var Mage_Sales_Model_Resource_Order_Creditmemo_Grid_Collection $collection */
$collection = Mage::getResourceModel($this->_getCollectionClass());
$collection
->addFieldToSelect('entity_id')
->addFieldToSelect('created_at')
->addFieldToSelect('increment_id')
Expand Down
4 changes: 3 additions & 1 deletion app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ protected function _getCollectionClass()

protected function _prepareCollection()
{
$collection = Mage::getResourceModel($this->_getCollectionClass())
/** @var Mage_Sales_Model_Resource_Order_Invoice_Grid_Collection $collection */
$collection = Mage::getResourceModel($this->_getCollectionClass());
$collection
->addFieldToSelect('entity_id')
->addFieldToSelect('created_at')
->addFieldToSelect('order_id')
Expand Down
4 changes: 3 additions & 1 deletion app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ protected function _getCollectionClass()

protected function _prepareCollection()
{
$collection = Mage::getResourceModel($this->_getCollectionClass())
/** @var Mage_Sales_Model_Resource_Order_Shipment_Grid_Collection $collection */
$collection = Mage::getResourceModel($this->_getCollectionClass());
$collection
->addFieldToSelect('entity_id')
->addFieldToSelect('created_at')
->addFieldToSelect('increment_id')
Expand Down
4 changes: 2 additions & 2 deletions app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Matrix.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ protected function _prepareLayout()

foreach ($currencies as $currency) {
foreach ($oldCurrencies as $key => $value) {
if (!array_key_exists($currency, $oldCurrencies[$key])) {
if (!array_key_exists($currency, $value)) {
$oldCurrencies[$key][$currency] = '';
}
}
Expand Down Expand Up @@ -66,7 +66,7 @@ protected function _prepareRates($array)
foreach ($rate as $code => $value) {
$parts = explode('.', (string) $value);
if (count($parts) === 2) {
$parts[1] = str_pad(rtrim($parts[1], 0), 4, '0', STR_PAD_RIGHT);
$parts[1] = str_pad(rtrim($parts[1], '0'), 4, '0', STR_PAD_RIGHT);
$array[$key][$code] = implode('.', $parts);
} elseif ($value > 0) {
$array[$key][$code] = number_format($value, 4);
Expand Down
3 changes: 3 additions & 0 deletions app/code/core/Mage/Adminhtml/Block/Widget/Form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,19 @@ protected function _construct()
*/
protected function _prepareLayout()
{
/** @var Mage_Adminhtml_Block_Widget_Form_Renderer_Element $renderer */
$renderer = $this->getLayout()->createBlock('adminhtml/widget_form_renderer_element');
if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
Varien_Data_Form::setElementRenderer($renderer);
}

/** @var Mage_Adminhtml_Block_Widget_Form_Renderer_Fieldset $renderer */
$renderer = $this->getLayout()->createBlock('adminhtml/widget_form_renderer_fieldset');
if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
Varien_Data_Form::setFieldsetRenderer($renderer);
}

/** @var Mage_Adminhtml_Block_Widget_Form_Renderer_Fieldset_Element $renderer */
$renderer = $this->getLayout()->createBlock('adminhtml/widget_form_renderer_fieldset_element');
if ($renderer instanceof Varien_Data_Form_Element_Renderer_Interface) {
Varien_Data_Form::setFieldsetElementRenderer($renderer);
Expand Down
Loading
Loading