@@ -18,7 +18,7 @@ abstract class midcom_core_component_baseclass implements midcom_core_component_ public $configuration = false; public $folder = null; - public function __construct($configuration, $folder = null) + public function __construct(midcom_core_services_configuration $configuration, midgard_page $folder = null) { $this->configuration = $configuration; $this->folder = $folder; midcom_core/component/baseclass.php @@ -15,7 +15,7 @@ */ interface midcom_core_component_interface { - public function __construct($configuration, $folder = null); + public function __construct(midcom_core_services_configuration $configuration, midgard_page $folder = null); public function initialize(); midcom_core/component/interface.php @@ -48,7 +48,7 @@ class midcom_core_component_loader return true; } - public function load($component, $object = null) + public function load($component, midgard_page $folder = null) { if (! $this->can_load($component)) { @@ -91,14 +91,14 @@ class midcom_core_component_loader } // Load configuration for the component - $configuration = new midcom_core_services_configuration_yaml($component, $object); + $configuration = new midcom_core_services_configuration_yaml($component, $folder); if ($_MIDCOM->timer) { $_MIDCOM->timer->setMarker('MidCOM component loader::load::' . $component . '::configured'); } // Load the interface class - $this->interfaces[$component] = new $component($configuration, $object); + $this->interfaces[$component] = new $component($configuration, $folder); if ($_MIDCOM->timer) { $_MIDCOM->timer->setMarker('MidCOM component loader::load::' . $component . '::instantiated'); midcom_core/component/loader.php @@ -18,7 +18,7 @@ interface midcom_core_services_configuration * * @param string $component Component to load configuration for */ - public function __construct($component); + public function __construct($component, midgard_page $folder = null); /** * Retrieve a configuration key @@ -30,7 +30,7 @@ interface midcom_core_services_configuration * @return mixed Its value * @see midcom_helper_configuration::exists() */ - public function get($key, $subkey=false); + public function get($key, $subkey = false); /** * @see midcom_helper_configuration::get() midcom_core/services/configuration.php @@ -22,7 +22,7 @@ class midcom_core_services_configuration_yaml implements midcom_core_services_co private $use_syck = true; - public function __construct($component, $object = null) + public function __construct($component, midgard_page $folder = null) { // The original component we're working with $this->component = $component; @@ -56,9 +56,9 @@ class midcom_core_services_configuration_yaml implements midcom_core_services_co $this->load_locals(); $this->merged = self::merge_configs($this->globals, $this->locals); - if ($object) + if ($folder) { - $this->objects = $this->load_objects($object->guid); + $this->objects = $this->load_objects($folder->guid); $this->merged = self::merge_configs($this->merged, $this->objects); } midcom_core/services/configuration/yaml.php c91f6f27d353960944db8b12633187fd0262f824 Henri Bergius henri.bergius@iki.fi http://github.com/bergie/midcom/commit/320e0614676db7a65372a5d321d02c570fde2668 320e0614676db7a65372a5d321d02c570fde2668 2009-06-24T21:57:44-07:00 2009-06-24T21:57:44-07:00 More type hinting git-svn-id: https://svn.midgard-project.org/midgard/trunk/midcom@22694 62f49d1c-1c16-0410-9156-d311ce72abac 80c68f605a579070df2acb578e338e02d3eddfd4 Henri Bergius henri.bergius@iki.fi