thecodingmachine / database.tdbm

src/Mouf/Database/TDBM/DbRow.php

Spacing +1 added lines, -1 removed lines

@@ -353,7 +353,7 @@
             $pkValues = array_values($firstRefDbRow->_getPrimaryKeys());
             $localColumns = $fk->getLocalColumns();
 
-            for ($i = 0, $count = count($localColumns); $i < $count; ++$i) {
+            for ($i = 0, $count = count($localColumns); $i<$count; ++$i) {
                 $dbRow[$localColumns[$i]] = $pkValues[$i];
             }
         }

Indentation +363 added lines, -363 removed lines

@@ -27,163 +27,163 @@ 
  */
 class DbRow
 {
-    /**
-     * The service this object is bound to.
-     *
-     * @var TDBMService
-     */
-    protected $tdbmService;
-
-    /**
-     * The object containing this db row.
-     *
-     * @var AbstractTDBMObject
-     */
-    private $object;
-
-    /**
-     * The name of the table the object if issued from.
-     *
-     * @var string
-     */
-    private $dbTableName;
-
-    /**
-     * The array of columns returned from database.
-     *
-     * @var array
-     */
-    private $dbRow = array();
-
-    /**
-     * @var AbstractTDBMObject[]
-     */
-    private $references = array();
-
-    /**
-     * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
-     * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
-     * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
-     * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
-     *
-     * @var string
-     */
-    private $status;
-
-    /**
-     * The values of the primary key.
-     * This is set when the object is in "loaded" state.
-     *
-     * @var array An array of column => value
-     */
-    private $primaryKeys;
-
-    /**
-     * You should never call the constructor directly. Instead, you should use the
-     * TDBMService class that will create TDBMObjects for you.
-     *
-     * Used with id!=false when we want to retrieve an existing object
-     * and id==false if we want a new object
-     *
-     * @param AbstractTDBMObject $object      The object containing this db row.
-     * @param string             $table_name
-     * @param array              $primaryKeys
-     * @param TDBMService        $tdbmService
-     *
-     * @throws TDBMException
-     * @throws TDBMInvalidOperationException
-     */
-    public function __construct(AbstractTDBMObject $object, $table_name, array $primaryKeys = array(), TDBMService $tdbmService = null, array $dbRow = array())
-    {
-        $this->object = $object;
-        $this->dbTableName = $table_name;
-
-        $this->status = TDBMObjectStateEnum::STATE_DETACHED;
-
-        if ($tdbmService === null) {
-            if (!empty($primaryKeys)) {
-                throw new TDBMException('You cannot pass an id to the DbRow constructor without passing also a TDBMService.');
-            }
-        } else {
-            $this->tdbmService = $tdbmService;
-
-            if (!empty($primaryKeys)) {
-                $this->_setPrimaryKeys($primaryKeys);
-                if (!empty($dbRow)) {
-                    $this->dbRow = $dbRow;
-                    $this->status = TDBMObjectStateEnum::STATE_LOADED;
-                } else {
-                    $this->status = TDBMObjectStateEnum::STATE_NOT_LOADED;
-                }
-                $tdbmService->_addToCache($this);
-            } else {
-                $this->status = TDBMObjectStateEnum::STATE_NEW;
-                $this->tdbmService->_addToToSaveObjectList($this);
-            }
-        }
-    }
-
-    public function _attach(TDBMService $tdbmService)
-    {
-        if ($this->status !== TDBMObjectStateEnum::STATE_DETACHED) {
-            throw new TDBMInvalidOperationException('Cannot attach an object that is already attached to TDBM.');
-        }
-        $this->tdbmService = $tdbmService;
-        $this->status = TDBMObjectStateEnum::STATE_NEW;
-        $this->tdbmService->_addToToSaveObjectList($this);
-    }
-
-    /**
-     * Sets the state of the TDBM Object
-     * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
-     * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
-     * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
-     * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
-     *
-     * @param string $state
-     */
-    public function _setStatus($state)
-    {
-        $this->status = $state;
-    }
-
-    /**
-     * This is an internal method. You should not call this method yourself. The TDBM library will do it for you.
-     * If the object is in state 'not loaded', this method performs a query in database to load the object.
-     *
-     * A TDBMException is thrown is no object can be retrieved (for instance, if the primary key specified
-     * cannot be found).
-     */
-    public function _dbLoadIfNotLoaded()
-    {
-        if ($this->status == TDBMObjectStateEnum::STATE_NOT_LOADED) {
-            $connection = $this->tdbmService->getConnection();
-
-            /// buildFilterFromFilterBag($filter_bag)
-            list($sql_where, $parameters) = $this->tdbmService->buildFilterFromFilterBag($this->primaryKeys);
-
-            $sql = 'SELECT * FROM '.$connection->quoteIdentifier($this->dbTableName).' WHERE '.$sql_where;
-            $result = $connection->executeQuery($sql, $parameters);
-
-            if ($result->rowCount() === 0) {
-                throw new TDBMException("Could not retrieve object from table \"$this->dbTableName\" using filter \"\".");
-            }
-
-            $this->dbRow = $result->fetch(\PDO::FETCH_ASSOC);
-
-            $result->closeCursor();
-
-            $this->status = TDBMObjectStateEnum::STATE_LOADED;
-        }
-    }
-
-    public function get($var)
-    {
-        $this->_dbLoadIfNotLoaded();
-
-        // Let's first check if the key exist.
-        if (!isset($this->dbRow[$var])) {
-            /*
+	/**
+	 * The service this object is bound to.
+	 *
+	 * @var TDBMService
+	 */
+	protected $tdbmService;
+
+	/**
+	 * The object containing this db row.
+	 *
+	 * @var AbstractTDBMObject
+	 */
+	private $object;
+
+	/**
+	 * The name of the table the object if issued from.
+	 *
+	 * @var string
+	 */
+	private $dbTableName;
+
+	/**
+	 * The array of columns returned from database.
+	 *
+	 * @var array
+	 */
+	private $dbRow = array();
+
+	/**
+	 * @var AbstractTDBMObject[]
+	 */
+	private $references = array();
+
+	/**
+	 * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
+	 * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
+	 * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
+	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
+	 *
+	 * @var string
+	 */
+	private $status;
+
+	/**
+	 * The values of the primary key.
+	 * This is set when the object is in "loaded" state.
+	 *
+	 * @var array An array of column => value
+	 */
+	private $primaryKeys;
+
+	/**
+	 * You should never call the constructor directly. Instead, you should use the
+	 * TDBMService class that will create TDBMObjects for you.
+	 *
+	 * Used with id!=false when we want to retrieve an existing object
+	 * and id==false if we want a new object
+	 *
+	 * @param AbstractTDBMObject $object      The object containing this db row.
+	 * @param string             $table_name
+	 * @param array              $primaryKeys
+	 * @param TDBMService        $tdbmService
+	 *
+	 * @throws TDBMException
+	 * @throws TDBMInvalidOperationException
+	 */
+	public function __construct(AbstractTDBMObject $object, $table_name, array $primaryKeys = array(), TDBMService $tdbmService = null, array $dbRow = array())
+	{
+		$this->object = $object;
+		$this->dbTableName = $table_name;
+
+		$this->status = TDBMObjectStateEnum::STATE_DETACHED;
+
+		if ($tdbmService === null) {
+			if (!empty($primaryKeys)) {
+				throw new TDBMException('You cannot pass an id to the DbRow constructor without passing also a TDBMService.');
+			}
+		} else {
+			$this->tdbmService = $tdbmService;
+
+			if (!empty($primaryKeys)) {
+				$this->_setPrimaryKeys($primaryKeys);
+				if (!empty($dbRow)) {
+					$this->dbRow = $dbRow;
+					$this->status = TDBMObjectStateEnum::STATE_LOADED;
+				} else {
+					$this->status = TDBMObjectStateEnum::STATE_NOT_LOADED;
+				}
+				$tdbmService->_addToCache($this);
+			} else {
+				$this->status = TDBMObjectStateEnum::STATE_NEW;
+				$this->tdbmService->_addToToSaveObjectList($this);
+			}
+		}
+	}
+
+	public function _attach(TDBMService $tdbmService)
+	{
+		if ($this->status !== TDBMObjectStateEnum::STATE_DETACHED) {
+			throw new TDBMInvalidOperationException('Cannot attach an object that is already attached to TDBM.');
+		}
+		$this->tdbmService = $tdbmService;
+		$this->status = TDBMObjectStateEnum::STATE_NEW;
+		$this->tdbmService->_addToToSaveObjectList($this);
+	}
+
+	/**
+	 * Sets the state of the TDBM Object
+	 * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
+	 * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
+	 * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
+	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
+	 *
+	 * @param string $state
+	 */
+	public function _setStatus($state)
+	{
+		$this->status = $state;
+	}
+
+	/**
+	 * This is an internal method. You should not call this method yourself. The TDBM library will do it for you.
+	 * If the object is in state 'not loaded', this method performs a query in database to load the object.
+	 *
+	 * A TDBMException is thrown is no object can be retrieved (for instance, if the primary key specified
+	 * cannot be found).
+	 */
+	public function _dbLoadIfNotLoaded()
+	{
+		if ($this->status == TDBMObjectStateEnum::STATE_NOT_LOADED) {
+			$connection = $this->tdbmService->getConnection();
+
+			/// buildFilterFromFilterBag($filter_bag)
+			list($sql_where, $parameters) = $this->tdbmService->buildFilterFromFilterBag($this->primaryKeys);
+
+			$sql = 'SELECT * FROM '.$connection->quoteIdentifier($this->dbTableName).' WHERE '.$sql_where;
+			$result = $connection->executeQuery($sql, $parameters);
+
+			if ($result->rowCount() === 0) {
+				throw new TDBMException("Could not retrieve object from table \"$this->dbTableName\" using filter \"\".");
+			}
+
+			$this->dbRow = $result->fetch(\PDO::FETCH_ASSOC);
+
+			$result->closeCursor();
+
+			$this->status = TDBMObjectStateEnum::STATE_LOADED;
+		}
+	}
+
+	public function get($var)
+	{
+		$this->_dbLoadIfNotLoaded();
+
+		// Let's first check if the key exist.
+		if (!isset($this->dbRow[$var])) {
+			/*
             // Unable to find column.... this is an error if the object has been retrieved from database.
             // If it's a new object, well, that may not be an error after all!
             // Let's check if the column does exist in the table
@@ -203,39 +203,39 @@ 
             $str = "Could not find column \"$var\" in table \"$this->dbTableName\". Maybe you meant one of those columns: '".implode("', '",$result_array)."'";
 
             throw new TDBMException($str);*/
-            return;
-        }
-
-        $value = $this->dbRow[$var];
-        if ($value instanceof \DateTime) {
-            if (method_exists('DateTimeImmutable', 'createFromMutable')) { // PHP 5.6+ only
-                return \DateTimeImmutable::createFromMutable($value);
-            } else {
-                return new \DateTimeImmutable($value->format('c'));
-            }
-        }
-
-        return $this->dbRow[$var];
-    }
-
-    /**
-     * Returns true if a column is set, false otherwise.
-     *
-     * @param string $var
-     *
-     * @return bool
-     */
-    /*public function has($var) {
+			return;
+		}
+
+		$value = $this->dbRow[$var];
+		if ($value instanceof \DateTime) {
+			if (method_exists('DateTimeImmutable', 'createFromMutable')) { // PHP 5.6+ only
+				return \DateTimeImmutable::createFromMutable($value);
+			} else {
+				return new \DateTimeImmutable($value->format('c'));
+			}
+		}
+
+		return $this->dbRow[$var];
+	}
+
+	/**
+	 * Returns true if a column is set, false otherwise.
+	 *
+	 * @param string $var
+	 *
+	 * @return bool
+	 */
+	/*public function has($var) {
         $this->_dbLoadIfNotLoaded();
 
         return isset($this->dbRow[$var]);
     }*/
 
-    public function set($var, $value)
-    {
-        $this->_dbLoadIfNotLoaded();
+	public function set($var, $value)
+	{
+		$this->_dbLoadIfNotLoaded();
 
-        /*
+		/*
         // Ok, let's start by checking the column type
         $type = $this->db_connection->getColumnType($this->dbTableName, $var);
 
@@ -245,184 +245,184 @@ 
         }
         */
 
-        /*if ($var == $this->getPrimaryKey() && isset($this->dbRow[$var]))
+		/*if ($var == $this->getPrimaryKey() && isset($this->dbRow[$var]))
             throw new TDBMException("Error! Changing primary key value is forbidden.");*/
-        $this->dbRow[$var] = $value;
-        if ($this->tdbmService !== null && $this->status === TDBMObjectStateEnum::STATE_LOADED) {
-            $this->status = TDBMObjectStateEnum::STATE_DIRTY;
-            $this->tdbmService->_addToToSaveObjectList($this);
-        }
-    }
-
-    /**
-     * @param string             $foreignKeyName
-     * @param AbstractTDBMObject $bean
-     */
-    public function setRef($foreignKeyName, AbstractTDBMObject $bean = null)
-    {
-        $this->references[$foreignKeyName] = $bean;
-
-        if ($this->tdbmService !== null && $this->status === TDBMObjectStateEnum::STATE_LOADED) {
-            $this->status = TDBMObjectStateEnum::STATE_DIRTY;
-            $this->tdbmService->_addToToSaveObjectList($this);
-        }
-    }
-
-    /**
-     * @param string $foreignKeyName A unique name for this reference
-     *
-     * @return AbstractTDBMObject|null
-     */
-    public function getRef($foreignKeyName)
-    {
-        if (isset($this->references[$foreignKeyName])) {
-            return $this->references[$foreignKeyName];
-        } elseif ($this->status === TDBMObjectStateEnum::STATE_NEW) {
-            // If the object is new and has no property, then it has to be empty.
-            return;
-        } else {
-            $this->_dbLoadIfNotLoaded();
-
-            // Let's match the name of the columns to the primary key values
-            $fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
-
-            $values = [];
-            foreach ($fk->getLocalColumns() as $column) {
-                $values[] = $this->dbRow[$column];
-            }
-
-            $filter = array_combine($this->tdbmService->getPrimaryKeyColumns($fk->getForeignTableName()), $values);
-
-            return $this->tdbmService->findObjectByPk($fk->getForeignTableName(), $filter, [], true);
-        }
-    }
-
-    /**
-     * Returns the name of the table this object comes from.
-     *
-     * @return string
-     */
-    public function _getDbTableName()
-    {
-        return $this->dbTableName;
-    }
-
-    /**
-     * Method used internally by TDBM. You should not use it directly.
-     * This method returns the status of the TDBMObject.
-     * This is one of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
-     * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
-     * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
-     * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
-     *
-     * @return string
-     */
-    public function _getStatus()
-    {
-        return $this->status;
-    }
-
-    /**
-     * Override the native php clone function for TDBMObjects.
-     */
-    public function __clone()
-    {
-        // Let's load the row (before we lose the ID!)
-        $this->_dbLoadIfNotLoaded();
-
-        //Let's set the status to detached
-        $this->status = TDBMObjectStateEnum::STATE_DETACHED;
-
-        $this->primaryKeys = [];
-
-        //Now unset the PK from the row
-        if ($this->tdbmService) {
-            $pk_array = $this->tdbmService->getPrimaryKeyColumns($this->dbTableName);
-            foreach ($pk_array as $pk) {
-                $this->dbRow[$pk] = null;
-            }
-        }
-    }
-
-    /**
-     * Returns raw database row.
-     *
-     * @return array
-     */
-    public function _getDbRow()
-    {
-        // Let's merge $dbRow and $references
-        $dbRow = $this->dbRow;
-
-        foreach ($this->references as $foreignKeyName => $reference) {
-            // Let's match the name of the columns to the primary key values
-            $fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
-            $refDbRows = $reference->_getDbRows();
-            $firstRefDbRow = reset($refDbRows);
-            $pkValues = array_values($firstRefDbRow->_getPrimaryKeys());
-            $localColumns = $fk->getLocalColumns();
-
-            for ($i = 0, $count = count($localColumns); $i < $count; ++$i) {
-                $dbRow[$localColumns[$i]] = $pkValues[$i];
-            }
-        }
-
-        return $dbRow;
-    }
-
-    /**
-     * Returns references array.
-     *
-     * @return AbstractTDBMObject[]
-     */
-    public function _getReferences()
-    {
-        return $this->references;
-    }
-
-    /**
-     * Returns the values of the primary key.
-     * This is set when the object is in "loaded" state.
-     *
-     * @return array
-     */
-    public function _getPrimaryKeys()
-    {
-        return $this->primaryKeys;
-    }
-
-    /**
-     * Sets the values of the primary key.
-     * This is set when the object is in "loaded" state.
-     *
-     * @param array $primaryKeys
-     */
-    public function _setPrimaryKeys(array $primaryKeys)
-    {
-        $this->primaryKeys = $primaryKeys;
-        foreach ($this->primaryKeys as $column => $value) {
-            $this->dbRow[$column] = $value;
-        }
-    }
-
-    /**
-     * Returns the TDBMObject this bean is associated to.
-     *
-     * @return AbstractTDBMObject
-     */
-    public function getTDBMObject()
-    {
-        return $this->object;
-    }
-
-    /**
-     * Sets the TDBMObject this bean is associated to.
-     * Only used when cloning.
-     *
-     * @param AbstractTDBMObject $object
-     */
-    public function setTDBMObject(AbstractTDBMObject $object)
-    {
-        $this->object = $object;
-    }
+		$this->dbRow[$var] = $value;
+		if ($this->tdbmService !== null && $this->status === TDBMObjectStateEnum::STATE_LOADED) {
+			$this->status = TDBMObjectStateEnum::STATE_DIRTY;
+			$this->tdbmService->_addToToSaveObjectList($this);
+		}
+	}
+
+	/**
+	 * @param string             $foreignKeyName
+	 * @param AbstractTDBMObject $bean
+	 */
+	public function setRef($foreignKeyName, AbstractTDBMObject $bean = null)
+	{
+		$this->references[$foreignKeyName] = $bean;
+
+		if ($this->tdbmService !== null && $this->status === TDBMObjectStateEnum::STATE_LOADED) {
+			$this->status = TDBMObjectStateEnum::STATE_DIRTY;
+			$this->tdbmService->_addToToSaveObjectList($this);
+		}
+	}
+
+	/**
+	 * @param string $foreignKeyName A unique name for this reference
+	 *
+	 * @return AbstractTDBMObject|null
+	 */
+	public function getRef($foreignKeyName)
+	{
+		if (isset($this->references[$foreignKeyName])) {
+			return $this->references[$foreignKeyName];
+		} elseif ($this->status === TDBMObjectStateEnum::STATE_NEW) {
+			// If the object is new and has no property, then it has to be empty.
+			return;
+		} else {
+			$this->_dbLoadIfNotLoaded();
+
+			// Let's match the name of the columns to the primary key values
+			$fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
+
+			$values = [];
+			foreach ($fk->getLocalColumns() as $column) {
+				$values[] = $this->dbRow[$column];
+			}
+
+			$filter = array_combine($this->tdbmService->getPrimaryKeyColumns($fk->getForeignTableName()), $values);
+
+			return $this->tdbmService->findObjectByPk($fk->getForeignTableName(), $filter, [], true);
+		}
+	}
+
+	/**
+	 * Returns the name of the table this object comes from.
+	 *
+	 * @return string
+	 */
+	public function _getDbTableName()
+	{
+		return $this->dbTableName;
+	}
+
+	/**
+	 * Method used internally by TDBM. You should not use it directly.
+	 * This method returns the status of the TDBMObject.
+	 * This is one of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
+	 * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
+	 * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
+	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
+	 *
+	 * @return string
+	 */
+	public function _getStatus()
+	{
+		return $this->status;
+	}
+
+	/**
+	 * Override the native php clone function for TDBMObjects.
+	 */
+	public function __clone()
+	{
+		// Let's load the row (before we lose the ID!)
+		$this->_dbLoadIfNotLoaded();
+
+		//Let's set the status to detached
+		$this->status = TDBMObjectStateEnum::STATE_DETACHED;
+
+		$this->primaryKeys = [];
+
+		//Now unset the PK from the row
+		if ($this->tdbmService) {
+			$pk_array = $this->tdbmService->getPrimaryKeyColumns($this->dbTableName);
+			foreach ($pk_array as $pk) {
+				$this->dbRow[$pk] = null;
+			}
+		}
+	}
+
+	/**
+	 * Returns raw database row.
+	 *
+	 * @return array
+	 */
+	public function _getDbRow()
+	{
+		// Let's merge $dbRow and $references
+		$dbRow = $this->dbRow;
+
+		foreach ($this->references as $foreignKeyName => $reference) {
+			// Let's match the name of the columns to the primary key values
+			$fk = $this->tdbmService->_getForeignKeyByName($this->dbTableName, $foreignKeyName);
+			$refDbRows = $reference->_getDbRows();
+			$firstRefDbRow = reset($refDbRows);
+			$pkValues = array_values($firstRefDbRow->_getPrimaryKeys());
+			$localColumns = $fk->getLocalColumns();
+
+			for ($i = 0, $count = count($localColumns); $i < $count; ++$i) {
+				$dbRow[$localColumns[$i]] = $pkValues[$i];
+			}
+		}
+
+		return $dbRow;
+	}
+
+	/**
+	 * Returns references array.
+	 *
+	 * @return AbstractTDBMObject[]
+	 */
+	public function _getReferences()
+	{
+		return $this->references;
+	}
+
+	/**
+	 * Returns the values of the primary key.
+	 * This is set when the object is in "loaded" state.
+	 *
+	 * @return array
+	 */
+	public function _getPrimaryKeys()
+	{
+		return $this->primaryKeys;
+	}
+
+	/**
+	 * Sets the values of the primary key.
+	 * This is set when the object is in "loaded" state.
+	 *
+	 * @param array $primaryKeys
+	 */
+	public function _setPrimaryKeys(array $primaryKeys)
+	{
+		$this->primaryKeys = $primaryKeys;
+		foreach ($this->primaryKeys as $column => $value) {
+			$this->dbRow[$column] = $value;
+		}
+	}
+
+	/**
+	 * Returns the TDBMObject this bean is associated to.
+	 *
+	 * @return AbstractTDBMObject
+	 */
+	public function getTDBMObject()
+	{
+		return $this->object;
+	}
+
+	/**
+	 * Sets the TDBMObject this bean is associated to.
+	 * Only used when cloning.
+	 *
+	 * @param AbstractTDBMObject $object
+	 */
+	public function setTDBMObject(AbstractTDBMObject $object)
+	{
+		$this->object = $object;
+	}
 }

src/Mouf/Database/TDBM/StandardObjectStorage.php

Indentation +69 added lines, -69 removed lines

@@ -30,78 +30,78 @@
  */
 class StandardObjectStorage
 {
-    /**
-     * An array of fetched object, accessible via table name and primary key.
-     * If the primary key is split on several columns, access is done by an array of columns, serialized.
-     *
-     * @var array<string, array<string, TDBMObject>>
-     */
-    private $objects = array();
+	/**
+	 * An array of fetched object, accessible via table name and primary key.
+	 * If the primary key is split on several columns, access is done by an array of columns, serialized.
+	 *
+	 * @var array<string, array<string, TDBMObject>>
+	 */
+	private $objects = array();
 
-    /**
-     * Sets an object in the storage.
-     *
-     * @param string     $tableName
-     * @param string     $id
-     * @param TDBMObject $dbRow
-     */
-    public function set($tableName, $id, DbRow $dbRow)
-    {
-        $this->objects[$tableName][$id] = $dbRow;
-    }
+	/**
+	 * Sets an object in the storage.
+	 *
+	 * @param string     $tableName
+	 * @param string     $id
+	 * @param TDBMObject $dbRow
+	 */
+	public function set($tableName, $id, DbRow $dbRow)
+	{
+		$this->objects[$tableName][$id] = $dbRow;
+	}
 
-    /**
-     * Checks if an object is in the storage.
-     *
-     * @param string $tableName
-     * @param string $id
-     *
-     * @return bool
-     */
-    public function has($tableName, $id)
-    {
-        return isset($this->objects[$tableName][$id]);
-    }
+	/**
+	 * Checks if an object is in the storage.
+	 *
+	 * @param string $tableName
+	 * @param string $id
+	 *
+	 * @return bool
+	 */
+	public function has($tableName, $id)
+	{
+		return isset($this->objects[$tableName][$id]);
+	}
 
-    /**
-     * Returns an object from the storage (or null if no object is set).
-     *
-     * @param string $tableName
-     * @param string $id
-     *
-     * @return DbRow
-     */
-    public function get($tableName, $id)
-    {
-        if (isset($this->objects[$tableName][$id])) {
-            return $this->objects[$tableName][$id];
-        } else {
-            return;
-        }
-    }
+	/**
+	 * Returns an object from the storage (or null if no object is set).
+	 *
+	 * @param string $tableName
+	 * @param string $id
+	 *
+	 * @return DbRow
+	 */
+	public function get($tableName, $id)
+	{
+		if (isset($this->objects[$tableName][$id])) {
+			return $this->objects[$tableName][$id];
+		} else {
+			return;
+		}
+	}
 
-    /**
-     * Removes an object from the storage.
-     *
-     * @param string $tableName
-     * @param string $id
-     */
-    public function remove($tableName, $id)
-    {
-        unset($this->objects[$tableName][$id]);
-    }
+	/**
+	 * Removes an object from the storage.
+	 *
+	 * @param string $tableName
+	 * @param string $id
+	 */
+	public function remove($tableName, $id)
+	{
+		unset($this->objects[$tableName][$id]);
+	}
 
-    /**
-     * Applies the callback to all objects.
-     *
-     * @param callable $callback
-     */
-    public function apply(callable $callback)
-    {
-        foreach ($this->objects as $tableName => $table) {
-            foreach ($table as $id => $obj) {
-                $callback($obj, $tableName, $id);
-            }
-        }
-    }
+	/**
+	 * Applies the callback to all objects.
+	 *
+	 * @param callable $callback
+	 */
+	public function apply(callable $callback)
+	{
+		foreach ($this->objects as $tableName => $table) {
+			foreach ($table as $id => $obj) {
+				$callback($obj, $tableName, $id);
+			}
+		}
+	}
 }

src/Mouf/Database/TDBM/PageIterator.php

Spacing +2 added lines, -2 removed lines

@@ -112,7 +112,7 @@ 
      */
     public function getCurrentPage()
     {
-        return floor($this->offset / $this->limit) + 1;
+        return floor($this->offset/$this->limit)+1;
     }
 
     /**
@@ -251,7 +251,7 @@ 
      */
     public function jsonSerialize()
     {
-        return array_map(function (AbstractTDBMObject $item) {
+        return array_map(function(AbstractTDBMObject $item) {
             return $item->jsonSerialize();
         }, $this->toArray());
     }

Indentation +206 added lines, -206 removed lines

@@ -29,232 +29,232 @@
  */
 class PageIterator implements Page, \ArrayAccess, \JsonSerializable
 {
-    /**
-     * @var Statement
-     */
-    protected $statement;
+	/**
+	 * @var Statement
+	 */
+	protected $statement;
 
-    protected $fetchStarted = false;
-    private $objectStorage;
-    private $className;
+	protected $fetchStarted = false;
+	private $objectStorage;
+	private $className;
 
-    private $parentResult;
-    private $tdbmService;
-    private $magicSql;
-    private $parameters;
-    private $limit;
-    private $offset;
-    private $columnDescriptors;
-    private $magicQuery;
+	private $parentResult;
+	private $tdbmService;
+	private $magicSql;
+	private $parameters;
+	private $limit;
+	private $offset;
+	private $columnDescriptors;
+	private $magicQuery;
 
-    /**
-     * The key of the current retrieved object.
-     *
-     * @var int
-     */
-    protected $key = -1;
+	/**
+	 * The key of the current retrieved object.
+	 *
+	 * @var int
+	 */
+	protected $key = -1;
 
-    protected $current = null;
+	protected $current = null;
 
-    private $databasePlatform;
+	private $databasePlatform;
 
-    private $innerResultIterator;
+	private $innerResultIterator;
 
-    private $mode;
+	private $mode;
 
-    public function __construct(ResultIterator $parentResult, $magicSql, array $parameters, $limit, $offset, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode)
-    {
-        $this->parentResult = $parentResult;
-        $this->magicSql = $magicSql;
-        $this->objectStorage = $objectStorage;
-        $this->className = $className;
-        $this->tdbmService = $tdbmService;
-        $this->parameters = $parameters;
-        $this->limit = $limit;
-        $this->offset = $offset;
-        $this->columnDescriptors = $columnDescriptors;
-        $this->magicQuery = $magicQuery;
-        $this->databasePlatform = $this->tdbmService->getConnection()->getDatabasePlatform();
-        $this->mode = $mode;
-    }
+	public function __construct(ResultIterator $parentResult, $magicSql, array $parameters, $limit, $offset, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode)
+	{
+		$this->parentResult = $parentResult;
+		$this->magicSql = $magicSql;
+		$this->objectStorage = $objectStorage;
+		$this->className = $className;
+		$this->tdbmService = $tdbmService;
+		$this->parameters = $parameters;
+		$this->limit = $limit;
+		$this->offset = $offset;
+		$this->columnDescriptors = $columnDescriptors;
+		$this->magicQuery = $magicQuery;
+		$this->databasePlatform = $this->tdbmService->getConnection()->getDatabasePlatform();
+		$this->mode = $mode;
+	}
 
-    /**
-     * Retrieve an external iterator.
-     *
-     * @link http://php.net/manual/en/iteratoraggregate.getiterator.php
-     *
-     * @return InnerResultIterator An instance of an object implementing <b>Iterator</b> or
-     *                             <b>Traversable</b>
-     *
-     * @since 5.0.0
-     */
-    public function getIterator()
-    {
-        if ($this->innerResultIterator === null) {
-            if ($this->mode === TDBMService::MODE_CURSOR) {
-                $this->innerResultIterator = new InnerResultIterator($this->magicSql, $this->parameters, $this->limit, $this->offset, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery);
-            } else {
-                $this->innerResultIterator = new InnerResultArray($this->magicSql, $this->parameters, $this->limit, $this->offset, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery);
-            }
-        }
+	/**
+	 * Retrieve an external iterator.
+	 *
+	 * @link http://php.net/manual/en/iteratoraggregate.getiterator.php
+	 *
+	 * @return InnerResultIterator An instance of an object implementing <b>Iterator</b> or
+	 *                             <b>Traversable</b>
+	 *
+	 * @since 5.0.0
+	 */
+	public function getIterator()
+	{
+		if ($this->innerResultIterator === null) {
+			if ($this->mode === TDBMService::MODE_CURSOR) {
+				$this->innerResultIterator = new InnerResultIterator($this->magicSql, $this->parameters, $this->limit, $this->offset, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery);
+			} else {
+				$this->innerResultIterator = new InnerResultArray($this->magicSql, $this->parameters, $this->limit, $this->offset, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery);
+			}
+		}
 
-        return $this->innerResultIterator;
-    }
+		return $this->innerResultIterator;
+	}
 
-    /**
-     * @return int
-     */
-    public function getCurrentOffset()
-    {
-        return $this->offset;
-    }
+	/**
+	 * @return int
+	 */
+	public function getCurrentOffset()
+	{
+		return $this->offset;
+	}
 
-    /**
-     * @return int
-     */
-    public function getCurrentPage()
-    {
-        return floor($this->offset / $this->limit) + 1;
-    }
+	/**
+	 * @return int
+	 */
+	public function getCurrentPage()
+	{
+		return floor($this->offset / $this->limit) + 1;
+	}
 
-    /**
-     * @return int
-     */
-    public function getCurrentLimit()
-    {
-        return $this->limit;
-    }
+	/**
+	 * @return int
+	 */
+	public function getCurrentLimit()
+	{
+		return $this->limit;
+	}
 
-    /**
-     * Return the number of results on the current page of the {@link Result}.
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return $this->getIterator()->count();
-    }
+	/**
+	 * Return the number of results on the current page of the {@link Result}.
+	 *
+	 * @return int
+	 */
+	public function count()
+	{
+		return $this->getIterator()->count();
+	}
 
-    /**
-     * Return the number of ALL results in the paginatable of {@link Result}.
-     *
-     * @return int
-     */
-    public function totalCount()
-    {
-        return $this->parentResult->count();
-    }
+	/**
+	 * Return the number of ALL results in the paginatable of {@link Result}.
+	 *
+	 * @return int
+	 */
+	public function totalCount()
+	{
+		return $this->parentResult->count();
+	}
 
-    /**
-     * Casts the result set to a PHP array.
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        return iterator_to_array($this->getIterator());
-    }
+	/**
+	 * Casts the result set to a PHP array.
+	 *
+	 * @return array
+	 */
+	public function toArray()
+	{
+		return iterator_to_array($this->getIterator());
+	}
 
-    /**
-     * Returns a new iterator mapping any call using the $callable function.
-     *
-     * @param callable $callable
-     *
-     * @return MapIterator
-     */
-    public function map(callable $callable)
-    {
-        return new MapIterator($this->getIterator(), $callable);
-    }
+	/**
+	 * Returns a new iterator mapping any call using the $callable function.
+	 *
+	 * @param callable $callable
+	 *
+	 * @return MapIterator
+	 */
+	public function map(callable $callable)
+	{
+		return new MapIterator($this->getIterator(), $callable);
+	}
 
-    /**
-     * Whether a offset exists.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetexists.php
-     *
-     * @param mixed $offset <p>
-     *                      An offset to check for.
-     *                      </p>
-     *
-     * @return bool true on success or false on failure.
-     *              </p>
-     *              <p>
-     *              The return value will be casted to boolean if non-boolean was returned.
-     *
-     * @since 5.0.0
-     */
-    public function offsetExists($offset)
-    {
-        return $this->getIterator()->offsetExists($offset);
-    }
+	/**
+	 * Whether a offset exists.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetexists.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      An offset to check for.
+	 *                      </p>
+	 *
+	 * @return bool true on success or false on failure.
+	 *              </p>
+	 *              <p>
+	 *              The return value will be casted to boolean if non-boolean was returned.
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetExists($offset)
+	{
+		return $this->getIterator()->offsetExists($offset);
+	}
 
-    /**
-     * Offset to retrieve.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetget.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to retrieve.
-     *                      </p>
-     *
-     * @return mixed Can return all value types.
-     *
-     * @since 5.0.0
-     */
-    public function offsetGet($offset)
-    {
-        return $this->getIterator()->offsetGet($offset);
-    }
+	/**
+	 * Offset to retrieve.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetget.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      The offset to retrieve.
+	 *                      </p>
+	 *
+	 * @return mixed Can return all value types.
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetGet($offset)
+	{
+		return $this->getIterator()->offsetGet($offset);
+	}
 
-    /**
-     * Offset to set.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetset.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to assign the value to.
-     *                      </p>
-     * @param mixed $value  <p>
-     *                      The value to set.
-     *                      </p>
-     *
-     * @since 5.0.0
-     */
-    public function offsetSet($offset, $value)
-    {
-        return $this->getIterator()->offsetSet($offset, $value);
-    }
+	/**
+	 * Offset to set.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetset.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      The offset to assign the value to.
+	 *                      </p>
+	 * @param mixed $value  <p>
+	 *                      The value to set.
+	 *                      </p>
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetSet($offset, $value)
+	{
+		return $this->getIterator()->offsetSet($offset, $value);
+	}
 
-    /**
-     * Offset to unset.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetunset.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to unset.
-     *                      </p>
-     *
-     * @since 5.0.0
-     */
-    public function offsetUnset($offset)
-    {
-        return $this->getIterator()->offsetUnset($offset);
-    }
+	/**
+	 * Offset to unset.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetunset.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      The offset to unset.
+	 *                      </p>
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetUnset($offset)
+	{
+		return $this->getIterator()->offsetUnset($offset);
+	}
 
-    /**
-     * Specify data which should be serialized to JSON.
-     *
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     *
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     *               which is a value of any type other than a resource.
-     *
-     * @since 5.4.0
-     */
-    public function jsonSerialize()
-    {
-        return array_map(function (AbstractTDBMObject $item) {
-            return $item->jsonSerialize();
-        }, $this->toArray());
-    }
+	/**
+	 * Specify data which should be serialized to JSON.
+	 *
+	 * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+	 *
+	 * @return mixed data which can be serialized by <b>json_encode</b>,
+	 *               which is a value of any type other than a resource.
+	 *
+	 * @since 5.4.0
+	 */
+	public function jsonSerialize()
+	{
+		return array_map(function (AbstractTDBMObject $item) {
+			return $item->jsonSerialize();
+		}, $this->toArray());
+	}
 }

src/views/tdbmGenerate.php

Indentation +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 <input type="hidden" id="selfedit" name="selfedit" value="<?php echo plainstring_to_htmlprotected($this->selfedit) ?>" />
 
 <?php if (!$this->autoloadDetected) {
-    ?>
+	?>
 <div class="alert">Warning! TDBM could not detect the autoload section of your composer.json file.
 Unless you are developing your own autoload system, you should configure <strong>composer.json</strong> to <a href="http://getcomposer.org/doc/01-basic-usage.md#autoloading" target="_blank">define a source directory and a root namespace using PSR-0</a>.</div>
 <?php 

src/Mouf/Database/TDBM/InnerResultIterator.php

Indentation +242 added lines, -242 removed lines

@@ -28,246 +28,246 @@
  */
 class InnerResultIterator implements \Iterator, \Countable, \ArrayAccess
 {
-    /**
-     * @var Statement
-     */
-    protected $statement;
-
-    protected $fetchStarted = false;
-    private $objectStorage;
-    private $className;
-
-    private $tdbmService;
-    private $magicSql;
-    private $parameters;
-    private $limit;
-    private $offset;
-    private $columnDescriptors;
-    private $magicQuery;
-
-    /**
-     * The key of the current retrieved object.
-     *
-     * @var int
-     */
-    protected $key = -1;
-
-    protected $current = null;
-
-    private $databasePlatform;
-
-    public function __construct($magicSql, array $parameters, $limit, $offset, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery)
-    {
-        $this->magicSql = $magicSql;
-        $this->objectStorage = $objectStorage;
-        $this->className = $className;
-        $this->tdbmService = $tdbmService;
-        $this->parameters = $parameters;
-        $this->limit = $limit;
-        $this->offset = $offset;
-        $this->columnDescriptors = $columnDescriptors;
-        $this->magicQuery = $magicQuery;
-        $this->databasePlatform = $this->tdbmService->getConnection()->getDatabasePlatform();
-    }
-
-    protected function executeQuery()
-    {
-        $sql = $this->magicQuery->build($this->magicSql, $this->parameters);
-        $sql = $this->tdbmService->getConnection()->getDatabasePlatform()->modifyLimitQuery($sql, $this->limit, $this->offset);
-
-        $this->statement = $this->tdbmService->getConnection()->executeQuery($sql, $this->parameters);
-
-        $this->fetchStarted = true;
-    }
-
-    /**
-     * Counts found records (this is the number of records fetched, taking into account the LIMIT and OFFSET settings).
-     *
-     * @return int
-     */
-    public function count()
-    {
-        if (!$this->fetchStarted) {
-            $this->executeQuery();
-        }
-
-        return $this->statement->rowCount();
-    }
-
-    /**
-     * Fetches record at current cursor.
-     *
-     * @return AbstractTDBMObject|null
-     */
-    public function current()
-    {
-        return $this->current;
-    }
-
-    /**
-     * Returns the current result's key.
-     *
-     * @return int
-     */
-    public function key()
-    {
-        return $this->key;
-    }
-
-    /**
-     * Advances the cursor to the next result.
-     * Casts the database result into one (or several) beans.
-     */
-    public function next()
-    {
-        $row = $this->statement->fetch(\PDO::FETCH_NUM);
-        if ($row) {
-
-            // array<tablegroup, array<table, array<column, value>>>
-            $beansData = [];
-            foreach ($row as $i => $value) {
-                $columnDescriptor = $this->columnDescriptors[$i];
-                // Let's cast the value according to its type
-                $value = $columnDescriptor['type']->convertToPHPValue($value, $this->databasePlatform);
-
-                $beansData[$columnDescriptor['tableGroup']][$columnDescriptor['table']][$columnDescriptor['column']] = $value;
-            }
-
-            $reflectionClassCache = [];
-            $firstBean = true;
-            foreach ($beansData as $beanData) {
-
-                // Let's find the bean class name associated to the bean.
-
-                list($actualClassName, $mainBeanTableName) = $this->tdbmService->_getClassNameFromBeanData($beanData);
-
-                if ($this->className !== null) {
-                    $actualClassName = $this->className;
-                }
-
-                // Must we create the bean? Let's see in the cache if we have a mapping DbRow?
-                // Let's get the first object mapping a row:
-                // We do this loop only for the first table
-
-                $primaryKeys = $this->tdbmService->_getPrimaryKeysFromObjectData($mainBeanTableName, $beanData[$mainBeanTableName]);
-                $hash = $this->tdbmService->getObjectHash($primaryKeys);
-
-                if ($this->objectStorage->has($mainBeanTableName, $hash)) {
-                    $dbRow = $this->objectStorage->get($mainBeanTableName, $hash);
-                    $bean = $dbRow->getTDBMObject();
-                } else {
-                    // Let's construct the bean
-                    if (!isset($reflectionClassCache[$actualClassName])) {
-                        $reflectionClassCache[$actualClassName] = new \ReflectionClass($actualClassName);
-                    }
-                    // Let's bypass the constructor when creating the bean!
-                    $bean = $reflectionClassCache[$actualClassName]->newInstanceWithoutConstructor();
-                    $bean->_constructFromData($beanData, $this->tdbmService);
-                }
-
-                // The first bean is the one containing the main table.
-                if ($firstBean) {
-                    $firstBean = false;
-                    $this->current = $bean;
-                }
-            }
-
-            ++$this->key;
-        } else {
-            $this->current = null;
-        }
-    }
-
-    /**
-     * Moves the cursor to the beginning of the result set.
-     */
-    public function rewind()
-    {
-        $this->executeQuery();
-        $this->key = -1;
-        $this->next();
-    }
-    /**
-     * Checks if the cursor is reading a valid result.
-     *
-     * @return bool
-     */
-    public function valid()
-    {
-        return $this->current !== null;
-    }
-
-    /**
-     * Whether a offset exists.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetexists.php
-     *
-     * @param mixed $offset <p>
-     *                      An offset to check for.
-     *                      </p>
-     *
-     * @return bool true on success or false on failure.
-     *              </p>
-     *              <p>
-     *              The return value will be casted to boolean if non-boolean was returned.
-     *
-     * @since 5.0.0
-     */
-    public function offsetExists($offset)
-    {
-        throw new TDBMInvalidOperationException('You cannot access this result set via index because it was fetched in CURSOR mode. Use ARRAY_MODE instead.');
-    }
-
-    /**
-     * Offset to retrieve.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetget.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to retrieve.
-     *                      </p>
-     *
-     * @return mixed Can return all value types.
-     *
-     * @since 5.0.0
-     */
-    public function offsetGet($offset)
-    {
-        throw new TDBMInvalidOperationException('You cannot access this result set via index because it was fetched in CURSOR mode. Use ARRAY_MODE instead.');
-    }
-
-    /**
-     * Offset to set.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetset.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to assign the value to.
-     *                      </p>
-     * @param mixed $value  <p>
-     *                      The value to set.
-     *                      </p>
-     *
-     * @since 5.0.0
-     */
-    public function offsetSet($offset, $value)
-    {
-        throw new TDBMInvalidOperationException('You can set values in a TDBM result set.');
-    }
-
-    /**
-     * Offset to unset.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetunset.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to unset.
-     *                      </p>
-     *
-     * @since 5.0.0
-     */
-    public function offsetUnset($offset)
-    {
-        throw new TDBMInvalidOperationException('You can unset values in a TDBM result set.');
-    }
+	/**
+	 * @var Statement
+	 */
+	protected $statement;
+
+	protected $fetchStarted = false;
+	private $objectStorage;
+	private $className;
+
+	private $tdbmService;
+	private $magicSql;
+	private $parameters;
+	private $limit;
+	private $offset;
+	private $columnDescriptors;
+	private $magicQuery;
+
+	/**
+	 * The key of the current retrieved object.
+	 *
+	 * @var int
+	 */
+	protected $key = -1;
+
+	protected $current = null;
+
+	private $databasePlatform;
+
+	public function __construct($magicSql, array $parameters, $limit, $offset, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery)
+	{
+		$this->magicSql = $magicSql;
+		$this->objectStorage = $objectStorage;
+		$this->className = $className;
+		$this->tdbmService = $tdbmService;
+		$this->parameters = $parameters;
+		$this->limit = $limit;
+		$this->offset = $offset;
+		$this->columnDescriptors = $columnDescriptors;
+		$this->magicQuery = $magicQuery;
+		$this->databasePlatform = $this->tdbmService->getConnection()->getDatabasePlatform();
+	}
+
+	protected function executeQuery()
+	{
+		$sql = $this->magicQuery->build($this->magicSql, $this->parameters);
+		$sql = $this->tdbmService->getConnection()->getDatabasePlatform()->modifyLimitQuery($sql, $this->limit, $this->offset);
+
+		$this->statement = $this->tdbmService->getConnection()->executeQuery($sql, $this->parameters);
+
+		$this->fetchStarted = true;
+	}
+
+	/**
+	 * Counts found records (this is the number of records fetched, taking into account the LIMIT and OFFSET settings).
+	 *
+	 * @return int
+	 */
+	public function count()
+	{
+		if (!$this->fetchStarted) {
+			$this->executeQuery();
+		}
+
+		return $this->statement->rowCount();
+	}
+
+	/**
+	 * Fetches record at current cursor.
+	 *
+	 * @return AbstractTDBMObject|null
+	 */
+	public function current()
+	{
+		return $this->current;
+	}
+
+	/**
+	 * Returns the current result's key.
+	 *
+	 * @return int
+	 */
+	public function key()
+	{
+		return $this->key;
+	}
+
+	/**
+	 * Advances the cursor to the next result.
+	 * Casts the database result into one (or several) beans.
+	 */
+	public function next()
+	{
+		$row = $this->statement->fetch(\PDO::FETCH_NUM);
+		if ($row) {
+
+			// array<tablegroup, array<table, array<column, value>>>
+			$beansData = [];
+			foreach ($row as $i => $value) {
+				$columnDescriptor = $this->columnDescriptors[$i];
+				// Let's cast the value according to its type
+				$value = $columnDescriptor['type']->convertToPHPValue($value, $this->databasePlatform);
+
+				$beansData[$columnDescriptor['tableGroup']][$columnDescriptor['table']][$columnDescriptor['column']] = $value;
+			}
+
+			$reflectionClassCache = [];
+			$firstBean = true;
+			foreach ($beansData as $beanData) {
+
+				// Let's find the bean class name associated to the bean.
+
+				list($actualClassName, $mainBeanTableName) = $this->tdbmService->_getClassNameFromBeanData($beanData);
+
+				if ($this->className !== null) {
+					$actualClassName = $this->className;
+				}
+
+				// Must we create the bean? Let's see in the cache if we have a mapping DbRow?
+				// Let's get the first object mapping a row:
+				// We do this loop only for the first table
+
+				$primaryKeys = $this->tdbmService->_getPrimaryKeysFromObjectData($mainBeanTableName, $beanData[$mainBeanTableName]);
+				$hash = $this->tdbmService->getObjectHash($primaryKeys);
+
+				if ($this->objectStorage->has($mainBeanTableName, $hash)) {
+					$dbRow = $this->objectStorage->get($mainBeanTableName, $hash);
+					$bean = $dbRow->getTDBMObject();
+				} else {
+					// Let's construct the bean
+					if (!isset($reflectionClassCache[$actualClassName])) {
+						$reflectionClassCache[$actualClassName] = new \ReflectionClass($actualClassName);
+					}
+					// Let's bypass the constructor when creating the bean!
+					$bean = $reflectionClassCache[$actualClassName]->newInstanceWithoutConstructor();
+					$bean->_constructFromData($beanData, $this->tdbmService);
+				}
+
+				// The first bean is the one containing the main table.
+				if ($firstBean) {
+					$firstBean = false;
+					$this->current = $bean;
+				}
+			}
+
+			++$this->key;
+		} else {
+			$this->current = null;
+		}
+	}
+
+	/**
+	 * Moves the cursor to the beginning of the result set.
+	 */
+	public function rewind()
+	{
+		$this->executeQuery();
+		$this->key = -1;
+		$this->next();
+	}
+	/**
+	 * Checks if the cursor is reading a valid result.
+	 *
+	 * @return bool
+	 */
+	public function valid()
+	{
+		return $this->current !== null;
+	}
+
+	/**
+	 * Whether a offset exists.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetexists.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      An offset to check for.
+	 *                      </p>
+	 *
+	 * @return bool true on success or false on failure.
+	 *              </p>
+	 *              <p>
+	 *              The return value will be casted to boolean if non-boolean was returned.
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetExists($offset)
+	{
+		throw new TDBMInvalidOperationException('You cannot access this result set via index because it was fetched in CURSOR mode. Use ARRAY_MODE instead.');
+	}
+
+	/**
+	 * Offset to retrieve.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetget.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      The offset to retrieve.
+	 *                      </p>
+	 *
+	 * @return mixed Can return all value types.
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetGet($offset)
+	{
+		throw new TDBMInvalidOperationException('You cannot access this result set via index because it was fetched in CURSOR mode. Use ARRAY_MODE instead.');
+	}
+
+	/**
+	 * Offset to set.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetset.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      The offset to assign the value to.
+	 *                      </p>
+	 * @param mixed $value  <p>
+	 *                      The value to set.
+	 *                      </p>
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetSet($offset, $value)
+	{
+		throw new TDBMInvalidOperationException('You can set values in a TDBM result set.');
+	}
+
+	/**
+	 * Offset to unset.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetunset.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      The offset to unset.
+	 *                      </p>
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetUnset($offset)
+	{
+		throw new TDBMInvalidOperationException('You can unset values in a TDBM result set.');
+	}
 }

src/Mouf/Database/TDBM/TDBMObject.php

Indentation +24 added lines, -24 removed lines

@@ -33,28 +33,28 @@
  */
 class TDBMObject extends AbstractTDBMObject
 {
-    public function getProperty($var, $tableName = null)
-    {
-        return $this->get($var, $tableName);
-    }
-
-    public function setProperty($var, $value, $tableName = null)
-    {
-        $this->set($var, $value, $tableName);
-    }
-
-    /**
-     * Specify data which should be serialized to JSON.
-     *
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     *
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     *               which is a value of any type other than a resource.
-     *
-     * @since 5.4.0
-     */
-    public function jsonSerialize()
-    {
-        throw new TDBMException('Json serialization is only implemented for generated beans.');
-    }
+	public function getProperty($var, $tableName = null)
+	{
+		return $this->get($var, $tableName);
+	}
+
+	public function setProperty($var, $value, $tableName = null)
+	{
+		$this->set($var, $value, $tableName);
+	}
+
+	/**
+	 * Specify data which should be serialized to JSON.
+	 *
+	 * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+	 *
+	 * @return mixed data which can be serialized by <b>json_encode</b>,
+	 *               which is a value of any type other than a resource.
+	 *
+	 * @since 5.4.0
+	 */
+	public function jsonSerialize()
+	{
+		throw new TDBMException('Json serialization is only implemented for generated beans.');
+	}
 }

src/Mouf/Database/TDBM/AbstractTDBMObject.php

Spacing +3 added lines, -3 removed lines

@@ -186,7 +186,7 @@ 
      */
     private function checkTableName($tableName = null) {
         if ($tableName === null) {
-            if (count($this->dbRows) > 1) {
+            if (count($this->dbRows)>1) {
                 throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
             } elseif (count($this->dbRows) === 1) {
                 $tableName = array_keys($this->dbRows)[0];
@@ -213,7 +213,7 @@ 
     protected function set($var, $value, $tableName = null)
     {
         if ($tableName === null) {
-            if (count($this->dbRows) > 1) {
+            if (count($this->dbRows)>1) {
                 throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
             } elseif (count($this->dbRows) === 1) {
                 $tableName = array_keys($this->dbRows)[0];
@@ -239,7 +239,7 @@ 
     protected function setRef($foreignKeyName, AbstractTDBMObject $bean, $tableName = null)
     {
         if ($tableName === null) {
-            if (count($this->dbRows) > 1) {
+            if (count($this->dbRows)>1) {
                 throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
             } elseif (count($this->dbRows) === 1) {
                 $tableName = array_keys($this->dbRows)[0];

Indentation +486 added lines, -486 removed lines

@@ -31,495 +31,495 @@
  */
 abstract class AbstractTDBMObject implements JsonSerializable
 {
-    /**
-     * The service this object is bound to.
-     *
-     * @var TDBMService
-     */
-    protected $tdbmService;
-
-    /**
-     * An array of DbRow, indexed by table name.
-     *
-     * @var DbRow[]
-     */
-    protected $dbRows = array();
-
-    /**
-     * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
-     * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
-     * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
-     * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
-     *
-     * @var string
-     */
-    private $status;
-
-    /**
-     * Array storing beans related via many to many relationships (pivot tables).
-     *
-     * @var \SplObjectStorage[] Key: pivot table name, value: SplObjectStorage
-     */
-    private $relationships = [];
-
-    /**
-     * @var bool[] Key: pivot table name, value: whether a query was performed to load the data.
-     */
-    private $loadedRelationships = [];
-
-    /**
-     * Used with $primaryKeys when we want to retrieve an existing object
-     * and $primaryKeys=[] if we want a new object.
-     *
-     * @param string      $tableName
-     * @param array       $primaryKeys
-     * @param TDBMService $tdbmService
-     *
-     * @throws TDBMException
-     * @throws TDBMInvalidOperationException
-     */
-    public function __construct($tableName = null, array $primaryKeys = array(), TDBMService $tdbmService = null)
-    {
-        // FIXME: lazy loading should be forbidden on tables with inheritance and dynamic type assignation...
-        if (!empty($tableName)) {
-            $this->dbRows[$tableName] = new DbRow($this, $tableName, $primaryKeys, $tdbmService);
-        }
-
-        if ($tdbmService === null) {
-            $this->_setStatus(TDBMObjectStateEnum::STATE_DETACHED);
-        } else {
-            $this->_attach($tdbmService);
-            if (!empty($primaryKeys)) {
-                $this->_setStatus(TDBMObjectStateEnum::STATE_NOT_LOADED);
-            } else {
-                $this->_setStatus(TDBMObjectStateEnum::STATE_NEW);
-            }
-        }
-    }
-
-    /**
-     * Alternative constructor called when data is fetched from database via a SELECT.
-     *
-     * @param array       $beanData    array<table, array<column, value>>
-     * @param TDBMService $tdbmService
-     */
-    public function _constructFromData(array $beanData, TDBMService $tdbmService)
-    {
-        $this->tdbmService = $tdbmService;
-
-        foreach ($beanData as $table => $columns) {
-            $this->dbRows[$table] = new DbRow($this, $table, $tdbmService->_getPrimaryKeysFromObjectData($table, $columns), $tdbmService, $columns);
-        }
-
-        $this->status = TDBMObjectStateEnum::STATE_LOADED;
-    }
-
-    /**
-     * Alternative constructor called when bean is lazily loaded.
-     *
-     * @param string      $tableName
-     * @param array       $primaryKeys
-     * @param TDBMService $tdbmService
-     */
-    public function _constructLazy($tableName, array $primaryKeys, TDBMService $tdbmService)
-    {
-        $this->tdbmService = $tdbmService;
-
-        $this->dbRows[$tableName] = new DbRow($this, $tableName, $primaryKeys, $tdbmService);
-
-        $this->status = TDBMObjectStateEnum::STATE_NOT_LOADED;
-    }
-
-    public function _attach(TDBMService $tdbmService)
-    {
-        if ($this->status !== TDBMObjectStateEnum::STATE_DETACHED) {
-            throw new TDBMInvalidOperationException('Cannot attach an object that is already attached to TDBM.');
-        }
-        $this->tdbmService = $tdbmService;
-
-        // If we attach this object, we must work to make sure the tables are in ascending order (from low level to top level)
-        $tableNames = array_keys($this->dbRows);
-        $tableNames = $this->tdbmService->_getLinkBetweenInheritedTables($tableNames);
-        $tableNames = array_reverse($tableNames);
-
-        $newDbRows = [];
-
-        foreach ($tableNames as $table) {
-            if (!isset($this->dbRows[$table])) {
-                $this->registerTable($table);
-            }
-            $newDbRows[$table] = $this->dbRows[$table];
-        }
-        $this->dbRows = $newDbRows;
-
-        $this->status = TDBMObjectStateEnum::STATE_NEW;
-        foreach ($this->dbRows as $dbRow) {
-            $dbRow->_attach($tdbmService);
-        }
-    }
-
-    /**
-     * Sets the state of the TDBM Object
-     * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
-     * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
-     * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
-     * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
-     *
-     * @param string $state
-     */
-    public function _setStatus($state)
-    {
-        $this->status = $state;
-
-        // TODO: we might ignore the loaded => dirty state here! dirty status comes from the db_row itself.
-        foreach ($this->dbRows as $dbRow) {
-            $dbRow->_setStatus($state);
-        }
-    }
-
-    /**
-     * Checks that $tableName is ok, or returns the only possible table name if "$tableName = null"
-     * or throws an error.
-     *
-     * @param string $tableName
-     *
-     * @return string
-     */
-    private function checkTableName($tableName = null)
-    {
-        if ($tableName === null) {
-            if (count($this->dbRows) > 1) {
-                throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
-            } elseif (count($this->dbRows) === 1) {
-                $tableName = array_keys($this->dbRows)[0];
-            }
-        }
-
-        if (!isset($this->dbRows[$tableName])) {
-            if (count($this->dbRows[$tableName] === 0)) {
-                throw new TDBMException('Object is not yet bound to any table.');
-            } else {
-                throw new TDBMException('Unknown table "'.$tableName.'"" in object.');
-            }
-        }
-
-        return $tableName;
-    }
-
-    protected function get($var, $tableName = null)
-    {
-        $tableName = $this->checkTableName($tableName);
-
-        return $this->dbRows[$tableName]->get($var);
-    }
-
-    protected function set($var, $value, $tableName = null)
-    {
-        if ($tableName === null) {
-            if (count($this->dbRows) > 1) {
-                throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
-            } elseif (count($this->dbRows) === 1) {
-                $tableName = array_keys($this->dbRows)[0];
-            } else {
-                throw new TDBMException('Please specify a table for this object.');
-            }
-        }
-
-        if (!isset($this->dbRows[$tableName])) {
-            $this->registerTable($tableName);
-        }
-
-        $this->dbRows[$tableName]->set($var, $value);
-        if ($this->dbRows[$tableName]->_getStatus() === TDBMObjectStateEnum::STATE_DIRTY) {
-            $this->status = TDBMObjectStateEnum::STATE_DIRTY;
-        }
-    }
-
-    /**
-     * @param string             $foreignKeyName
-     * @param AbstractTDBMObject $bean
-     */
-    protected function setRef($foreignKeyName, AbstractTDBMObject $bean, $tableName = null)
-    {
-        if ($tableName === null) {
-            if (count($this->dbRows) > 1) {
-                throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
-            } elseif (count($this->dbRows) === 1) {
-                $tableName = array_keys($this->dbRows)[0];
-            } else {
-                throw new TDBMException('Please specify a table for this object.');
-            }
-        }
-
-        if (!isset($this->dbRows[$tableName])) {
-            $this->registerTable($tableName);
-        }
-
-        $this->dbRows[$tableName]->setRef($foreignKeyName, $bean);
-        if ($this->dbRows[$tableName]->_getStatus() === TDBMObjectStateEnum::STATE_DIRTY) {
-            $this->status = TDBMObjectStateEnum::STATE_DIRTY;
-        }
-    }
-
-    /**
-     * @param string $foreignKeyName A unique name for this reference
-     *
-     * @return AbstractTDBMObject|null
-     */
-    protected function getRef($foreignKeyName, $tableName = null)
-    {
-        $tableName = $this->checkTableName($tableName);
-
-        return $this->dbRows[$tableName]->getRef($foreignKeyName);
-    }
-
-    /**
-     * Adds a many to many relationship to this bean.
-     *
-     * @param string             $pivotTableName
-     * @param AbstractTDBMObject $remoteBean
-     */
-    protected function addRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
-    {
-        $this->setRelationship($pivotTableName, $remoteBean, 'new');
-    }
-
-    /**
-     * Returns true if there is a relationship to this bean.
-     *
-     * @param string             $pivotTableName
-     * @param AbstractTDBMObject $remoteBean
-     *
-     * @return bool
-     */
-    protected function hasRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
-    {
-        $storage = $this->retrieveRelationshipsStorage($pivotTableName);
-
-        if ($storage->contains($remoteBean)) {
-            if ($storage[$remoteBean]['status'] !== 'delete') {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Internal TDBM method. Removes a many to many relationship from this bean.
-     *
-     * @param string             $pivotTableName
-     * @param AbstractTDBMObject $remoteBean
-     */
-    public function _removeRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
-    {
-        if (isset($this->relationships[$pivotTableName][$remoteBean]) && $this->relationships[$pivotTableName][$remoteBean]['status'] === 'new') {
-            unset($this->relationships[$pivotTableName][$remoteBean]);
-            unset($remoteBean->relationships[$pivotTableName][$this]);
-        } else {
-            $this->setRelationship($pivotTableName, $remoteBean, 'delete');
-        }
-    }
-
-    /**
-     * Returns the list of objects linked to this bean via $pivotTableName.
-     *
-     * @param $pivotTableName
-     *
-     * @return \SplObjectStorage
-     */
-    private function retrieveRelationshipsStorage($pivotTableName)
-    {
-        $storage = $this->getRelationshipStorage($pivotTableName);
-        if ($this->status === TDBMObjectStateEnum::STATE_DETACHED || $this->status === TDBMObjectStateEnum::STATE_NEW || isset($this->loadedRelationships[$pivotTableName]) && $this->loadedRelationships[$pivotTableName]) {
-            return $storage;
-        }
-
-        $beans = $this->tdbmService->_getRelatedBeans($pivotTableName, $this);
-        $this->loadedRelationships[$pivotTableName] = true;
-
-        foreach ($beans as $bean) {
-            if (isset($storage[$bean])) {
-                $oldStatus = $storage[$bean]['status'];
-                if ($oldStatus === 'delete') {
-                    // Keep deleted things deleted
-                    continue;
-                }
-            }
-            $this->setRelationship($pivotTableName, $bean, 'loaded');
-        }
-
-        return $storage;
-    }
-
-    /**
-     * Internal TDBM method. Returns the list of objects linked to this bean via $pivotTableName.
-     *
-     * @param $pivotTableName
-     *
-     * @return AbstractTDBMObject[]
-     */
-    public function _getRelationships($pivotTableName)
-    {
-        return $this->relationshipStorageToArray($this->retrieveRelationshipsStorage($pivotTableName));
-    }
-
-    private function relationshipStorageToArray(\SplObjectStorage $storage)
-    {
-        $beans = [];
-        foreach ($storage as $bean) {
-            $statusArr = $storage[$bean];
-            if ($statusArr['status'] !== 'delete') {
-                $beans[] = $bean;
-            }
-        }
-
-        return $beans;
-    }
-
-    /**
-     * Declares a relationship between.
-     *
-     * @param string             $pivotTableName
-     * @param AbstractTDBMObject $remoteBean
-     * @param string             $status
-     */
-    private function setRelationship($pivotTableName, AbstractTDBMObject $remoteBean, $status)
-    {
-        $storage = $this->getRelationshipStorage($pivotTableName);
-        $storage->attach($remoteBean, ['status' => $status, 'reverse' => false]);
-        if ($this->status === TDBMObjectStateEnum::STATE_LOADED) {
-            $this->_setStatus(TDBMObjectStateEnum::STATE_DIRTY);
-        }
-
-        $remoteStorage = $remoteBean->getRelationshipStorage($pivotTableName);
-        $remoteStorage->attach($this, ['status' => $status, 'reverse' => true]);
-    }
-
-    /**
-     * Returns the SplObjectStorage associated to this relationship (creates it if it does not exists).
-     *
-     * @param $pivotTableName
-     *
-     * @return \SplObjectStorage
-     */
-    private function getRelationshipStorage($pivotTableName)
-    {
-        if (isset($this->relationships[$pivotTableName])) {
-            $storage = $this->relationships[$pivotTableName];
-        } else {
-            $storage = new \SplObjectStorage();
-            $this->relationships[$pivotTableName] = $storage;
-        }
-
-        return $storage;
-    }
-
-    /**
-     * Reverts any changes made to the object and resumes it to its DB state.
-     * This can only be called on objects that come from database and that have not been deleted.
-     * Otherwise, this will throw an exception.
-     *
-     * @throws TDBMException
-     */
-    public function discardChanges()
-    {
-        if ($this->status === TDBMObjectStateEnum::STATE_NEW || $this->status === TDBMObjectStateEnum::STATE_DETACHED) {
-            throw new TDBMException("You cannot call discardChanges() on an object that has been created with the 'new' keyword and that has not yet been saved.");
-        }
-
-        if ($this->status === TDBMObjectStateEnum::STATE_DELETED) {
-            throw new TDBMException('You cannot call discardChanges() on an object that has been deleted.');
-        }
-
-        $this->_setStatus(TDBMObjectStateEnum::STATE_NOT_LOADED);
-    }
-
-    /**
-     * Method used internally by TDBM. You should not use it directly.
-     * This method returns the status of the TDBMObject.
-     * This is one of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
-     * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
-     * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
-     * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
-     *
-     * @return string
-     */
-    public function _getStatus()
-    {
-        return $this->status;
-    }
-
-    /**
-     * Override the native php clone function for TDBMObjects.
-     */
-    public function __clone()
-    {
-        // Let's clone the many to many relationships
-        if ($this->status === TDBMObjectStateEnum::STATE_DETACHED) {
-            $pivotTableList = array_keys($this->relationships);
-        } else {
-            $pivotTableList = $this->tdbmService->_getPivotTablesLinkedToBean($this);
-        }
-
-        foreach ($pivotTableList as $pivotTable) {
-            $storage = $this->retrieveRelationshipsStorage($pivotTable);
-
-            // Let's duplicate the reverse side of the relationship // This is useless: already done by "retrieveRelationshipsStorage"!!!
-            /*foreach ($storage as $remoteBean) {
+	/**
+	 * The service this object is bound to.
+	 *
+	 * @var TDBMService
+	 */
+	protected $tdbmService;
+
+	/**
+	 * An array of DbRow, indexed by table name.
+	 *
+	 * @var DbRow[]
+	 */
+	protected $dbRows = array();
+
+	/**
+	 * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
+	 * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
+	 * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
+	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
+	 *
+	 * @var string
+	 */
+	private $status;
+
+	/**
+	 * Array storing beans related via many to many relationships (pivot tables).
+	 *
+	 * @var \SplObjectStorage[] Key: pivot table name, value: SplObjectStorage
+	 */
+	private $relationships = [];
+
+	/**
+	 * @var bool[] Key: pivot table name, value: whether a query was performed to load the data.
+	 */
+	private $loadedRelationships = [];
+
+	/**
+	 * Used with $primaryKeys when we want to retrieve an existing object
+	 * and $primaryKeys=[] if we want a new object.
+	 *
+	 * @param string      $tableName
+	 * @param array       $primaryKeys
+	 * @param TDBMService $tdbmService
+	 *
+	 * @throws TDBMException
+	 * @throws TDBMInvalidOperationException
+	 */
+	public function __construct($tableName = null, array $primaryKeys = array(), TDBMService $tdbmService = null)
+	{
+		// FIXME: lazy loading should be forbidden on tables with inheritance and dynamic type assignation...
+		if (!empty($tableName)) {
+			$this->dbRows[$tableName] = new DbRow($this, $tableName, $primaryKeys, $tdbmService);
+		}
+
+		if ($tdbmService === null) {
+			$this->_setStatus(TDBMObjectStateEnum::STATE_DETACHED);
+		} else {
+			$this->_attach($tdbmService);
+			if (!empty($primaryKeys)) {
+				$this->_setStatus(TDBMObjectStateEnum::STATE_NOT_LOADED);
+			} else {
+				$this->_setStatus(TDBMObjectStateEnum::STATE_NEW);
+			}
+		}
+	}
+
+	/**
+	 * Alternative constructor called when data is fetched from database via a SELECT.
+	 *
+	 * @param array       $beanData    array<table, array<column, value>>
+	 * @param TDBMService $tdbmService
+	 */
+	public function _constructFromData(array $beanData, TDBMService $tdbmService)
+	{
+		$this->tdbmService = $tdbmService;
+
+		foreach ($beanData as $table => $columns) {
+			$this->dbRows[$table] = new DbRow($this, $table, $tdbmService->_getPrimaryKeysFromObjectData($table, $columns), $tdbmService, $columns);
+		}
+
+		$this->status = TDBMObjectStateEnum::STATE_LOADED;
+	}
+
+	/**
+	 * Alternative constructor called when bean is lazily loaded.
+	 *
+	 * @param string      $tableName
+	 * @param array       $primaryKeys
+	 * @param TDBMService $tdbmService
+	 */
+	public function _constructLazy($tableName, array $primaryKeys, TDBMService $tdbmService)
+	{
+		$this->tdbmService = $tdbmService;
+
+		$this->dbRows[$tableName] = new DbRow($this, $tableName, $primaryKeys, $tdbmService);
+
+		$this->status = TDBMObjectStateEnum::STATE_NOT_LOADED;
+	}
+
+	public function _attach(TDBMService $tdbmService)
+	{
+		if ($this->status !== TDBMObjectStateEnum::STATE_DETACHED) {
+			throw new TDBMInvalidOperationException('Cannot attach an object that is already attached to TDBM.');
+		}
+		$this->tdbmService = $tdbmService;
+
+		// If we attach this object, we must work to make sure the tables are in ascending order (from low level to top level)
+		$tableNames = array_keys($this->dbRows);
+		$tableNames = $this->tdbmService->_getLinkBetweenInheritedTables($tableNames);
+		$tableNames = array_reverse($tableNames);
+
+		$newDbRows = [];
+
+		foreach ($tableNames as $table) {
+			if (!isset($this->dbRows[$table])) {
+				$this->registerTable($table);
+			}
+			$newDbRows[$table] = $this->dbRows[$table];
+		}
+		$this->dbRows = $newDbRows;
+
+		$this->status = TDBMObjectStateEnum::STATE_NEW;
+		foreach ($this->dbRows as $dbRow) {
+			$dbRow->_attach($tdbmService);
+		}
+	}
+
+	/**
+	 * Sets the state of the TDBM Object
+	 * One of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
+	 * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
+	 * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
+	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
+	 *
+	 * @param string $state
+	 */
+	public function _setStatus($state)
+	{
+		$this->status = $state;
+
+		// TODO: we might ignore the loaded => dirty state here! dirty status comes from the db_row itself.
+		foreach ($this->dbRows as $dbRow) {
+			$dbRow->_setStatus($state);
+		}
+	}
+
+	/**
+	 * Checks that $tableName is ok, or returns the only possible table name if "$tableName = null"
+	 * or throws an error.
+	 *
+	 * @param string $tableName
+	 *
+	 * @return string
+	 */
+	private function checkTableName($tableName = null)
+	{
+		if ($tableName === null) {
+			if (count($this->dbRows) > 1) {
+				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
+			} elseif (count($this->dbRows) === 1) {
+				$tableName = array_keys($this->dbRows)[0];
+			}
+		}
+
+		if (!isset($this->dbRows[$tableName])) {
+			if (count($this->dbRows[$tableName] === 0)) {
+				throw new TDBMException('Object is not yet bound to any table.');
+			} else {
+				throw new TDBMException('Unknown table "'.$tableName.'"" in object.');
+			}
+		}
+
+		return $tableName;
+	}
+
+	protected function get($var, $tableName = null)
+	{
+		$tableName = $this->checkTableName($tableName);
+
+		return $this->dbRows[$tableName]->get($var);
+	}
+
+	protected function set($var, $value, $tableName = null)
+	{
+		if ($tableName === null) {
+			if (count($this->dbRows) > 1) {
+				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
+			} elseif (count($this->dbRows) === 1) {
+				$tableName = array_keys($this->dbRows)[0];
+			} else {
+				throw new TDBMException('Please specify a table for this object.');
+			}
+		}
+
+		if (!isset($this->dbRows[$tableName])) {
+			$this->registerTable($tableName);
+		}
+
+		$this->dbRows[$tableName]->set($var, $value);
+		if ($this->dbRows[$tableName]->_getStatus() === TDBMObjectStateEnum::STATE_DIRTY) {
+			$this->status = TDBMObjectStateEnum::STATE_DIRTY;
+		}
+	}
+
+	/**
+	 * @param string             $foreignKeyName
+	 * @param AbstractTDBMObject $bean
+	 */
+	protected function setRef($foreignKeyName, AbstractTDBMObject $bean, $tableName = null)
+	{
+		if ($tableName === null) {
+			if (count($this->dbRows) > 1) {
+				throw new TDBMException('This object is based on several tables. You must specify which table you are retrieving data from.');
+			} elseif (count($this->dbRows) === 1) {
+				$tableName = array_keys($this->dbRows)[0];
+			} else {
+				throw new TDBMException('Please specify a table for this object.');
+			}
+		}
+
+		if (!isset($this->dbRows[$tableName])) {
+			$this->registerTable($tableName);
+		}
+
+		$this->dbRows[$tableName]->setRef($foreignKeyName, $bean);
+		if ($this->dbRows[$tableName]->_getStatus() === TDBMObjectStateEnum::STATE_DIRTY) {
+			$this->status = TDBMObjectStateEnum::STATE_DIRTY;
+		}
+	}
+
+	/**
+	 * @param string $foreignKeyName A unique name for this reference
+	 *
+	 * @return AbstractTDBMObject|null
+	 */
+	protected function getRef($foreignKeyName, $tableName = null)
+	{
+		$tableName = $this->checkTableName($tableName);
+
+		return $this->dbRows[$tableName]->getRef($foreignKeyName);
+	}
+
+	/**
+	 * Adds a many to many relationship to this bean.
+	 *
+	 * @param string             $pivotTableName
+	 * @param AbstractTDBMObject $remoteBean
+	 */
+	protected function addRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
+	{
+		$this->setRelationship($pivotTableName, $remoteBean, 'new');
+	}
+
+	/**
+	 * Returns true if there is a relationship to this bean.
+	 *
+	 * @param string             $pivotTableName
+	 * @param AbstractTDBMObject $remoteBean
+	 *
+	 * @return bool
+	 */
+	protected function hasRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
+	{
+		$storage = $this->retrieveRelationshipsStorage($pivotTableName);
+
+		if ($storage->contains($remoteBean)) {
+			if ($storage[$remoteBean]['status'] !== 'delete') {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Internal TDBM method. Removes a many to many relationship from this bean.
+	 *
+	 * @param string             $pivotTableName
+	 * @param AbstractTDBMObject $remoteBean
+	 */
+	public function _removeRelationship($pivotTableName, AbstractTDBMObject $remoteBean)
+	{
+		if (isset($this->relationships[$pivotTableName][$remoteBean]) && $this->relationships[$pivotTableName][$remoteBean]['status'] === 'new') {
+			unset($this->relationships[$pivotTableName][$remoteBean]);
+			unset($remoteBean->relationships[$pivotTableName][$this]);
+		} else {
+			$this->setRelationship($pivotTableName, $remoteBean, 'delete');
+		}
+	}
+
+	/**
+	 * Returns the list of objects linked to this bean via $pivotTableName.
+	 *
+	 * @param $pivotTableName
+	 *
+	 * @return \SplObjectStorage
+	 */
+	private function retrieveRelationshipsStorage($pivotTableName)
+	{
+		$storage = $this->getRelationshipStorage($pivotTableName);
+		if ($this->status === TDBMObjectStateEnum::STATE_DETACHED || $this->status === TDBMObjectStateEnum::STATE_NEW || isset($this->loadedRelationships[$pivotTableName]) && $this->loadedRelationships[$pivotTableName]) {
+			return $storage;
+		}
+
+		$beans = $this->tdbmService->_getRelatedBeans($pivotTableName, $this);
+		$this->loadedRelationships[$pivotTableName] = true;
+
+		foreach ($beans as $bean) {
+			if (isset($storage[$bean])) {
+				$oldStatus = $storage[$bean]['status'];
+				if ($oldStatus === 'delete') {
+					// Keep deleted things deleted
+					continue;
+				}
+			}
+			$this->setRelationship($pivotTableName, $bean, 'loaded');
+		}
+
+		return $storage;
+	}
+
+	/**
+	 * Internal TDBM method. Returns the list of objects linked to this bean via $pivotTableName.
+	 *
+	 * @param $pivotTableName
+	 *
+	 * @return AbstractTDBMObject[]
+	 */
+	public function _getRelationships($pivotTableName)
+	{
+		return $this->relationshipStorageToArray($this->retrieveRelationshipsStorage($pivotTableName));
+	}
+
+	private function relationshipStorageToArray(\SplObjectStorage $storage)
+	{
+		$beans = [];
+		foreach ($storage as $bean) {
+			$statusArr = $storage[$bean];
+			if ($statusArr['status'] !== 'delete') {
+				$beans[] = $bean;
+			}
+		}
+
+		return $beans;
+	}
+
+	/**
+	 * Declares a relationship between.
+	 *
+	 * @param string             $pivotTableName
+	 * @param AbstractTDBMObject $remoteBean
+	 * @param string             $status
+	 */
+	private function setRelationship($pivotTableName, AbstractTDBMObject $remoteBean, $status)
+	{
+		$storage = $this->getRelationshipStorage($pivotTableName);
+		$storage->attach($remoteBean, ['status' => $status, 'reverse' => false]);
+		if ($this->status === TDBMObjectStateEnum::STATE_LOADED) {
+			$this->_setStatus(TDBMObjectStateEnum::STATE_DIRTY);
+		}
+
+		$remoteStorage = $remoteBean->getRelationshipStorage($pivotTableName);
+		$remoteStorage->attach($this, ['status' => $status, 'reverse' => true]);
+	}
+
+	/**
+	 * Returns the SplObjectStorage associated to this relationship (creates it if it does not exists).
+	 *
+	 * @param $pivotTableName
+	 *
+	 * @return \SplObjectStorage
+	 */
+	private function getRelationshipStorage($pivotTableName)
+	{
+		if (isset($this->relationships[$pivotTableName])) {
+			$storage = $this->relationships[$pivotTableName];
+		} else {
+			$storage = new \SplObjectStorage();
+			$this->relationships[$pivotTableName] = $storage;
+		}
+
+		return $storage;
+	}
+
+	/**
+	 * Reverts any changes made to the object and resumes it to its DB state.
+	 * This can only be called on objects that come from database and that have not been deleted.
+	 * Otherwise, this will throw an exception.
+	 *
+	 * @throws TDBMException
+	 */
+	public function discardChanges()
+	{
+		if ($this->status === TDBMObjectStateEnum::STATE_NEW || $this->status === TDBMObjectStateEnum::STATE_DETACHED) {
+			throw new TDBMException("You cannot call discardChanges() on an object that has been created with the 'new' keyword and that has not yet been saved.");
+		}
+
+		if ($this->status === TDBMObjectStateEnum::STATE_DELETED) {
+			throw new TDBMException('You cannot call discardChanges() on an object that has been deleted.');
+		}
+
+		$this->_setStatus(TDBMObjectStateEnum::STATE_NOT_LOADED);
+	}
+
+	/**
+	 * Method used internally by TDBM. You should not use it directly.
+	 * This method returns the status of the TDBMObject.
+	 * This is one of TDBMObjectStateEnum::STATE_NEW, TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DELETED.
+	 * $status = TDBMObjectStateEnum::STATE_NEW when a new object is created with DBMObject:getNewObject.
+	 * $status = TDBMObjectStateEnum::STATE_NOT_LOADED when the object has been retrieved with getObject but when no data has been accessed in it yet.
+	 * $status = TDBMObjectStateEnum::STATE_LOADED when the object is cached in memory.
+	 *
+	 * @return string
+	 */
+	public function _getStatus()
+	{
+		return $this->status;
+	}
+
+	/**
+	 * Override the native php clone function for TDBMObjects.
+	 */
+	public function __clone()
+	{
+		// Let's clone the many to many relationships
+		if ($this->status === TDBMObjectStateEnum::STATE_DETACHED) {
+			$pivotTableList = array_keys($this->relationships);
+		} else {
+			$pivotTableList = $this->tdbmService->_getPivotTablesLinkedToBean($this);
+		}
+
+		foreach ($pivotTableList as $pivotTable) {
+			$storage = $this->retrieveRelationshipsStorage($pivotTable);
+
+			// Let's duplicate the reverse side of the relationship // This is useless: already done by "retrieveRelationshipsStorage"!!!
+			/*foreach ($storage as $remoteBean) {
                 $metadata = $storage[$remoteBean];
 
                 $remoteStorage = $remoteBean->getRelationshipStorage($pivotTable);
                 $remoteStorage->attach($this, ['status' => $metadata['status'], 'reverse' => !$metadata['reverse']]);
             }*/
-        }
-
-        // Let's clone each row
-        foreach ($this->dbRows as $key => &$dbRow) {
-            $dbRow = clone $dbRow;
-            $dbRow->setTDBMObject($this);
-        }
-
-        // Let's set the status to new (to enter the save function)
-        $this->status = TDBMObjectStateEnum::STATE_DETACHED;
-    }
-
-    /**
-     * Returns raw database rows.
-     *
-     * @return DbRow[] Key: table name, Value: DbRow object
-     */
-    public function _getDbRows()
-    {
-        return $this->dbRows;
-    }
-
-    private function registerTable($tableName)
-    {
-        $dbRow = new DbRow($this, $tableName);
-
-        if (in_array($this->status, [TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DIRTY])) {
-            // Let's get the primary key for the new table
-            $anotherDbRow = array_values($this->dbRows)[0];
-            /* @var $anotherDbRow DbRow */
-            $indexedPrimaryKeys = array_values($anotherDbRow->_getPrimaryKeys());
-            $primaryKeys = $this->tdbmService->_getPrimaryKeysFromIndexedPrimaryKeys($tableName, $indexedPrimaryKeys);
-            $dbRow->_setPrimaryKeys($primaryKeys);
-        }
-
-        $dbRow->_setStatus($this->status);
-
-        $this->dbRows[$tableName] = $dbRow;
-        // TODO: look at status (if not new)=> get primary key from tdbmservice
-    }
-
-    /**
-     * Internal function: return the list of relationships.
-     *
-     * @return \SplObjectStorage[]
-     */
-    public function _getCachedRelationships()
-    {
-        return $this->relationships;
-    }
+		}
+
+		// Let's clone each row
+		foreach ($this->dbRows as $key => &$dbRow) {
+			$dbRow = clone $dbRow;
+			$dbRow->setTDBMObject($this);
+		}
+
+		// Let's set the status to new (to enter the save function)
+		$this->status = TDBMObjectStateEnum::STATE_DETACHED;
+	}
+
+	/**
+	 * Returns raw database rows.
+	 *
+	 * @return DbRow[] Key: table name, Value: DbRow object
+	 */
+	public function _getDbRows()
+	{
+		return $this->dbRows;
+	}
+
+	private function registerTable($tableName)
+	{
+		$dbRow = new DbRow($this, $tableName);
+
+		if (in_array($this->status, [TDBMObjectStateEnum::STATE_NOT_LOADED, TDBMObjectStateEnum::STATE_LOADED, TDBMObjectStateEnum::STATE_DIRTY])) {
+			// Let's get the primary key for the new table
+			$anotherDbRow = array_values($this->dbRows)[0];
+			/* @var $anotherDbRow DbRow */
+			$indexedPrimaryKeys = array_values($anotherDbRow->_getPrimaryKeys());
+			$primaryKeys = $this->tdbmService->_getPrimaryKeysFromIndexedPrimaryKeys($tableName, $indexedPrimaryKeys);
+			$dbRow->_setPrimaryKeys($primaryKeys);
+		}
+
+		$dbRow->_setStatus($this->status);
+
+		$this->dbRows[$tableName] = $dbRow;
+		// TODO: look at status (if not new)=> get primary key from tdbmservice
+	}
+
+	/**
+	 * Internal function: return the list of relationships.
+	 *
+	 * @return \SplObjectStorage[]
+	 */
+	public function _getCachedRelationships()
+	{
+		return $this->relationships;
+	}
 }

src/Mouf/Database/TDBM/Utils/ScalarBeanPropertyDescriptor.php

Indentation +138 added lines, -138 removed lines

@@ -11,98 +11,98 @@ 
  */
 class ScalarBeanPropertyDescriptor extends AbstractBeanPropertyDescriptor
 {
-    /**
-     * @var Column
-     */
-    private $column;
-
-    public function __construct(Table $table, Column $column)
-    {
-        parent::__construct($table);
-        $this->table = $table;
-        $this->column = $column;
-    }
-
-    /**
-     * Returns the foreign-key the column is part of, if any. null otherwise.
-     *
-     * @return ForeignKeyConstraint|null
-     */
-    public function getForeignKey()
-    {
-        return false;
-    }
-
-    /**
-     * Returns the param annotation for this property (useful for constructor).
-     *
-     * @return string
-     */
-    public function getParamAnnotation()
-    {
-        $className = $this->getClassName();
-        $paramType = $className ?: TDBMDaoGenerator::dbalTypeToPhpType($this->column->getType());
-
-        $str = '     * @param %s %s';
-
-        return sprintf($str, $paramType, $this->getVariableName());
-    }
-
-    public function getUpperCamelCaseName()
-    {
-        return TDBMDaoGenerator::toCamelCase($this->column->getName());
-    }
-
-    /**
-     * Returns the name of the class linked to this property or null if this is not a foreign key.
-     *
-     * @return null|string
-     */
-    public function getClassName()
-    {
-        return;
-    }
-
-    /**
-     * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
-     *
-     * @return bool
-     */
-    public function isCompulsory()
-    {
-        return $this->column->getNotnull() && !$this->column->getAutoincrement();
-    }
-
-    /**
-     * Returns true if the property is the primary key.
-     *
-     * @return bool
-     */
-    public function isPrimaryKey()
-    {
-        return in_array($this->column->getName(), $this->table->getPrimaryKeyColumns());
-    }
-
-    /**
-     * Returns the PHP code for getters and setters.
-     *
-     * @return string
-     */
-    public function getGetterSetterCode()
-    {
-        $type = $this->column->getType();
-        $normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type);
-
-        $columnGetterName = $this->getGetterName();
-        $columnSetterName = $this->getSetterName();
-
-        if ($normalizedType == '\\DateTimeInterface') {
-            $castTo = '\\DateTimeInterface ';
-        } else {
-            $castTo = '';
-        }
-
-        $getterAndSetterCode = '    /**
+	/**
+	 * @var Column
+	 */
+	private $column;
+
+	public function __construct(Table $table, Column $column)
+	{
+		parent::__construct($table);
+		$this->table = $table;
+		$this->column = $column;
+	}
+
+	/**
+	 * Returns the foreign-key the column is part of, if any. null otherwise.
+	 *
+	 * @return ForeignKeyConstraint|null
+	 */
+	public function getForeignKey()
+	{
+		return false;
+	}
+
+	/**
+	 * Returns the param annotation for this property (useful for constructor).
+	 *
+	 * @return string
+	 */
+	public function getParamAnnotation()
+	{
+		$className = $this->getClassName();
+		$paramType = $className ?: TDBMDaoGenerator::dbalTypeToPhpType($this->column->getType());
+
+		$str = '     * @param %s %s';
+
+		return sprintf($str, $paramType, $this->getVariableName());
+	}
+
+	public function getUpperCamelCaseName()
+	{
+		return TDBMDaoGenerator::toCamelCase($this->column->getName());
+	}
+
+	/**
+	 * Returns the name of the class linked to this property or null if this is not a foreign key.
+	 *
+	 * @return null|string
+	 */
+	public function getClassName()
+	{
+		return;
+	}
+
+	/**
+	 * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
+	 *
+	 * @return bool
+	 */
+	public function isCompulsory()
+	{
+		return $this->column->getNotnull() && !$this->column->getAutoincrement();
+	}
+
+	/**
+	 * Returns true if the property is the primary key.
+	 *
+	 * @return bool
+	 */
+	public function isPrimaryKey()
+	{
+		return in_array($this->column->getName(), $this->table->getPrimaryKeyColumns());
+	}
+
+	/**
+	 * Returns the PHP code for getters and setters.
+	 *
+	 * @return string
+	 */
+	public function getGetterSetterCode()
+	{
+		$type = $this->column->getType();
+		$normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type);
+
+		$columnGetterName = $this->getGetterName();
+		$columnSetterName = $this->getSetterName();
+
+		if ($normalizedType == '\\DateTimeInterface') {
+			$castTo = '\\DateTimeInterface ';
+		} else {
+			$castTo = '';
+		}
+
+		$getterAndSetterCode = '    /**
      * The getter for the "%s" column.
      *
      * @return %s
@@ -122,50 +122,50 @@ 
 
 ';
 
-        return sprintf($getterAndSetterCode,
-            // Getter
-            $this->column->getName(),
-            $normalizedType,
-            $columnGetterName,
-            var_export($this->column->getName(), true),
-            var_export($this->table->getName(), true),
-            // Setter
-            $this->column->getName(),
-            $normalizedType,
-            $this->column->getName(),
-            $columnSetterName,
-            $castTo,
-            $this->column->getName(),
-            var_export($this->column->getName(), true),
-            $this->column->getName(),
-            var_export($this->table->getName(), true)
-        );
-    }
-
-    /**
-     * Returns the part of code useful when doing json serialization.
-     *
-     * @return string
-     */
-    public function getJsonSerializeCode()
-    {
-        $type = $this->column->getType();
-        $normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type);
-
-        if ($normalizedType == '\\DateTimeInterface') {
-            return '        $array['.var_export($this->getLowerCamelCaseName(), true).'] = $this->'.$this->getGetterName()."()->format('c');\n";
-        } else {
-            return '        $array['.var_export($this->getLowerCamelCaseName(), true).'] = $this->'.$this->getGetterName()."();\n";
-        }
-    }
-
-    /**
-     * Returns the column name.
-     *
-     * @return string
-     */
-    public function getColumnName()
-    {
-        return $this->column->getName();
-    }
+		return sprintf($getterAndSetterCode,
+			// Getter
+			$this->column->getName(),
+			$normalizedType,
+			$columnGetterName,
+			var_export($this->column->getName(), true),
+			var_export($this->table->getName(), true),
+			// Setter
+			$this->column->getName(),
+			$normalizedType,
+			$this->column->getName(),
+			$columnSetterName,
+			$castTo,
+			$this->column->getName(),
+			var_export($this->column->getName(), true),
+			$this->column->getName(),
+			var_export($this->table->getName(), true)
+		);
+	}
+
+	/**
+	 * Returns the part of code useful when doing json serialization.
+	 *
+	 * @return string
+	 */
+	public function getJsonSerializeCode()
+	{
+		$type = $this->column->getType();
+		$normalizedType = TDBMDaoGenerator::dbalTypeToPhpType($type);
+
+		if ($normalizedType == '\\DateTimeInterface') {
+			return '        $array['.var_export($this->getLowerCamelCaseName(), true).'] = $this->'.$this->getGetterName()."()->format('c');\n";
+		} else {
+			return '        $array['.var_export($this->getLowerCamelCaseName(), true).'] = $this->'.$this->getGetterName()."();\n";
+		}
+	}
+
+	/**
+	 * Returns the column name.
+	 *
+	 * @return string
+	 */
+	public function getColumnName()
+	{
+		return $this->column->getName();
+	}
 }

src/Mouf/Database/TDBM/Utils/TDBMDaoGenerator.php

Spacing +5 added lines, -5 removed lines

@@ -77,11 +77,11 @@ 
 
         // Remove all beans and daos from junction tables
         $junctionTables = $this->schemaAnalyzer->detectJunctionTables();
-        $junctionTableNames = array_map(function (Table $table) {
+        $junctionTableNames = array_map(function(Table $table) {
             return $table->getName();
         }, $junctionTables);
 
-        $tableList = array_filter($tableList, function (Table $table) use ($junctionTableNames) {
+        $tableList = array_filter($tableList, function(Table $table) use ($junctionTableNames) {
             return !in_array($table->getName(), $junctionTableNames);
         });
 
@@ -94,7 +94,7 @@ 
         // Ok, let's return the list of all tables.
         // These will be used by the calling script to create Mouf instances.
 
-        return array_map(function (Table $table) { return $table->getName(); }, $tableList);
+        return array_map(function(Table $table) { return $table->getName(); }, $tableList);
     }
 
     /**
@@ -287,7 +287,7 @@ 
         $usedBeans[] = $beanClassName;
         // Let's suppress duplicates in used beans (if any)
         $usedBeans = array_flip(array_flip($usedBeans));
-        $useStatements = array_map(function ($usedBean) {
+        $useStatements = array_map(function($usedBean) {
             return "use $usedBean;\n";
         }, $usedBeans);
 
@@ -587,7 +587,7 @@ 
                 $pos = strpos($str, ' ');
             }
             $before = substr($str, 0, $pos);
-            $after = substr($str, $pos + 1);
+            $after = substr($str, $pos+1);
             $str = $before.strtoupper(substr($after, 0, 1)).substr($after, 1);
         }
 

Indentation +472 added lines, -472 removed lines

@@ -17,201 +17,201 @@ 
  */
 class TDBMDaoGenerator
 {
-    /**
-     * @var SchemaAnalyzer
-     */
-    private $schemaAnalyzer;
-
-    /**
-     * @var Schema
-     */
-    private $schema;
-
-    /**
-     * The root directory of the project.
-     *
-     * @var string
-     */
-    private $rootPath;
-
-    /**
-     * Name of composer file.
-     *
-     * @var string
-     */
-    private $composerFile;
-
-    /**
-     * @var TDBMSchemaAnalyzer
-     */
-    private $tdbmSchemaAnalyzer;
-
-    /**
-     * Constructor.
-     *
-     * @param SchemaAnalyzer     $schemaAnalyzer
-     * @param Schema             $schema
-     * @param TDBMSchemaAnalyzer $tdbmSchemaAnalyzer
-     */
-    public function __construct(SchemaAnalyzer $schemaAnalyzer, Schema $schema, TDBMSchemaAnalyzer $tdbmSchemaAnalyzer)
-    {
-        $this->schemaAnalyzer = $schemaAnalyzer;
-        $this->schema = $schema;
-        $this->tdbmSchemaAnalyzer = $tdbmSchemaAnalyzer;
-        $this->rootPath = __DIR__.'/../../../../../../../../';
-        $this->composerFile = 'composer.json';
-    }
-
-    /**
-     * Generates all the daos and beans.
-     *
-     * @param string $daoFactoryClassName The classe name of the DAO factory
-     * @param string $daonamespace        The namespace for the DAOs, without trailing \
-     * @param string $beannamespace       The Namespace for the beans, without trailing \
-     * @param bool   $storeInUtc          If the generated daos should store the date in UTC timezone instead of user's timezone.
-     *
-     * @return \string[] the list of tables
-     *
-     * @throws TDBMException
-     */
-    public function generateAllDaosAndBeans($daoFactoryClassName, $daonamespace, $beannamespace, $storeInUtc)
-    {
-        // TODO: extract ClassNameMapper in its own package!
-        $classNameMapper = ClassNameMapper::createFromComposerFile($this->rootPath.$this->composerFile);
-        // TODO: check that no class name ends with "Base". Otherwise, there will be name clash.
-
-        $tableList = $this->schema->getTables();
-
-        // Remove all beans and daos from junction tables
-        $junctionTables = $this->schemaAnalyzer->detectJunctionTables();
-        $junctionTableNames = array_map(function (Table $table) {
-            return $table->getName();
-        }, $junctionTables);
-
-        $tableList = array_filter($tableList, function (Table $table) use ($junctionTableNames) {
-            return !in_array($table->getName(), $junctionTableNames);
-        });
-
-        foreach ($tableList as $table) {
-            $this->generateDaoAndBean($table, $daonamespace, $beannamespace, $classNameMapper, $storeInUtc);
-        }
-
-        $this->generateFactory($tableList, $daoFactoryClassName, $daonamespace, $classNameMapper);
-
-        // Ok, let's return the list of all tables.
-        // These will be used by the calling script to create Mouf instances.
-
-        return array_map(function (Table $table) { return $table->getName(); }, $tableList);
-    }
-
-    /**
-     * Generates in one method call the daos and the beans for one table.
-     *
-     * @param Table           $table
-     * @param string          $daonamespace
-     * @param string          $beannamespace
-     * @param ClassNameMapper $classNameMapper
-     * @param bool            $storeInUtc
-     *
-     * @throws TDBMException
-     */
-    public function generateDaoAndBean(Table $table, $daonamespace, $beannamespace, ClassNameMapper $classNameMapper, $storeInUtc)
-    {
-        $tableName = $table->getName();
-        $daoName = $this->getDaoNameFromTableName($tableName);
-        $beanName = $this->getBeanNameFromTableName($tableName);
-        $baseBeanName = $this->getBaseBeanNameFromTableName($tableName);
-        $baseDaoName = $this->getBaseDaoNameFromTableName($tableName);
-
-        $beanDescriptor = new BeanDescriptor($table, $this->schemaAnalyzer, $this->schema, $this->tdbmSchemaAnalyzer);
-        $this->generateBean($beanDescriptor, $beanName, $baseBeanName, $table, $beannamespace, $classNameMapper, $storeInUtc);
-        $this->generateDao($beanDescriptor, $daoName, $baseDaoName, $beanName, $table, $daonamespace, $beannamespace, $classNameMapper);
-    }
-
-    /**
-     * Returns the name of the bean class from the table name.
-     *
-     * @param $tableName
-     *
-     * @return string
-     */
-    public static function getBeanNameFromTableName($tableName)
-    {
-        return self::toSingular(self::toCamelCase($tableName)).'Bean';
-    }
-
-    /**
-     * Returns the name of the DAO class from the table name.
-     *
-     * @param $tableName
-     *
-     * @return string
-     */
-    public static function getDaoNameFromTableName($tableName)
-    {
-        return self::toSingular(self::toCamelCase($tableName)).'Dao';
-    }
-
-    /**
-     * Returns the name of the base bean class from the table name.
-     *
-     * @param $tableName
-     *
-     * @return string
-     */
-    public static function getBaseBeanNameFromTableName($tableName)
-    {
-        return self::toSingular(self::toCamelCase($tableName)).'BaseBean';
-    }
-
-    /**
-     * Returns the name of the base DAO class from the table name.
-     *
-     * @param $tableName
-     *
-     * @return string
-     */
-    public static function getBaseDaoNameFromTableName($tableName)
-    {
-        return self::toSingular(self::toCamelCase($tableName)).'BaseDao';
-    }
-
-    /**
-     * Writes the PHP bean file with all getters and setters from the table passed in parameter.
-     *
-     * @param BeanDescriptor  $beanDescriptor
-     * @param string          $className       The name of the class
-     * @param string          $baseClassName   The name of the base class which will be extended (name only, no directory)
-     * @param Table           $table           The table
-     * @param string          $beannamespace   The namespace of the bean
-     * @param ClassNameMapper $classNameMapper
-     *
-     * @throws TDBMException
-     */
-    public function generateBean(BeanDescriptor $beanDescriptor, $className, $baseClassName, Table $table, $beannamespace, ClassNameMapper $classNameMapper, $storeInUtc)
-    {
-        $str = $beanDescriptor->generatePhpCode($beannamespace);
-
-        $possibleBaseFileNames = $classNameMapper->getPossibleFileNames($beannamespace.'\\Generated\\'.$baseClassName);
-        if (empty($possibleBaseFileNames)) {
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$beannamespace.'\\'.$baseClassName.'" is not autoloadable.');
-        }
-        $possibleBaseFileName = $this->rootPath.$possibleBaseFileNames[0];
-
-        $this->ensureDirectoryExist($possibleBaseFileName);
-        file_put_contents($possibleBaseFileName, $str);
-        @chmod($possibleBaseFileName, 0664);
-
-        $possibleFileNames = $classNameMapper->getPossibleFileNames($beannamespace.'\\'.$className);
-        if (empty($possibleFileNames)) {
-            // @codeCoverageIgnoreStart
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$beannamespace.'\\'.$className.'" is not autoloadable.');
-            // @codeCoverageIgnoreEnd
-        }
-        $possibleFileName = $this->rootPath.$possibleFileNames[0];
-        if (!file_exists($possibleFileName)) {
-            $tableName = $table->getName();
-            $str = "<?php
+	/**
+	 * @var SchemaAnalyzer
+	 */
+	private $schemaAnalyzer;
+
+	/**
+	 * @var Schema
+	 */
+	private $schema;
+
+	/**
+	 * The root directory of the project.
+	 *
+	 * @var string
+	 */
+	private $rootPath;
+
+	/**
+	 * Name of composer file.
+	 *
+	 * @var string
+	 */
+	private $composerFile;
+
+	/**
+	 * @var TDBMSchemaAnalyzer
+	 */
+	private $tdbmSchemaAnalyzer;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param SchemaAnalyzer     $schemaAnalyzer
+	 * @param Schema             $schema
+	 * @param TDBMSchemaAnalyzer $tdbmSchemaAnalyzer
+	 */
+	public function __construct(SchemaAnalyzer $schemaAnalyzer, Schema $schema, TDBMSchemaAnalyzer $tdbmSchemaAnalyzer)
+	{
+		$this->schemaAnalyzer = $schemaAnalyzer;
+		$this->schema = $schema;
+		$this->tdbmSchemaAnalyzer = $tdbmSchemaAnalyzer;
+		$this->rootPath = __DIR__.'/../../../../../../../../';
+		$this->composerFile = 'composer.json';
+	}
+
+	/**
+	 * Generates all the daos and beans.
+	 *
+	 * @param string $daoFactoryClassName The classe name of the DAO factory
+	 * @param string $daonamespace        The namespace for the DAOs, without trailing \
+	 * @param string $beannamespace       The Namespace for the beans, without trailing \
+	 * @param bool   $storeInUtc          If the generated daos should store the date in UTC timezone instead of user's timezone.
+	 *
+	 * @return \string[] the list of tables
+	 *
+	 * @throws TDBMException
+	 */
+	public function generateAllDaosAndBeans($daoFactoryClassName, $daonamespace, $beannamespace, $storeInUtc)
+	{
+		// TODO: extract ClassNameMapper in its own package!
+		$classNameMapper = ClassNameMapper::createFromComposerFile($this->rootPath.$this->composerFile);
+		// TODO: check that no class name ends with "Base". Otherwise, there will be name clash.
+
+		$tableList = $this->schema->getTables();
+
+		// Remove all beans and daos from junction tables
+		$junctionTables = $this->schemaAnalyzer->detectJunctionTables();
+		$junctionTableNames = array_map(function (Table $table) {
+			return $table->getName();
+		}, $junctionTables);
+
+		$tableList = array_filter($tableList, function (Table $table) use ($junctionTableNames) {
+			return !in_array($table->getName(), $junctionTableNames);
+		});
+
+		foreach ($tableList as $table) {
+			$this->generateDaoAndBean($table, $daonamespace, $beannamespace, $classNameMapper, $storeInUtc);
+		}
+
+		$this->generateFactory($tableList, $daoFactoryClassName, $daonamespace, $classNameMapper);
+
+		// Ok, let's return the list of all tables.
+		// These will be used by the calling script to create Mouf instances.
+
+		return array_map(function (Table $table) { return $table->getName(); }, $tableList);
+	}
+
+	/**
+	 * Generates in one method call the daos and the beans for one table.
+	 *
+	 * @param Table           $table
+	 * @param string          $daonamespace
+	 * @param string          $beannamespace
+	 * @param ClassNameMapper $classNameMapper
+	 * @param bool            $storeInUtc
+	 *
+	 * @throws TDBMException
+	 */
+	public function generateDaoAndBean(Table $table, $daonamespace, $beannamespace, ClassNameMapper $classNameMapper, $storeInUtc)
+	{
+		$tableName = $table->getName();
+		$daoName = $this->getDaoNameFromTableName($tableName);
+		$beanName = $this->getBeanNameFromTableName($tableName);
+		$baseBeanName = $this->getBaseBeanNameFromTableName($tableName);
+		$baseDaoName = $this->getBaseDaoNameFromTableName($tableName);
+
+		$beanDescriptor = new BeanDescriptor($table, $this->schemaAnalyzer, $this->schema, $this->tdbmSchemaAnalyzer);
+		$this->generateBean($beanDescriptor, $beanName, $baseBeanName, $table, $beannamespace, $classNameMapper, $storeInUtc);
+		$this->generateDao($beanDescriptor, $daoName, $baseDaoName, $beanName, $table, $daonamespace, $beannamespace, $classNameMapper);
+	}
+
+	/**
+	 * Returns the name of the bean class from the table name.
+	 *
+	 * @param $tableName
+	 *
+	 * @return string
+	 */
+	public static function getBeanNameFromTableName($tableName)
+	{
+		return self::toSingular(self::toCamelCase($tableName)).'Bean';
+	}
+
+	/**
+	 * Returns the name of the DAO class from the table name.
+	 *
+	 * @param $tableName
+	 *
+	 * @return string
+	 */
+	public static function getDaoNameFromTableName($tableName)
+	{
+		return self::toSingular(self::toCamelCase($tableName)).'Dao';
+	}
+
+	/**
+	 * Returns the name of the base bean class from the table name.
+	 *
+	 * @param $tableName
+	 *
+	 * @return string
+	 */
+	public static function getBaseBeanNameFromTableName($tableName)
+	{
+		return self::toSingular(self::toCamelCase($tableName)).'BaseBean';
+	}
+
+	/**
+	 * Returns the name of the base DAO class from the table name.
+	 *
+	 * @param $tableName
+	 *
+	 * @return string
+	 */
+	public static function getBaseDaoNameFromTableName($tableName)
+	{
+		return self::toSingular(self::toCamelCase($tableName)).'BaseDao';
+	}
+
+	/**
+	 * Writes the PHP bean file with all getters and setters from the table passed in parameter.
+	 *
+	 * @param BeanDescriptor  $beanDescriptor
+	 * @param string          $className       The name of the class
+	 * @param string          $baseClassName   The name of the base class which will be extended (name only, no directory)
+	 * @param Table           $table           The table
+	 * @param string          $beannamespace   The namespace of the bean
+	 * @param ClassNameMapper $classNameMapper
+	 *
+	 * @throws TDBMException
+	 */
+	public function generateBean(BeanDescriptor $beanDescriptor, $className, $baseClassName, Table $table, $beannamespace, ClassNameMapper $classNameMapper, $storeInUtc)
+	{
+		$str = $beanDescriptor->generatePhpCode($beannamespace);
+
+		$possibleBaseFileNames = $classNameMapper->getPossibleFileNames($beannamespace.'\\Generated\\'.$baseClassName);
+		if (empty($possibleBaseFileNames)) {
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$beannamespace.'\\'.$baseClassName.'" is not autoloadable.');
+		}
+		$possibleBaseFileName = $this->rootPath.$possibleBaseFileNames[0];
+
+		$this->ensureDirectoryExist($possibleBaseFileName);
+		file_put_contents($possibleBaseFileName, $str);
+		@chmod($possibleBaseFileName, 0664);
+
+		$possibleFileNames = $classNameMapper->getPossibleFileNames($beannamespace.'\\'.$className);
+		if (empty($possibleFileNames)) {
+			// @codeCoverageIgnoreStart
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$beannamespace.'\\'.$className.'" is not autoloadable.');
+			// @codeCoverageIgnoreEnd
+		}
+		$possibleFileName = $this->rootPath.$possibleFileNames[0];
+		if (!file_exists($possibleFileName)) {
+			$tableName = $table->getName();
+			$str = "<?php
 /*
  * This file has been automatically generated by TDBM.
  * You can edit this file as it will not be overwritten.
@@ -228,76 +228,76 @@ 
 {
 
 }";
-            $this->ensureDirectoryExist($possibleFileName);
-            file_put_contents($possibleFileName, $str);
-            @chmod($possibleFileName, 0664);
-        }
-    }
-
-    /**
-     * Tries to find a @defaultSort annotation in one of the columns.
-     *
-     * @param Table $table
-     *
-     * @return array First item: column name, Second item: column order (asc/desc)
-     */
-    private function getDefaultSortColumnFromAnnotation(Table $table)
-    {
-        $defaultSort = null;
-        $defaultSortDirection = null;
-        foreach ($table->getColumns() as $column) {
-            $comments = $column->getComment();
-            $matches = [];
-            if (preg_match('/@defaultSort(\((desc|asc)\))*/', $comments, $matches) != 0) {
-                $defaultSort = $column->getName();
-                if (count($matches) === 3) {
-                    $defaultSortDirection = $matches[2];
-                } else {
-                    $defaultSortDirection = 'ASC';
-                }
-            }
-        }
-
-        return [$defaultSort, $defaultSortDirection];
-    }
-
-    /**
-     * Writes the PHP bean DAO with simple functions to create/get/save objects.
-     *
-     * @param BeanDescriptor  $beanDescriptor
-     * @param string          $className       The name of the class
-     * @param string          $baseClassName
-     * @param string          $beanClassName
-     * @param Table           $table
-     * @param string          $daonamespace
-     * @param string          $beannamespace
-     * @param ClassNameMapper $classNameMapper
-     *
-     * @throws TDBMException
-     */
-    public function generateDao(BeanDescriptor $beanDescriptor, $className, $baseClassName, $beanClassName, Table $table, $daonamespace, $beannamespace, ClassNameMapper $classNameMapper)
-    {
-        $tableName = $table->getName();
-        $primaryKeyColumns = $table->getPrimaryKeyColumns();
-
-        list($defaultSort, $defaultSortDirection) = $this->getDefaultSortColumnFromAnnotation($table);
-
-        // FIXME: lowercase tables with _ in the name should work!
-        $tableCamel = self::toSingular(self::toCamelCase($tableName));
-
-        $beanClassWithoutNameSpace = $beanClassName;
-        $beanClassName = $beannamespace.'\\'.$beanClassName;
-
-        list($usedBeans, $findByDaoCode) = $beanDescriptor->generateFindByDaoCode($beannamespace, $beanClassWithoutNameSpace);
-
-        $usedBeans[] = $beanClassName;
-        // Let's suppress duplicates in used beans (if any)
-        $usedBeans = array_flip(array_flip($usedBeans));
-        $useStatements = array_map(function ($usedBean) {
-            return "use $usedBean;\n";
-        }, $usedBeans);
-
-        $str = "<?php
+			$this->ensureDirectoryExist($possibleFileName);
+			file_put_contents($possibleFileName, $str);
+			@chmod($possibleFileName, 0664);
+		}
+	}
+
+	/**
+	 * Tries to find a @defaultSort annotation in one of the columns.
+	 *
+	 * @param Table $table
+	 *
+	 * @return array First item: column name, Second item: column order (asc/desc)
+	 */
+	private function getDefaultSortColumnFromAnnotation(Table $table)
+	{
+		$defaultSort = null;
+		$defaultSortDirection = null;
+		foreach ($table->getColumns() as $column) {
+			$comments = $column->getComment();
+			$matches = [];
+			if (preg_match('/@defaultSort(\((desc|asc)\))*/', $comments, $matches) != 0) {
+				$defaultSort = $column->getName();
+				if (count($matches) === 3) {
+					$defaultSortDirection = $matches[2];
+				} else {
+					$defaultSortDirection = 'ASC';
+				}
+			}
+		}
+
+		return [$defaultSort, $defaultSortDirection];
+	}
+
+	/**
+	 * Writes the PHP bean DAO with simple functions to create/get/save objects.
+	 *
+	 * @param BeanDescriptor  $beanDescriptor
+	 * @param string          $className       The name of the class
+	 * @param string          $baseClassName
+	 * @param string          $beanClassName
+	 * @param Table           $table
+	 * @param string          $daonamespace
+	 * @param string          $beannamespace
+	 * @param ClassNameMapper $classNameMapper
+	 *
+	 * @throws TDBMException
+	 */
+	public function generateDao(BeanDescriptor $beanDescriptor, $className, $baseClassName, $beanClassName, Table $table, $daonamespace, $beannamespace, ClassNameMapper $classNameMapper)
+	{
+		$tableName = $table->getName();
+		$primaryKeyColumns = $table->getPrimaryKeyColumns();
+
+		list($defaultSort, $defaultSortDirection) = $this->getDefaultSortColumnFromAnnotation($table);
+
+		// FIXME: lowercase tables with _ in the name should work!
+		$tableCamel = self::toSingular(self::toCamelCase($tableName));
+
+		$beanClassWithoutNameSpace = $beanClassName;
+		$beanClassName = $beannamespace.'\\'.$beanClassName;
+
+		list($usedBeans, $findByDaoCode) = $beanDescriptor->generateFindByDaoCode($beannamespace, $beanClassWithoutNameSpace);
+
+		$usedBeans[] = $beanClassName;
+		// Let's suppress duplicates in used beans (if any)
+		$usedBeans = array_flip(array_flip($usedBeans));
+		$useStatements = array_map(function ($usedBean) {
+			return "use $usedBean;\n";
+		}, $usedBeans);
+
+		$str = "<?php
 
 /*
  * This file has been automatically generated by TDBM.
@@ -374,9 +374,9 @@ 
     }
     ";
 
-        if (count($primaryKeyColumns) === 1) {
-            $primaryKeyColumn = $primaryKeyColumns[0];
-            $str .= "
+		if (count($primaryKeyColumns) === 1) {
+			$primaryKeyColumn = $primaryKeyColumns[0];
+			$str .= "
     /**
      * Get $beanClassWithoutNameSpace specified by its ID (its primary key)
      * If the primary key does not exist, an exception is thrown.
@@ -391,8 +391,8 @@ 
         return \$this->tdbmService->findObjectByPk('$tableName', ['$primaryKeyColumn' => \$id], [], \$lazyLoading);
     }
     ";
-        }
-        $str .= "
+		}
+		$str .= "
     /**
      * Deletes the $beanClassWithoutNameSpace passed in parameter.
      *
@@ -450,33 +450,33 @@ 
     }
 ";
 
-        $str .= $findByDaoCode;
-        $str .= '}
+		$str .= $findByDaoCode;
+		$str .= '}
 ';
 
-        $possibleBaseFileNames = $classNameMapper->getPossibleFileNames($daonamespace.'\\Generated\\'.$baseClassName);
-        if (empty($possibleBaseFileNames)) {
-            // @codeCoverageIgnoreStart
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$baseClassName.'" is not autoloadable.');
-            // @codeCoverageIgnoreEnd
-        }
-        $possibleBaseFileName = $this->rootPath.$possibleBaseFileNames[0];
-
-        $this->ensureDirectoryExist($possibleBaseFileName);
-        file_put_contents($possibleBaseFileName, $str);
-        @chmod($possibleBaseFileName, 0664);
-
-        $possibleFileNames = $classNameMapper->getPossibleFileNames($daonamespace.'\\'.$className);
-        if (empty($possibleFileNames)) {
-            // @codeCoverageIgnoreStart
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$className.'" is not autoloadable.');
-            // @codeCoverageIgnoreEnd
-        }
-        $possibleFileName = $this->rootPath.$possibleFileNames[0];
-
-        // Now, let's generate the "editable" class
-        if (!file_exists($possibleFileName)) {
-            $str = "<?php
+		$possibleBaseFileNames = $classNameMapper->getPossibleFileNames($daonamespace.'\\Generated\\'.$baseClassName);
+		if (empty($possibleBaseFileNames)) {
+			// @codeCoverageIgnoreStart
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$baseClassName.'" is not autoloadable.');
+			// @codeCoverageIgnoreEnd
+		}
+		$possibleBaseFileName = $this->rootPath.$possibleBaseFileNames[0];
+
+		$this->ensureDirectoryExist($possibleBaseFileName);
+		file_put_contents($possibleBaseFileName, $str);
+		@chmod($possibleBaseFileName, 0664);
+
+		$possibleFileNames = $classNameMapper->getPossibleFileNames($daonamespace.'\\'.$className);
+		if (empty($possibleFileNames)) {
+			// @codeCoverageIgnoreStart
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$className.'" is not autoloadable.');
+			// @codeCoverageIgnoreEnd
+		}
+		$possibleFileName = $this->rootPath.$possibleFileNames[0];
+
+		// Now, let's generate the "editable" class
+		if (!file_exists($possibleFileName)) {
+			$str = "<?php
 
 /*
  * This file has been automatically generated by TDBM.
@@ -495,22 +495,22 @@ 
 
 }
 ";
-            $this->ensureDirectoryExist($possibleFileName);
-            file_put_contents($possibleFileName, $str);
-            @chmod($possibleFileName, 0664);
-        }
-    }
-
-    /**
-     * Generates the factory bean.
-     *
-     * @param Table[] $tableList
-     */
-    private function generateFactory(array $tableList, $daoFactoryClassName, $daoNamespace, ClassNameMapper $classNameMapper)
-    {
-        // For each table, let's write a property.
-
-        $str = "<?php
+			$this->ensureDirectoryExist($possibleFileName);
+			file_put_contents($possibleFileName, $str);
+			@chmod($possibleFileName, 0664);
+		}
+	}
+
+	/**
+	 * Generates the factory bean.
+	 *
+	 * @param Table[] $tableList
+	 */
+	private function generateFactory(array $tableList, $daoFactoryClassName, $daoNamespace, ClassNameMapper $classNameMapper)
+	{
+		// For each table, let's write a property.
+
+		$str = "<?php
 
 /*
  * This file has been automatically generated by TDBM.
@@ -519,13 +519,13 @@ 
 
 namespace {$daoNamespace}\\Generated;
 ";
-        foreach ($tableList as $table) {
-            $tableName = $table->getName();
-            $daoClassName = $this->getDaoNameFromTableName($tableName);
-            $str .= "use {$daoNamespace}\\".$daoClassName.";\n";
-        }
+		foreach ($tableList as $table) {
+			$tableName = $table->getName();
+			$daoClassName = $this->getDaoNameFromTableName($tableName);
+			$str .= "use {$daoNamespace}\\".$daoClassName.";\n";
+		}
 
-        $str .= "
+		$str .= "
 /**
  * The $daoFactoryClassName provides an easy access to all DAOs generated by TDBM.
  *
@@ -534,12 +534,12 @@ 
 {
 ";
 
-        foreach ($tableList as $table) {
-            $tableName = $table->getName();
-            $daoClassName = $this->getDaoNameFromTableName($tableName);
-            $daoInstanceName = self::toVariableName($daoClassName);
+		foreach ($tableList as $table) {
+			$tableName = $table->getName();
+			$daoClassName = $this->getDaoNameFromTableName($tableName);
+			$daoInstanceName = self::toVariableName($daoClassName);
 
-            $str .= '    /**
+			$str .= '    /**
      * @var '.$daoClassName.'
      */
     private $'.$daoInstanceName.';
@@ -564,158 +564,158 @@ 
     }
 
 ';
-        }
+		}
 
-        $str .= '
+		$str .= '
 }
 ';
 
-        $possibleFileNames = $classNameMapper->getPossibleFileNames($daoNamespace.'\\Generated\\'.$daoFactoryClassName);
-        if (empty($possibleFileNames)) {
-            throw new TDBMException('Sorry, autoload namespace issue. The class "'.$daoNamespace.'\\'.$daoFactoryClassName.'" is not autoloadable.');
-        }
-        $possibleFileName = $this->rootPath.$possibleFileNames[0];
-
-        $this->ensureDirectoryExist($possibleFileName);
-        file_put_contents($possibleFileName, $str);
-        @chmod($possibleFileName, 0664);
-    }
-
-    /**
-     * Transforms a string to camelCase (except the first letter will be uppercase too).
-     * Underscores and spaces are removed and the first letter after the underscore is uppercased.
-     *
-     * @param $str string
-     *
-     * @return string
-     */
-    public static function toCamelCase($str)
-    {
-        $str = strtoupper(substr($str, 0, 1)).substr($str, 1);
-        while (true) {
-            if (strpos($str, '_') === false && strpos($str, ' ') === false) {
-                break;
-            }
-
-            $pos = strpos($str, '_');
-            if ($pos === false) {
-                $pos = strpos($str, ' ');
-            }
-            $before = substr($str, 0, $pos);
-            $after = substr($str, $pos + 1);
-            $str = $before.strtoupper(substr($after, 0, 1)).substr($after, 1);
-        }
-
-        return $str;
-    }
-
-    /**
-     * Tries to put string to the singular form (if it is plural).
-     * We assume the table names are in english.
-     *
-     * @param $str string
-     *
-     * @return string
-     */
-    public static function toSingular($str)
-    {
-        return Inflector::singularize($str);
-    }
-
-    /**
-     * Put the first letter of the string in lower case.
-     * Very useful to transform a class name into a variable name.
-     *
-     * @param $str string
-     *
-     * @return string
-     */
-    public static function toVariableName($str)
-    {
-        return strtolower(substr($str, 0, 1)).substr($str, 1);
-    }
-
-    /**
-     * Ensures the file passed in parameter can be written in its directory.
-     *
-     * @param string $fileName
-     *
-     * @throws TDBMException
-     */
-    private function ensureDirectoryExist($fileName)
-    {
-        $dirName = dirname($fileName);
-        if (!file_exists($dirName)) {
-            $old = umask(0);
-            $result = mkdir($dirName, 0775, true);
-            umask($old);
-            if ($result === false) {
-                throw new TDBMException("Unable to create directory: '".$dirName."'.");
-            }
-        }
-    }
-
-    /**
-     * Absolute path to composer json file.
-     *
-     * @param string $composerFile
-     */
-    public function setComposerFile($composerFile)
-    {
-        $this->rootPath = dirname($composerFile).'/';
-        $this->composerFile = basename($composerFile);
-    }
-
-    /**
-     * Transforms a DBAL type into a PHP type (for PHPDoc purpose).
-     *
-     * @param Type $type The DBAL type
-     *
-     * @return string The PHP type
-     */
-    public static function dbalTypeToPhpType(Type $type)
-    {
-        $map = [
-            Type::TARRAY => 'array',
-            Type::SIMPLE_ARRAY => 'array',
-            Type::JSON_ARRAY => 'array',
-            Type::BIGINT => 'string',
-            Type::BOOLEAN => 'bool',
-            Type::DATETIME => '\DateTimeInterface',
-            Type::DATETIMETZ => '\DateTimeInterface',
-            Type::DATE => '\DateTimeInterface',
-            Type::TIME => '\DateTimeInterface',
-            Type::DECIMAL => 'float',
-            Type::INTEGER => 'int',
-            Type::OBJECT => 'string',
-            Type::SMALLINT => 'int',
-            Type::STRING => 'string',
-            Type::TEXT => 'string',
-            Type::BINARY => 'string',
-            Type::BLOB => 'string',
-            Type::FLOAT => 'float',
-            Type::GUID => 'string',
-        ];
-
-        return isset($map[$type->getName()]) ? $map[$type->getName()] : $type->getName();
-    }
-
-    /**
-     * @param string $beanNamespace
-     *
-     * @return \string[] Returns a map mapping table name to beans name
-     */
-    public function buildTableToBeanMap($beanNamespace)
-    {
-        $tableToBeanMap = [];
-
-        $tables = $this->schema->getTables();
-
-        foreach ($tables as $table) {
-            $tableName = $table->getName();
-            $tableToBeanMap[$tableName] = $beanNamespace.'\\'.self::getBeanNameFromTableName($tableName);
-        }
-
-        return $tableToBeanMap;
-    }
+		$possibleFileNames = $classNameMapper->getPossibleFileNames($daoNamespace.'\\Generated\\'.$daoFactoryClassName);
+		if (empty($possibleFileNames)) {
+			throw new TDBMException('Sorry, autoload namespace issue. The class "'.$daoNamespace.'\\'.$daoFactoryClassName.'" is not autoloadable.');
+		}
+		$possibleFileName = $this->rootPath.$possibleFileNames[0];
+
+		$this->ensureDirectoryExist($possibleFileName);
+		file_put_contents($possibleFileName, $str);
+		@chmod($possibleFileName, 0664);
+	}
+
+	/**
+	 * Transforms a string to camelCase (except the first letter will be uppercase too).
+	 * Underscores and spaces are removed and the first letter after the underscore is uppercased.
+	 *
+	 * @param $str string
+	 *
+	 * @return string
+	 */
+	public static function toCamelCase($str)
+	{
+		$str = strtoupper(substr($str, 0, 1)).substr($str, 1);
+		while (true) {
+			if (strpos($str, '_') === false && strpos($str, ' ') === false) {
+				break;
+			}
+
+			$pos = strpos($str, '_');
+			if ($pos === false) {
+				$pos = strpos($str, ' ');
+			}
+			$before = substr($str, 0, $pos);
+			$after = substr($str, $pos + 1);
+			$str = $before.strtoupper(substr($after, 0, 1)).substr($after, 1);
+		}
+
+		return $str;
+	}
+
+	/**
+	 * Tries to put string to the singular form (if it is plural).
+	 * We assume the table names are in english.
+	 *
+	 * @param $str string
+	 *
+	 * @return string
+	 */
+	public static function toSingular($str)
+	{
+		return Inflector::singularize($str);
+	}
+
+	/**
+	 * Put the first letter of the string in lower case.
+	 * Very useful to transform a class name into a variable name.
+	 *
+	 * @param $str string
+	 *
+	 * @return string
+	 */
+	public static function toVariableName($str)
+	{
+		return strtolower(substr($str, 0, 1)).substr($str, 1);
+	}
+
+	/**
+	 * Ensures the file passed in parameter can be written in its directory.
+	 *
+	 * @param string $fileName
+	 *
+	 * @throws TDBMException
+	 */
+	private function ensureDirectoryExist($fileName)
+	{
+		$dirName = dirname($fileName);
+		if (!file_exists($dirName)) {
+			$old = umask(0);
+			$result = mkdir($dirName, 0775, true);
+			umask($old);
+			if ($result === false) {
+				throw new TDBMException("Unable to create directory: '".$dirName."'.");
+			}
+		}
+	}
+
+	/**
+	 * Absolute path to composer json file.
+	 *
+	 * @param string $composerFile
+	 */
+	public function setComposerFile($composerFile)
+	{
+		$this->rootPath = dirname($composerFile).'/';
+		$this->composerFile = basename($composerFile);
+	}
+
+	/**
+	 * Transforms a DBAL type into a PHP type (for PHPDoc purpose).
+	 *
+	 * @param Type $type The DBAL type
+	 *
+	 * @return string The PHP type
+	 */
+	public static function dbalTypeToPhpType(Type $type)
+	{
+		$map = [
+			Type::TARRAY => 'array',
+			Type::SIMPLE_ARRAY => 'array',
+			Type::JSON_ARRAY => 'array',
+			Type::BIGINT => 'string',
+			Type::BOOLEAN => 'bool',
+			Type::DATETIME => '\DateTimeInterface',
+			Type::DATETIMETZ => '\DateTimeInterface',
+			Type::DATE => '\DateTimeInterface',
+			Type::TIME => '\DateTimeInterface',
+			Type::DECIMAL => 'float',
+			Type::INTEGER => 'int',
+			Type::OBJECT => 'string',
+			Type::SMALLINT => 'int',
+			Type::STRING => 'string',
+			Type::TEXT => 'string',
+			Type::BINARY => 'string',
+			Type::BLOB => 'string',
+			Type::FLOAT => 'float',
+			Type::GUID => 'string',
+		];
+
+		return isset($map[$type->getName()]) ? $map[$type->getName()] : $type->getName();
+	}
+
+	/**
+	 * @param string $beanNamespace
+	 *
+	 * @return \string[] Returns a map mapping table name to beans name
+	 */
+	public function buildTableToBeanMap($beanNamespace)
+	{
+		$tableToBeanMap = [];
+
+		$tables = $this->schema->getTables();
+
+		foreach ($tables as $table) {
+			$tableName = $table->getName();
+			$tableToBeanMap[$tableName] = $beanNamespace.'\\'.self::getBeanNameFromTableName($tableName);
+		}
+
+		return $tableToBeanMap;
+	}
 }