Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
24 changes: 12 additions & 12 deletions .phpstan.dist.baseline.neon
Original file line number Diff line number Diff line change
Expand Up @@ -2854,73 +2854,73 @@ parameters:
rawMessage: 'Call to an undefined method Mage_Core_Block_Abstract::_getUsers().'
identifier: method.notFound
count: 1
path: app/design/adminhtml/default/default/template/api/role_users_grid_js.phtml
path: app/design/adminhtml/base/default/template/api/role_users_grid_js.phtml

-
rawMessage: 'Call to an undefined method Mage_Core_Block_Abstract::_getSelectedRoles().'
identifier: method.notFound
count: 1
path: app/design/adminhtml/default/default/template/api/user_roles_grid_js.phtml
path: app/design/adminhtml/base/default/template/api/user_roles_grid_js.phtml

-
rawMessage: 'Parameter #2 $store of method Mage_Core_Helper_Data::currencyByStore() expects int|Mage_Core_Model_Store|null, true given.'
identifier: argument.type
count: 1
path: app/design/adminhtml/default/default/template/catalog/product/price.phtml
path: app/design/adminhtml/base/default/template/catalog/product/price.phtml

-
rawMessage: 'Call to an undefined method Mage_GiftMessage_Block_Message_Helper::prepareAsIs().'
identifier: method.notFound
count: 2
path: app/design/adminhtml/default/default/template/giftmessage/helper.phtml
path: app/design/adminhtml/base/default/template/giftmessage/helper.phtml

-
rawMessage: 'Parameter #1 $value of method Mage_GiftMessage_Block_Message_Helper::setScriptIncluded() expects string, true given.'
identifier: argument.type
count: 1
path: app/design/adminhtml/default/default/template/giftmessage/helper.phtml
path: app/design/adminhtml/base/default/template/giftmessage/helper.phtml

-
rawMessage: 'Call to an undefined method Mage_Core_Block_Abstract::_getUsers().'
identifier: method.notFound
count: 1
path: app/design/adminhtml/default/default/template/permissions/role_users_grid_js.phtml
path: app/design/adminhtml/base/default/template/permissions/role_users_grid_js.phtml

-
rawMessage: 'Call to an undefined method Mage_Core_Block_Abstract::_getSelectedRoles().'
identifier: method.notFound
count: 1
path: app/design/adminhtml/default/default/template/permissions/user_roles_grid_js.phtml
path: app/design/adminhtml/base/default/template/permissions/user_roles_grid_js.phtml

-
rawMessage: 'Comparison operation ">" between int<1, max> and 0 is always true.'
identifier: greater.alwaysTrue
count: 1
path: app/design/adminhtml/default/default/template/report/grid.phtml
path: app/design/adminhtml/base/default/template/report/grid.phtml

-
rawMessage: 'Method Mage_Adminhtml_Block_Sales_Order_Create_Abstract::formatPrice() invoked with 3 parameters, 1 required.'
identifier: arguments.count
count: 18
path: app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml
path: app/design/adminhtml/base/default/template/sales/order/create/items/grid.phtml

-
rawMessage: Negated boolean expression is always true.
identifier: booleanNot.alwaysTrue
count: 2
path: app/design/adminhtml/default/default/template/system/store/tree.phtml
path: app/design/adminhtml/base/default/template/system/store/tree.phtml

-
rawMessage: 'Method Mage_Adminhtml_Block_Widget_Grid::getEmptyCellColspan() invoked with 1 parameter, 0 required.'
identifier: arguments.count
count: 1
path: app/design/adminhtml/default/default/template/widget/grid.phtml
path: app/design/adminhtml/base/default/template/widget/grid.phtml

-
rawMessage: 'Method Mage_Adminhtml_Block_Widget_Grid::getMultipleRowColumns() invoked with 1 parameter, 0 required.'
identifier: arguments.count
count: 1
path: app/design/adminhtml/default/default/template/widget/grid.phtml
path: app/design/adminhtml/base/default/template/widget/grid.phtml

-
rawMessage: 'Method Mage_Catalog_Block_Product_Abstract::getTierPrices() invoked with 2 parameters, 0-1 required.'
Expand Down
54 changes: 27 additions & 27 deletions .phpstan.dist.neon
Original file line number Diff line number Diff line change
Expand Up @@ -69,33 +69,33 @@ parameters:
# @todo add classes to widgets
message: '#^Variable \$this might not be defined\.$#'
paths:
- app/design/adminhtml/default/default/template/api/usernroles.phtml
- app/design/adminhtml/default/default/template/dashboard/searches.phtml
- app/design/adminhtml/default/default/template/dashboard/store/switcher.phtml
- app/design/adminhtml/default/default/template/empty.phtml
- app/design/adminhtml/default/default/template/overlay_popup.phtml
- app/design/adminhtml/default/default/template/popup.phtml
- app/design/adminhtml/default/default/template/promo/form.phtml
- app/design/adminhtml/default/default/template/rating/stars/detailed.phtml
- app/design/adminhtml/default/default/template/review/add.phtml
- app/design/adminhtml/default/default/template/sales/billing/agreement/form.phtml
- app/design/adminhtml/default/default/template/sales/items/renderer/default.phtml
- app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/configurable.phtml
- app/design/adminhtml/default/default/template/sales/order/totals/discount.phtml
- app/design/adminhtml/default/default/template/sales/order/totals/due.phtml
- app/design/adminhtml/default/default/template/sales/order/totals/footer.phtml
- app/design/adminhtml/default/default/template/sales/order/totals/grand.phtml
- app/design/adminhtml/default/default/template/sales/order/totals/item.phtml
- app/design/adminhtml/default/default/template/sales/order/totals/main.phtml
- app/design/adminhtml/default/default/template/sales/order/totals/paid.phtml
- app/design/adminhtml/default/default/template/sales/order/totals/refunded.phtml
- app/design/adminhtml/default/default/template/sales/order/totals/shipping.phtml
- app/design/adminhtml/default/default/template/sales/order/totals/subtotal.phtml
- app/design/adminhtml/default/default/template/sales/order/view/tracking.phtml
- app/design/adminhtml/default/default/template/system/info.phtml
- app/design/adminhtml/default/default/template/tax/class/page/edit.phtml
- app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml
- app/design/adminhtml/default/default/template/tax/toolbar/rule/save.phtml
- app/design/adminhtml/base/default/template/api/usernroles.phtml
- app/design/adminhtml/base/default/template/dashboard/searches.phtml
- app/design/adminhtml/base/default/template/dashboard/store/switcher.phtml
- app/design/adminhtml/base/default/template/empty.phtml
- app/design/adminhtml/base/default/template/overlay_popup.phtml
- app/design/adminhtml/base/default/template/popup.phtml
- app/design/adminhtml/base/default/template/promo/form.phtml
- app/design/adminhtml/base/default/template/rating/stars/detailed.phtml
- app/design/adminhtml/base/default/template/review/add.phtml
- app/design/adminhtml/base/default/template/sales/billing/agreement/form.phtml
- app/design/adminhtml/base/default/template/sales/items/renderer/default.phtml
- app/design/adminhtml/base/default/template/sales/order/shipment/create/items/renderer/configurable.phtml
- app/design/adminhtml/base/default/template/sales/order/totals/discount.phtml
- app/design/adminhtml/base/default/template/sales/order/totals/due.phtml
- app/design/adminhtml/base/default/template/sales/order/totals/footer.phtml
- app/design/adminhtml/base/default/template/sales/order/totals/grand.phtml
- app/design/adminhtml/base/default/template/sales/order/totals/item.phtml
- app/design/adminhtml/base/default/template/sales/order/totals/main.phtml
- app/design/adminhtml/base/default/template/sales/order/totals/paid.phtml
- app/design/adminhtml/base/default/template/sales/order/totals/refunded.phtml
- app/design/adminhtml/base/default/template/sales/order/totals/shipping.phtml
- app/design/adminhtml/base/default/template/sales/order/totals/subtotal.phtml
- app/design/adminhtml/base/default/template/sales/order/view/tracking.phtml
- app/design/adminhtml/base/default/template/system/info.phtml
- app/design/adminhtml/base/default/template/tax/class/page/edit.phtml
- app/design/adminhtml/base/default/template/tax/toolbar/class/save.phtml
- app/design/adminhtml/base/default/template/tax/toolbar/rule/save.phtml
-
# update phpstan plugin
identifier: method.protected
Expand Down
8 changes: 4 additions & 4 deletions app/code/core/Mage/Adminhtml/Controller/Action.php
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,15 @@ public function preDispatch()
{
// get legacy theme choice form backend config
if (Mage::getStoreConfigFlag('admin/design/use_legacy_theme')) {
$theme = Mage::getConfig()->getNode('stores/admin/design/theme/default');
$package = Mage::getConfig()->getNode('stores/admin/design/package/name');
} else {
$theme = Mage::getConfig()->getNode('stores/admin/design/theme/openmage');
$package = Mage::getConfig()->getNode('stores/admin/design/package/openmage');
}

Mage::getDesign()
->setArea($this->_currentArea)
->setPackageName((string) Mage::getConfig()->getNode('stores/admin/design/package/name'))
->setTheme((string) $theme);
->setPackageName((string) $package)
->setTheme((string) Mage::getConfig()->getNode('stores/admin/design/theme/default'));
foreach (['layout', 'template', 'skin', 'locale'] as $type) {
if ($value = (string) Mage::getConfig()->getNode("stores/admin/design/theme/{$type}")) {
Mage::getDesign()->setTheme($type, $value);
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Adminhtml/etc/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,10 @@
<design>
<package>
<name>default</name>
<openmage>openmage</openmage>
</package>
<theme>
<default>default</default>
<openmage>openmage</openmage>
</theme>
</design>
</admin>
Expand Down
15 changes: 15 additions & 0 deletions app/code/core/Mage/Core/Model/Design/Fallback.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,27 @@ public function getFallbackScheme($area, $package, $theme)
$cacheKey = $area . '/' . $package . '/' . $theme;

if (!isset($this->_cachedSchemes[$cacheKey])) {

//First we have to check if theme exists
$path = $area . DS . $package . DS . $theme;
$fallback = false;
if (!is_dir(Mage::getBaseDir('design') . DS . $path)) {
//Fallback to default
$theme = (string) Mage::getConfig()->getNode('stores/admin/design/theme/default');
$fallback = true;
}

if ($this->_isInheritanceDefined($area, $package, $theme)) {
$scheme = $this->_getFallbackScheme($area, $package, $theme);
} else {
$scheme = $this->_getLegacyFallbackScheme();
}

if ($fallback) {
$first = array_shift($scheme);
$scheme = array_merge([$first], [['_package' => $package, '_theme' => $theme]], $scheme);
}

$this->_cachedSchemes[$cacheKey] = $scheme;
}

Expand Down
40 changes: 40 additions & 0 deletions app/code/core/Mage/Core/Model/Layout/Update.php
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,7 @@ public function getFileLayoutUpdatesXml($area, $package, $theme, $storeId = null
$layoutXml = null;
$elementClass = $this->getElementClass();
$updatesRoot = Mage::app()->getConfig()->getNode($area . '/layout/updates');
$updatesRoot = $this->addFallbackThemesLayoutUpdates($updatesRoot);
Mage::dispatchEvent('core_layout_update_updates_get_after', ['updates' => $updatesRoot]);
$updates = $updatesRoot->asArray();
$themeUpdates = Mage::getSingleton('core/design_config')->getNode("$area/$package/$theme/layout/updates");
Expand Down Expand Up @@ -483,4 +484,43 @@ public function getFileLayoutUpdatesXml($area, $package, $theme, $storeId = null

return simplexml_load_string('<layouts>' . $layoutStr . '</layouts>', $elementClass);
}

/**
* Add layout files added via theme.xml to layout updates
* for all themes that are parents of this theme.
*/
public function addFallbackThemesLayoutUpdates(Mage_Core_Model_Config_Element $updates)
{
/* @var $designPackage Mage_Core_Model_Design_Package */
$designPackage = Mage::getSingleton('core/design_package');
/* @var $fallback Mage_Core_Model_Design_Fallback */
$fallback = Mage::getModel('core/design_fallback');

$fallbacks = $fallback->getFallbackScheme($designPackage->getArea(), $designPackage->getPackageName(), $designPackage->getTheme('layout'));

for ($i = count($fallbacks) - 1; $i >= 0; $i--) {
$fallback = $fallbacks[$i];
if (!isset($fallback['_package'], $fallback['_theme'])) {
continue;
}

$fallbackPackage = $fallback['_package'];
$fallbackTheme = $fallback['_theme'];

$themeUpdateGroups = Mage::getSingleton('core/design_config')->getNode("{$designPackage->getArea()}/$fallbackPackage/$fallbackTheme/layout/updates");

if (!$themeUpdateGroups) {
continue;
}

foreach ($themeUpdateGroups as $themeUpdateGroup) {
foreach ($themeUpdateGroup->asArray() as $key => $themeUpdate) {
$updateNode = $updates->addChild($key);
$updateNode->addChild('file', $themeUpdate['file']);
}
}
}

return $updates;
}
}
12 changes: 12 additions & 0 deletions app/design/adminhtml/base/default/etc/theme.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0"?>
<!--
/**
* @copyright For copyright and license information, read the COPYING.txt file.
* @link /COPYING.txt
* @license Academic Free License (AFL 3.0)
* @package default_default
*/
-->
<theme>
<parent />
</theme>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading