Skip to content

Commit d976d55

Browse files
committed
PHPStan Baseline: Mage_Core
1 parent da6eca2 commit d976d55

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

app/code/core/Mage/Core/Controller/Varien/Front.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
* @package Mage_Core
77
* @copyright Copyright (c) 2006-2020 Magento, Inc. (https://magento.com)
88
* @copyright Copyright (c) 2019-2025 The OpenMage Contributors (https://openmage.org)
9-
* @copyright Copyright (c) 2024 Maho (https://mahocommerce.com)
9+
* @copyright Copyright (c) 2024-2025 Maho (https://mahocommerce.com)
1010
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1111
*/
1212

1313
/**
1414
* @package Mage_Core
1515
*
16-
* @method Mage_Core_Controller_Varien_Action getAction()
16+
* @method ?Mage_Core_Controller_Varien_Action getAction()
1717
* @method $this setAction(Mage_Core_Controller_Varien_Action $value)
1818
* @method bool getNoRender()
1919
*/

app/code/core/Mage/Core/Model/Layout/Update.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* @package Mage_Core
77
* @copyright Copyright (c) 2006-2020 Magento, Inc. (https://magento.com)
88
* @copyright Copyright (c) 2015-2025 The OpenMage Contributors (https://openmage.org)
9+
* @copyright Copyright (c) 2025 Maho (https://mahocommerce.com)
910
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1011
*/
1112

@@ -292,7 +293,7 @@ public function asSimplexml()
292293
public function merge($handle)
293294
{
294295
$packageUpdatesStatus = $this->fetchPackageLayoutUpdates($handle);
295-
if (Mage::app()->isInstalled()) {
296+
if (Mage::isInstalled()) {
296297
$this->fetchDbLayoutUpdates($handle);
297298
}
298299
return $this;

app/code/core/Mage/Core/Model/Session/Abstract/Varien.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,6 @@ public function init($namespace, $sessionName = null)
271271
$this->_data = &$_SESSION[$namespace];
272272

273273
$this->validate();
274-
$this->revalidateCookie();
275274

276275
return $this;
277276
}

app/code/core/Mage/Core/Model/Store.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* @package Mage_Core
77
* @copyright Copyright (c) 2006-2020 Magento, Inc. (https://magento.com)
88
* @copyright Copyright (c) 2019-2025 The OpenMage Contributors (https://openmage.org)
9-
* @copyright Copyright (c) 2024 Maho (https://mahocommerce.com)
9+
* @copyright Copyright (c) 2024-2025 Maho (https://mahocommerce.com)
1010
* @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1111
*/
1212

@@ -573,7 +573,7 @@ public function getBaseUrl($type = self::URL_TYPE_LINK, $secure = null)
573573
if (!isset($this->_baseUrlCache[$cacheKey])) {
574574
switch ($type) {
575575
case self::URL_TYPE_WEB:
576-
$secure = is_null($secure) ? $this->isCurrentlySecure() : (bool) $secure;
576+
$secure = is_null($secure) ? Mage::app()->isCurrentlySecure() : (bool) $secure;
577577
$url = $this->getConfig('web/' . ($secure ? 'secure' : 'unsecure') . '/base_url');
578578
break;
579579

@@ -592,7 +592,7 @@ public function getBaseUrl($type = self::URL_TYPE_LINK, $secure = null)
592592

593593
case self::URL_TYPE_SKIN:
594594
case self::URL_TYPE_JS:
595-
$secure = is_null($secure) ? $this->isCurrentlySecure() : (bool) $secure;
595+
$secure = is_null($secure) ? Mage::app()->isCurrentlySecure() : (bool) $secure;
596596
$url = $this->getConfig('web/' . ($secure ? 'secure' : 'unsecure') . '/base_' . $type . '_url');
597597
break;
598598

@@ -652,7 +652,7 @@ protected function _isCustomEntryPoint()
652652
*/
653653
protected function _updateMediaPathUseRewrites($secure = null, $type = self::URL_TYPE_MEDIA)
654654
{
655-
$secure = is_null($secure) ? $this->isCurrentlySecure() : (bool) $secure;
655+
$secure = is_null($secure) ? Mage::app()->isCurrentlySecure() : (bool) $secure;
656656
$secureStringFlag = $secure ? 'secure' : 'unsecure';
657657
$url = $this->getConfig('web/' . $secureStringFlag . '/base_' . $type . '_url');
658658
if (!$this->getConfig(self::XML_PATH_USE_REWRITES)

0 commit comments

Comments
 (0)