Skip to content

Commit 5ab1fd6

Browse files
Asfolnyfballiano
andauthored
Also change the default when calling setTheme (#1736)
Co-authored-by: Fabrizio Balliano <fabrizio.balliano@gmail.com>
1 parent 63595d0 commit 5ab1fd6

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

app/code/core/Mage/Core/Model/Design/Package.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class Mage_Core_Model_Design_Package
5656
/**
5757
* Package theme
5858
*
59-
* @var string
59+
* @var array
6060
*/
6161
protected $_theme;
6262

@@ -242,7 +242,7 @@ public function setTheme()
242242
{
243243
switch (func_num_args()) {
244244
case 1:
245-
foreach (['layout', 'template', 'skin', 'locale'] as $type) {
245+
foreach (['layout', 'template', 'skin', 'locale', 'default'] as $type) {
246246
$this->_theme[$type] = func_get_arg(0);
247247
}
248248
break;

phpstan.dist.baseline.neon

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2125,16 +2125,6 @@ parameters:
21252125
count: 1
21262126
path: app/code/core/Mage/Core/Model/Design/Package.php
21272127

2128-
-
2129-
message: "#^Cannot assign offset 'layout'\\|'locale'\\|'skin'\\|'template' to string\\.$#"
2130-
count: 1
2131-
path: app/code/core/Mage/Core/Model/Design/Package.php
2132-
2133-
-
2134-
message: "#^Cannot assign offset string to string\\.$#"
2135-
count: 1
2136-
path: app/code/core/Mage/Core/Model/Design/Package.php
2137-
21382128
-
21392129
message: "#^Property Mage_Core_Model_Design_Package\\:\\:\\$_store \\(int\\|Mage_Core_Model_Store\\|string\\) on left side of \\?\\? is not nullable\\.$#"
21402130
count: 1

0 commit comments

Comments
 (0)