Skip to content

Varien_Data_Collection_Db: fix type for _map property #5606

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

Merged
sreichel merged 1 commit into from
May 22, 2026
+2 −17
Merged

Varien_Data_Collection_Db: fix type for _map property #5606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 0 additions & 15 deletions .phpstan.dist.baselines/assign.propertyType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,11 +431,6 @@
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Index/Model/Resource/Lock/Resource.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Property Varien_Data_Collection_Db<Mage_Core_Model_Abstract>::$_map (array{fields: array<string, string>}|null) does not accept array{fields: non-empty-array<string, string|Zend_Db_Expr>}.',
'count' => 1,
'path' => __DIR__ . '/../app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Property Mage_Page_Block_Html_Pager::$_frameEnd (int) does not accept float|int.',
'count' => 1,
Expand Down Expand Up @@ -581,16 +576,6 @@
'count' => 1,
'path' => __DIR__ . '/../lib/Mage/HTTP/Client/Socket.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Property Varien_Data_Collection_Db<T of Varien_Object>::$_map (array{fields: array<string, string>}|null) does not accept non-empty-array<string, array<string, string>>.',
'count' => 2,
'path' => __DIR__ . '/../lib/Varien/Data/Collection/Db.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Property Varien_Data_Collection_Db<T of Varien_Object>::$_map (array{fields: array<string, string>}|null) does not accept non-empty-array<string, array{}>.',
'count' => 1,
'path' => __DIR__ . '/../lib/Varien/Data/Collection/Db.php',
];
$ignoreErrors[] = [
'rawMessage' => 'Property Varien_Data_Form_Filter_Date::$_locale (string|Zend_Locale) does not accept string|Zend_Locale|null.',
'count' => 1,
Expand Down
4 changes: 2 additions & 2 deletions lib/Varien/Data/Collection/Db.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class Varien_Data_Collection_Db extends Varien_Data_Collection
/**
* Fields map for correlation names & real selected fields
*
* @var null|array{fields: array<string, string>}
* @var null|array<string, array<string, string|Zend_Db_Expr>>
*/
protected $_map = null;

Expand Down Expand Up @@ -899,7 +899,7 @@ public function addFilterToMap($filter, $alias, $group = 'fields')
{
if (is_null($this->_map)) {
$this->_map = [$group => []];
} elseif (is_null($this->_map[$group])) {
} elseif (!array_key_exists($group, $this->_map)) {
$this->_map[$group] = [];
}

Expand Down
Loading