Changeset 14465

Timestamp:

01/17/08 13:30:25 (11 months ago)

Author:

rambo

Message:

make the mgdschema_class property public

Files:

• trunk/midcom/midcom.helper.reflector/reflector.php (modified) (20 diffs)
• trunk/midcom/midcom.helper.reflector/reflector_tree.php (modified) (8 diffs)

trunk/midcom/midcom.helper.reflector/reflector.php

@@ -15 +15 @@
-{
-
-_
+
-    var $_mgd_reflector = false;
-    var $_dummy_object = false;
@@ -41 +41 @@
-
-        // Resolve root class name
-_
+
-
-        // Could not resolve root class name
-_
+
-        {
-            debug_push_class(__CLASS__, __FUNCTION__);
@@ -54 +54 @@
-
-        // Instantiate midgard reflector
-_
+
-        {
-            $x = false;
-            return $x;
-        }
-_
+
-        if (!$this->_mgd_reflector)
-        {
-            debug_push_class(__CLASS__, __FUNCTION__);
-_
+
-            debug_pop();
-            $x = false;
@@ -70 +70 @@
-
-        // Instantiate dummy object
-_
+
-        if (!$this->_dummy_object)
-        {
-            debug_push_class(__CLASS__, __FUNCTION__);
-_
+
-            debug_pop();
-            $x = false;
@@ -109 +109 @@
-            $GLOBALS['midcom_helper_reflector_get_component_l10n_cache'] = array();
-        }
-_
-
-_
+
+
+
-        }
-        debug_push_class(__CLASS__, __FUNCTION__);
-_
+
-        $midcom_dba_classname = $_MIDCOM->dbclassloader->get_midcom_class_name_for_mgdschema_object($this->_dummy_object);
-        if (empty($midcom_dba_classname))
-        {
-            // Could not resolve MidCOM DBA class name, fallback early to our own l10n
-_
-
-_
+
+
+
-            return $this->_l10n;
-        }
-_
-_
+
+
-        {
-            // Cannot resolve component, fallback early to our own l10n
-            debug_add("Could not resolve component for DBA class {$midcom_dba_classname}, using our own l10n", MIDCOM_LOG_INFO);
-            debug_pop();
-_
+
-            return $this->_l10n;
-        }
-        // Got component, try to load the l10n helper for it
-_
+
-        debug_add("Class {$midcom_dba_classname} is handled by component {$component}");
-        $midcom_i18n = $_MIDCOM->get_service('i18n');
@@ -142 +142 @@
-            debug_add("Got l10n handler for component {$component}, returning that");
-            debug_pop();
-_
+
-            return $component_l10n;
-        }
-
-        // Could not get anything else, use our own l10n
-_
+
-        debug_pop();
-_
+
-        return $this->_l10n;
-    }
@@ -158 +158 @@
-        static $component_l10n = false;
-        $component_l10n = $this->get_component_l10n();
-_
+
-        $midcom_dba_classname = $_MIDCOM->dbclassloader->get_midcom_class_name_for_mgdschema_object($this->_dummy_object);
-        if (!empty($midcom_dba_classname))
@@ -198 +198 @@
-    {
-        // Check against static calling
-_
-_
-_
+
+
+
-        {
-            debug_push_class(__CLASS__, __FUNCTION__);
@@ -209 +209 @@
-
-        debug_push_class(__CLASS__, __FUNCTION__);
-_
+
-        $properties = get_object_vars($obj);
-        if (empty($properties))
@@ -252 +252 @@
-    {
-        // Check against static calling
-_
-_
+
+
-        {
-            debug_push_class(__CLASS__, __FUNCTION__);
@@ -379 +379 @@
-    {
-        // Check against static calling
-_
-_
+
+
-        {
-            debug_push_class(__CLASS__, __FUNCTION__);
@@ -493 +493 @@
-    {
-        // Check against static calling
-_
-_
+
+
-        {
-            debug_push_class(__CLASS__, __FUNCTION__);
@@ -504 +504 @@
-        // Return cached results if we have them
-        static $cache = array();
-_
-
-_
+
+
+
-        }
-        debug_push_class(__CLASS__, __FUNCTION__);
-_
+
-        $obj =& $this->_dummy_object;
-
@@ -546 +546 @@
-        }
-        $always_search = array();
-_
-
-_
+
+
+
-        }
-        foreach ($always_search as $property)
@@ -554 +554 @@
-            if (!array_key_exists($property, $properties))
-            {
-_
+
-                continue;
-            }
@@ -574 +574 @@
-        }
-        $never_search = array();
-_
-
-_
+
+
+
-        }
-        foreach ($never_search as $property)
@@ -594 +594 @@
-        }
-
-_
+
-        debug_pop();
-_
+
-        return $search_properties;
-    }
@@ -615 +615 @@
-    {
-        // Check against static calling
-_
-_
+
+
-        {
-            debug_push_class(__CLASS__, __FUNCTION__);
@@ -626 +626 @@
-        // Return cached results if we have them
-        static $cache = array();
-_
-
-_
+
+
+
-        }
-        debug_push_class(__CLASS__, __FUNCTION__);
-_
+
-
-        // Shorthands
@@ -697 +697 @@
-        }
-
-_
+
-        debug_pop();
-_
+
-        return $links;
-    }

trunk/midcom/midcom.helper.reflector/reflector_tree.php

@@ -54 +54 @@
-    function &_root_objects_qb(&$deleted)
-    {
-_
+
-        $root_classes = midcom_helper_reflector_tree::get_root_classes();
-        if (!in_array($schema_type, $root_classes))
@@ -168 +168 @@
-    {
-        // Check against static calling
-_
-_
+
+
-        {
-            debug_push_class(__CLASS__, __FUNCTION__);
@@ -216 +216 @@
-    {
-        // Check against static calling
-_
-_
+
+
-        {
-            debug_push_class(__CLASS__, __FUNCTION__);
@@ -334 +334 @@
-        $resolver = new midcom_helper_reflector_tree($object);
-        $ref =& $resolver->_mgd_reflector;
-_
+
-
-        // up takes precedence over parent
@@ -645 +645 @@
-    {
-        // Check against static calling
-_
-_
+
+
-        {
-            debug_push_class(__CLASS__, __FUNCTION__);
@@ -654 +654 @@
-        }
-        static $child_classes_all = array();
-_
-
-_
-
-_
+
+
+
+
+
-        if ($child_classes === false)
-        {
@@ -674 +674 @@
-    {
-        // Check against static calling
-_
-_
+
+
-        {
-            debug_push_class(__CLASS__, __FUNCTION__);
@@ -687 +687 @@
-            $parent_property = midgard_object_class::get_property_parent($schema_type);
-            $up_property = midgard_object_class::get_property_up($schema_type);
-_
-_
+
+
-            {
-                continue;