Changeset 7555

Timestamp:

02/20/08 16:33:33 (9 months ago)

Author:

hartym

Message:

sfPropelImpersonatorPlugin : added support for init/set/addXxx(s)RelatedBySomethingElseId? use with an optional related_by= parameter appendable to propel class names in ObjectPeerImpersonator? constructor.

Files:

• plugins/sfPropelImpersonatorPlugin/trunk/lib/sfPropelObjectPeerImpersonator.class.php (modified) (10 diffs)

plugins/sfPropelImpersonatorPlugin/trunk/lib/sfPropelObjectPeerImpersonator.class.php

@@ -37 +37 @@
-    $connection,
-    $objects,
+    $objectsParameters,
-    $classToIndex,
-    $relations,
@@ -55 +56 @@
-    $args = func_get_args();
-    $this->objects = array();
+    $this->objectsParameters = array();
-
-    if (count($args))
@@ -349 +351 @@
-        $startcol = $rowObjects[$index]->hydrate($resultset, $startcol);
-
-
-/*
+/*
+
-        {
-          unset($rowObjects[$index]);
-          continue;
-        }
-
+/*
-
-          reason is: if we dont populate an empty propel object, propel will think we don't know it does not exists, and
@@ -413 +415 @@
-                $foreignClass = $relation['classFrom'];
-                $foreignObject = $rowObjects[$this->getIndexByClass($foreignClass)];
+                $relatedBy = (null === ($_relatedBy=$this->getParameter($index, 'related_by')))?'':'RelatedBy'.sfInflector::camelize($_relatedBy);
-
-                if ($isNewObject)
@@ -421 +424 @@
-                  }
-
-
+
+
-                }
-
-
-
+.$relatedBy
+.$relatedBy
-
-                $linkedRelationsCounter++;
@@ -473 +477 @@
-                  $foreignObject = $rowObjects[$classToIndex];
-
+                  $relatedBy = (null === ($_relatedBy=$this->getParameter($classToIndex, 'related_by')))?'':'RelatedBy'.sfInflector::camelize($_relatedBy);
+                  // @todo: bug correction, this does not work if related_by is used this way, it tries to call setFieldRelatedByFieldId
+                  // instead of setClassNameRelatedByFieldId, and sometimes (depending on order) it uses the wrong Field, as second one
+                  // override first one in relations
+
-                  // local *---- foreign (local object has one foreign object)
-
+.$relatedBy
-
-                  // foreign ----* local (foreign object has many local objects)
@@ -480 +489 @@
-                  // @todo: find a way not to call initXxxXxxs() on every passes, but only on first addition for each object.
-
-
-
+.$relatedBy
+.$relatedBy
-
-                  $linkedRelationsCounter++;
@@ -527 +536 @@
-   *
-   * @param mixed $key
+   *
-   * @return boolean
-   */
@@ -554 +564 @@
-
-  /**
+   * Merge a new parameters set with existing one for object indexed by $objectIndex
+   *
+   * @param integer $objectIndex
+   * @param array   $parameters
+   */
+  protected function setParameters($objectIndex, array $parameters)
+  {
+    if (!isset($this->objectsParameters[$objectIndex]))
+    {
+      $this->objectsParameters[$objectIndex] = array();
+    }
+
+    $this->objectsParameters[$objectIndex] = array_merge($this->objectsParameters[$objectIndex], $parameters);
+  }
+
+  /**
+   * Retrieve a parameter for an object
+   *
+   * @param mixed  $objectIndexOrName
+   * @param string $parameterName
+   * @param mixed  $defaultValue
+   *
+   * @return mixed
+   */
+  public function getParameter($objectIndexOrName, $parameterName, $defaultValue=null)
+  {
+    if (!is_numeric($objectIndexOrName))
+    {
+      $objectIndexOrName = $this->getIndexByClass($objectIndexOrName);
+    }
+
+    if (null===$objectIndexOrName || !isset($this->objects[$objectIndexOrName]))
+    {
+      throw new Exception('Tried to retrievea parameter for an unknown object name or index.');
+    }
+
+    if (!isset($this->objectsParameters[$objectIndexOrName]) || !isset($this->objectsParameters[$objectIndexOrName][$parameterName]))
+    {
+      return $defaultValue;
+    }
+    else
+    {
+      return $this->objectsParameters[$objectIndexOrName][$parameterName];
+    }
+  }
+
+  /**
-   * Adds an object instance to the current objects array
-   */
-
+, $parameters=null
-  {
-    $this->objects[] = $instance;
+
+    if (null!==$parameters)
+    {
+      $this->setParameters(count($this->objects)-1, $parameters);
+    }
-  }
-
@@ -564 +626 @@
-  protected function addObjectByClassName($className)
-  {
+    // find whether or not we have parameters set for this object
+    if (false!==strpos($className, ' '))
+    {
+      // separate classname from parameters
+      $_parameters = explode(' ', $className);
+      $className = array_shift($_parameters);
+
+      // transform parameters into useable array
+      $_parameters = array_map(create_function('$v', 'return explode(\'=\', $v);'), $_parameters);
+      $parameters = array();
+
+      foreach ($_parameters as $parameter)
+      {
+        if (count($parameter)==2)
+        {
+          $parameters[$parameter[0]] = $parameter[1];
+        }
+        else
+        {
+          throw new Exception('Invalid parameter given');
+        }
+      }
+    }
+
+    // add object
-    if (class_exists($className, true))
-    {
-
+
+
+
+
+
+
+
+
-    }
-    else
-    {
-
+()
-    }
-  }