Skip to content

Allow module dependencies to not be "hard" dependencies. #19

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

Closed
wants to merge 1 commit into from
Closed

Allow module dependencies to not be "hard" dependencies. #19

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
18 changes: 14 additions & 4 deletions app/code/core/Mage/Core/Model/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ class Mage_Core_Model_Config extends Mage_Core_Model_Config_Base
{
const CACHE_TAG = 'CONFIG';

const DEPENDS_TYPE_SOFT = 'soft';
const DEPENDS_TYPE_HARD = 'hard';

/**
* Flag which allow use cache logic
*
Expand Down Expand Up @@ -800,7 +803,11 @@ protected function _loadDeclaredModules()
$depends = array();
if ($moduleNode->depends) {
foreach ($moduleNode->depends->children() as $depend) {
$depends[$depend->getName()] = true;
if ($depend->getAttribute('type') == self::DEPENDS_TYPE_SOFT) {
$depends[$depend->getName()] = self::DEPENDS_TYPE_SOFT;
} else {
$depends[$depend->getName()] = self::DEPENDS_TYPE_HARD;
}
}
}
$moduleDepends[$moduleName] = array(
Expand Down Expand Up @@ -844,8 +851,11 @@ protected function _sortModuleDepends($modules)
{
foreach ($modules as $moduleName => $moduleProps) {
$depends = $moduleProps['depends'];
foreach ($moduleProps['depends'] as $depend => $true) {
if ($moduleProps['active'] && ((!isset($modules[$depend])) || empty($modules[$depend]['active']))) {
foreach ($moduleProps['depends'] as $depend => $dependType) {
if ( $moduleProps['active']
&& $dependType == self::DEPENDS_TYPE_HARD
&& ((!isset($modules[$depend])) || empty($modules[$depend]['active']))
) {
Mage::throwException(
Mage::helper('Mage_Core_Helper_Data')->__('Module "%1$s" requires module "%2$s".', $moduleName, $depend)
);
Expand All @@ -869,7 +879,7 @@ protected function _sortModuleDepends($modules)

$definedModules = array();
foreach ($modules as $moduleProp) {
foreach ($moduleProp['depends'] as $dependModule => $true) {
foreach ($moduleProp['depends'] as $dependModule => $dependType) {
if (!isset($definedModules[$dependModule])) {
Mage::throwException(
Mage::helper('Mage_Core_Helper_Data')->__('Module "%1$s" cannot depend on "%2$s".', $moduleProp['module'], $dependModule)
Expand Down