Changeset 8129

Timestamp:

03/28/08 00:12:06 (7 months ago)

Author:

francois

Message:

sfPropelFinderPlugin Refactored main class for better readability

Files:

• plugins/sfPropelFinderPlugin/README (modified) (1 diff)
• plugins/sfPropelFinderPlugin/lib/sfPropelFinder.php (modified) (10 diffs)

plugins/sfPropelFinderPlugin/README

@@ -196 +196 @@
-
- * Allow hydrating of related objects (doSelectJoinXXX equivalent)
-
-
+
+
+
+
-
-== Changelog ==

plugins/sfPropelFinderPlugin/lib/sfPropelFinder.php

@@ -17 +17 @@
-  protected $relations = null;
-  
-  public function getPeerClass()
-  {
-    return $this->peerClass;
-  }
-
-  public function setPeerClass($peerClass)
-  {
-    $this->relations[]= $peerClass;
-    return $this->peerClass = $peerClass;
-  }
-  
-  public function __construct($class = '')
-  {
@@ -48 +37 @@
-  }
-  
+  public function getPeerClass()
+  {
+    return $this->peerClass;
+  }
+
+  public function setPeerClass($peerClass)
+  {
+    $this->relations[]= $peerClass;
+    $this->peerClass = $peerClass;
+    return $this;
+  }
+  
+  public function getCriteria()
+  {
+    return $this->criteria;
+  }
+  
+  public function setCriteria($criteria)
+  {
+    $this->criteria = $criteria;
+    return $this;
+  }
+
-  public function reinitCriteria()
-  {
-    $this->criteria = new Criteria();
-
+
+
+
+
-  
-  public static function from($class)
@@ -60 +75 @@
-    return $finder;
-  }
+  
+  // Finder Executers
-  
-  public function count($con = null, $reinitCriteria = true)
@@ -130 +147 @@
-  }
-  
+  // Finder Filters
+  
+  /**
+   * Finder Fluid Interface for Criteria::setDistinct()
+   */
-  public function distinct()
-  {
@@ -137 +159 @@
-  }
-  
+  /**
+   * Finder Fluid Interface for Criteria::add()
+   */
-  public function where($column, $value, $comparison = Criteria::EQUAL)
-  {
@@ -143 +168 @@
-    return $this;
-  }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  public function orderBy($column, $order = Criteria::ASC)
-  {
@@ -161 +227 @@
-  }
-  
+  /**
+   * Magic version of orderBy()
+   * Infers $column and $order from $columnName and some optional arguments
+   * Examples:
+   *   $articleFinder->_orderBy('CreatedAt')
+   *    => $c->addAscendingOrderByColumn(ArticlePeer::CREATED_AT)
+   *   $articlefinder->_orderBy('CategoryId', 'desc')
+   *    => $c->addDescendingOrderByColumn(ArticlePeer::CATEGORY_ID)
+   */
+  public function _orderBy($columnName, $arguments = array())
+  {
+    $column = $this->getColName($columnName);
+    $order = strtoupper(array_shift($arguments));
+    if(!$order)
+    {
+      $order = Criteria::ASC;
+    }
+    
+    return $this->orderBy($column, $order);
+  }
+  
+  /**
+   * Finder Fluid Interface for Criteria::addJoin()
+   */
-  public function join($column1, $column2, $operator = null)
-  {
@@ -168 +258 @@
-  }
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  public function getRelation($phpName)
-  {
@@ -285 +330 @@
-  protected function getColName($phpName, $peerClass = null)
-  {
+    if(strpos($phpName, '_') !== false)
+    {
+      list($class, $phpName) = split('_', $phpName);
+      $peerClass = $class.'Peer';
+    }
-    if(!$peerClass)
-    {
@@ -299 +349 @@
-    }
-  }
+  
+  public function __call($name, $arguments)
+  {
+    if(strpos($name, 'where') === 0)
+    {
+      return $this->_where(substr($name, 5), $arguments);
+    }
+    if(strpos($name, 'orderBy') === 0)
+    {
+      return $this->_orderBy(substr($name, 7), $arguments);
+    }
+    if(strpos($name, 'join') === 0)
+    {
+      return $this->_join(substr($name, 4), $arguments);
+    }
+    throw new Exception(sprintf('{sfPropelFinder} Undefined method %s', $name));
+  }
-}