Skip to content

Commit 92a3b4f

Browse files
authored
Access registry directly in several Mage factory methods (#2319)
* refactor: Accessed _registry directly in several Mage factory methods. Direct access is possible because null is no possibility due to executed code prior. This avoids additional isset checks being unnecessary. * refactor: small code formatting adjustments * refactor: Utilized null coalescing operator. * fix: Try so solve PHPStan complaint due to changed return type of Mage::getSingleton(). * fix: Solved rest of PHPStan complaints due to changed return type of Mage::getSingleton(). Added explanation to type hints as well. * fix: Reverted automatically replaced short list syntax due to php 7.0 compatibility. * Revert "fix: Solved rest of PHPStan complaints due to changed return type of Mage::getSingleton()." This reverts commit c9d165c. * Revert "fix: Try so solve PHPStan complaint due to changed return type of Mage::getSingleton()." This reverts commit fc9901c. * fix: Reverted return type of getSingleton to original state.
1 parent 33dfa26 commit 92a3b4f

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

app/Mage.php

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -305,10 +305,7 @@ public static function unregister($key)
305305
*/
306306
public static function registry($key)
307307
{
308-
if (isset(self::$_registry[$key])) {
309-
return self::$_registry[$key];
310-
}
311-
return null;
308+
return self::$_registry[$key] ?? null;
312309
}
313310

314311
/**
@@ -529,13 +526,13 @@ public static function getModel($modelClass = '', $arguments = array())
529526
* @param array $arguments
530527
* @return Mage_Core_Model_Abstract
531528
*/
532-
public static function getSingleton($modelClass='', array $arguments=array())
529+
public static function getSingleton($modelClass = '', array $arguments=array())
533530
{
534-
$registryKey = '_singleton/'.$modelClass;
531+
$registryKey = '_singleton/' . $modelClass;
535532
if (!isset(self::$_registry[$registryKey])) {
536533
self::register($registryKey, self::getModel($modelClass, $arguments));
537534
}
538-
return self::registry($registryKey);
535+
return self::$_registry[$registryKey];
539536
}
540537

541538
/**
@@ -573,11 +570,11 @@ public static function getControllerInstance($class, $request, $response, array
573570
*/
574571
public static function getResourceSingleton($modelClass = '', array $arguments = array())
575572
{
576-
$registryKey = '_resource_singleton/'.$modelClass;
573+
$registryKey = '_resource_singleton/' . $modelClass;
577574
if (!isset(self::$_registry[$registryKey])) {
578575
self::register($registryKey, self::getResourceModel($modelClass, $arguments));
579576
}
580-
return self::registry($registryKey);
577+
return self::$_registry[$registryKey];
581578
}
582579

583580
/**
@@ -605,7 +602,7 @@ public static function helper($name)
605602
$helperClass = self::getConfig()->getHelperClassName($name);
606603
self::register($registryKey, new $helperClass);
607604
}
608-
return self::registry($registryKey);
605+
return self::$_registry[$registryKey];
609606
}
610607

611608
/**
@@ -621,8 +618,7 @@ public static function getResourceHelper($moduleName)
621618
$helperClass = self::getConfig()->getResourceHelper($moduleName);
622619
self::register($registryKey, $helperClass);
623620
}
624-
625-
return self::registry($registryKey);
621+
return self::$_registry[$registryKey];
626622
}
627623

628624
/**

0 commit comments

Comments
 (0)