thecodingmachine / database.tdbm

src/Mouf/Database/TDBM/WeakrefObjectStorage.php

Indentation +105 added lines, -105 removed lines

@@ -31,117 +31,117 @@
  */
 class WeakrefObjectStorage
 {
-    /**
-     * 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, WeakMap<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, WeakMap<string, TDBMObject>>
+	 */
+	private $objects = array();
 
-    /**
-     * Every 10000 set in the dataset, we perform a cleanup to ensure the WeakRef instances
-     * are removed if they are no more valid.
-     * This is to avoid having memory used by dangling WeakRef instances.
-     *
-     * @var int
-     */
-    private $garbageCollectorCount = 0;
+	/**
+	 * Every 10000 set in the dataset, we perform a cleanup to ensure the WeakRef instances
+	 * are removed if they are no more valid.
+	 * This is to avoid having memory used by dangling WeakRef instances.
+	 *
+	 * @var int
+	 */
+	private $garbageCollectorCount = 0;
 
-    /**
-     * Sets an object in the storage.
-     *
-     * @param string $tableName
-     * @param string $id
-     * @param DbRow  $dbRow
-     */
-    public function set($tableName, $id, DbRow $dbRow)
-    {
-        $this->objects[$tableName][$id] = new \WeakRef($dbRow);
-        ++$this->garbageCollectorCount;
-        if ($this->garbageCollectorCount == 10000) {
-            $this->garbageCollectorCount = 0;
-            $this->cleanupDanglingWeakRefs();
-        }
-    }
+	/**
+	 * Sets an object in the storage.
+	 *
+	 * @param string $tableName
+	 * @param string $id
+	 * @param DbRow  $dbRow
+	 */
+	public function set($tableName, $id, DbRow $dbRow)
+	{
+		$this->objects[$tableName][$id] = new \WeakRef($dbRow);
+		++$this->garbageCollectorCount;
+		if ($this->garbageCollectorCount == 10000) {
+			$this->garbageCollectorCount = 0;
+			$this->cleanupDanglingWeakRefs();
+		}
+	}
 
-    /**
-     * Checks if an object is in the storage.
-     *
-     * @param string $tableName
-     * @param string $id
-     *
-     * @return bool
-     */
-    public function has($tableName, $id)
-    {
-        if (isset($this->objects[$tableName][$id])) {
-            if ($this->objects[$tableName][$id]->valid()) {
-                return true;
-            } else {
-                unset($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)
+	{
+		if (isset($this->objects[$tableName][$id])) {
+			if ($this->objects[$tableName][$id]->valid()) {
+				return true;
+			} else {
+				unset($this->objects[$tableName][$id]);
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * 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])) {
-            if ($this->objects[$tableName][$id]->valid()) {
-                return $this->objects[$tableName][$id]->get();
-            }
-        } 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])) {
+			if ($this->objects[$tableName][$id]->valid()) {
+				return $this->objects[$tableName][$id]->get();
+			}
+		} 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) {
-                if ($obj->valid()) {
-                    $callback($obj->get(), $tableName, $id);
-                } else {
-                    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) {
+				if ($obj->valid()) {
+					$callback($obj->get(), $tableName, $id);
+				} else {
+					unset($this->objects[$tableName][$id]);
+				}
+			}
+		}
+	}
 
-    private function cleanupDanglingWeakRefs()
-    {
-        foreach ($this->objects as $tableName => $table) {
-            foreach ($table as $id => $obj) {
-                if (!$obj->valid()) {
-                    unset($this->objects[$tableName][$id]);
-                }
-            }
-        }
-    }
+	private function cleanupDanglingWeakRefs()
+	{
+		foreach ($this->objects as $tableName => $table) {
+			foreach ($table as $id => $obj) {
+				if (!$obj->valid()) {
+					unset($this->objects[$tableName][$id]);
+				}
+			}
+		}
+	}
 }

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

Spacing +3 added lines, -3 removed lines

@@ -65,7 +65,7 @@ 
     {
         // First, are there many column or only one?
         // If one column, we name the setter after it. Otherwise, we name the setter after the table name
-        if (count($this->foreignKey->getLocalColumns()) > 1) {
+        if (count($this->foreignKey->getLocalColumns())>1) {
             $name = TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($this->foreignKey->getForeignTableName()));
             if ($this->alternativeName) {
                 $camelizedColumns = array_map(['Mouf\\Database\\TDBM\\Utils\\TDBMDaoGenerator', 'toCamelCase'], $this->foreignKey->getLocalColumns());
@@ -78,8 +78,8 @@ 
             if (strpos(strtolower($column), 'id_') === 0) {
                 $column = substr($column, 3);
             }
-            if (strrpos(strtolower($column), '_id') === strlen($column) - 3) {
-                $column = substr($column, 0, strlen($column) - 3);
+            if (strrpos(strtolower($column), '_id') === strlen($column)-3) {
+                $column = substr($column, 0, strlen($column)-3);
             }
             $name = TDBMDaoGenerator::toCamelCase($column);
             if ($this->alternativeName) {

Indentation +162 added lines, -162 removed lines

@@ -12,156 +12,156 @@ 
  */
 class ObjectBeanPropertyDescriptor extends AbstractBeanPropertyDescriptor
 {
-    /**
-     * @var ForeignKeyConstraint
-     */
-    private $foreignKey;
-
-    /**
-     * @var SchemaAnalyzer
-     */
-    private $schemaAnalyzer;
-
-    public function __construct(Table $table, ForeignKeyConstraint $foreignKey, SchemaAnalyzer $schemaAnalyzer)
-    {
-        parent::__construct($table);
-        $this->foreignKey = $foreignKey;
-        $this->schemaAnalyzer = $schemaAnalyzer;
-    }
-
-    /**
-     * Returns the foreignkey the column is part of, if any. null otherwise.
-     *
-     * @return ForeignKeyConstraint|null
-     */
-    public function getForeignKey()
-    {
-        return $this->foreignKey;
-    }
-
-    /**
-     * 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 TDBMDaoGenerator::getBeanNameFromTableName($this->foreignKey->getForeignTableName());
-    }
-
-    /**
-     * Returns the param annotation for this property (useful for constructor).
-     *
-     * @return string
-     */
-    public function getParamAnnotation()
-    {
-        $str = '     * @param %s %s';
-
-        return sprintf($str, $this->getClassName(), $this->getVariableName());
-    }
-
-    public function getUpperCamelCaseName()
-    {
-        // First, are there many column or only one?
-        // If one column, we name the setter after it. Otherwise, we name the setter after the table name
-        if (count($this->foreignKey->getLocalColumns()) > 1) {
-            $name = TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($this->foreignKey->getForeignTableName()));
-            if ($this->alternativeName) {
-                $camelizedColumns = array_map(['Mouf\\Database\\TDBM\\Utils\\TDBMDaoGenerator', 'toCamelCase'], $this->foreignKey->getLocalColumns());
-
-                $name .= 'By'.implode('And', $camelizedColumns);
-            }
-        } else {
-            $column = $this->foreignKey->getLocalColumns()[0];
-            // Let's remove any _id or id_.
-            if (strpos(strtolower($column), 'id_') === 0) {
-                $column = substr($column, 3);
-            }
-            if (strrpos(strtolower($column), '_id') === strlen($column) - 3) {
-                $column = substr($column, 0, strlen($column) - 3);
-            }
-            $name = TDBMDaoGenerator::toCamelCase($column);
-            if ($this->alternativeName) {
-                $name .= 'Object';
-            }
-        }
-
-        return $name;
-    }
-
-    /**
-     * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
-     *
-     * @return bool
-     */
-    public function isCompulsory()
-    {
-        // Are all columns nullable?
-        $localColumnNames = $this->foreignKey->getLocalColumns();
-
-        foreach ($localColumnNames as $name) {
-            $column = $this->table->getColumn($name);
-            if ($column->getNotnull()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns true if the property has a default value.
-     *
-     * @return bool
-     */
-    public function hasDefault()
-    {
-        return false;
-    }
-
-    /**
-     * Returns the code that assigns a value to its default value.
-     *
-     * @return string
-     *
-     * @throws \TDBMException
-     */
-    public function assignToDefaultCode()
-    {
-        throw new \TDBMException('Foreign key based properties cannot be assigned a default value.');
-    }
-
-    /**
-     * Returns true if the property is the primary key.
-     *
-     * @return bool
-     */
-    public function isPrimaryKey()
-    {
-        $fkColumns = $this->foreignKey->getLocalColumns();
-        sort($fkColumns);
-
-        $pkColumns = $this->table->getPrimaryKeyColumns();
-        sort($pkColumns);
-
-        return $fkColumns == $pkColumns;
-    }
-
-    /**
-     * Returns the PHP code for getters and setters.
-     *
-     * @return string
-     */
-    public function getGetterSetterCode()
-    {
-        $tableName = $this->table->getName();
-        $getterName = $this->getGetterName();
-        $setterName = $this->getSetterName();
-
-        $referencedBeanName = TDBMDaoGenerator::getBeanNameFromTableName($this->foreignKey->getForeignTableName());
-
-        $str = '    /**
+	/**
+	 * @var ForeignKeyConstraint
+	 */
+	private $foreignKey;
+
+	/**
+	 * @var SchemaAnalyzer
+	 */
+	private $schemaAnalyzer;
+
+	public function __construct(Table $table, ForeignKeyConstraint $foreignKey, SchemaAnalyzer $schemaAnalyzer)
+	{
+		parent::__construct($table);
+		$this->foreignKey = $foreignKey;
+		$this->schemaAnalyzer = $schemaAnalyzer;
+	}
+
+	/**
+	 * Returns the foreignkey the column is part of, if any. null otherwise.
+	 *
+	 * @return ForeignKeyConstraint|null
+	 */
+	public function getForeignKey()
+	{
+		return $this->foreignKey;
+	}
+
+	/**
+	 * 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 TDBMDaoGenerator::getBeanNameFromTableName($this->foreignKey->getForeignTableName());
+	}
+
+	/**
+	 * Returns the param annotation for this property (useful for constructor).
+	 *
+	 * @return string
+	 */
+	public function getParamAnnotation()
+	{
+		$str = '     * @param %s %s';
+
+		return sprintf($str, $this->getClassName(), $this->getVariableName());
+	}
+
+	public function getUpperCamelCaseName()
+	{
+		// First, are there many column or only one?
+		// If one column, we name the setter after it. Otherwise, we name the setter after the table name
+		if (count($this->foreignKey->getLocalColumns()) > 1) {
+			$name = TDBMDaoGenerator::toSingular(TDBMDaoGenerator::toCamelCase($this->foreignKey->getForeignTableName()));
+			if ($this->alternativeName) {
+				$camelizedColumns = array_map(['Mouf\\Database\\TDBM\\Utils\\TDBMDaoGenerator', 'toCamelCase'], $this->foreignKey->getLocalColumns());
+
+				$name .= 'By'.implode('And', $camelizedColumns);
+			}
+		} else {
+			$column = $this->foreignKey->getLocalColumns()[0];
+			// Let's remove any _id or id_.
+			if (strpos(strtolower($column), 'id_') === 0) {
+				$column = substr($column, 3);
+			}
+			if (strrpos(strtolower($column), '_id') === strlen($column) - 3) {
+				$column = substr($column, 0, strlen($column) - 3);
+			}
+			$name = TDBMDaoGenerator::toCamelCase($column);
+			if ($this->alternativeName) {
+				$name .= 'Object';
+			}
+		}
+
+		return $name;
+	}
+
+	/**
+	 * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
+	 *
+	 * @return bool
+	 */
+	public function isCompulsory()
+	{
+		// Are all columns nullable?
+		$localColumnNames = $this->foreignKey->getLocalColumns();
+
+		foreach ($localColumnNames as $name) {
+			$column = $this->table->getColumn($name);
+			if ($column->getNotnull()) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns true if the property has a default value.
+	 *
+	 * @return bool
+	 */
+	public function hasDefault()
+	{
+		return false;
+	}
+
+	/**
+	 * Returns the code that assigns a value to its default value.
+	 *
+	 * @return string
+	 *
+	 * @throws \TDBMException
+	 */
+	public function assignToDefaultCode()
+	{
+		throw new \TDBMException('Foreign key based properties cannot be assigned a default value.');
+	}
+
+	/**
+	 * Returns true if the property is the primary key.
+	 *
+	 * @return bool
+	 */
+	public function isPrimaryKey()
+	{
+		$fkColumns = $this->foreignKey->getLocalColumns();
+		sort($fkColumns);
+
+		$pkColumns = $this->table->getPrimaryKeyColumns();
+		sort($pkColumns);
+
+		return $fkColumns == $pkColumns;
+	}
+
+	/**
+	 * Returns the PHP code for getters and setters.
+	 *
+	 * @return string
+	 */
+	public function getGetterSetterCode()
+	{
+		$tableName = $this->table->getName();
+		$getterName = $this->getGetterName();
+		$setterName = $this->getSetterName();
+
+		$referencedBeanName = TDBMDaoGenerator::getBeanNameFromTableName($this->foreignKey->getForeignTableName());
+
+		$str = '    /**
      * Returns the '.$referencedBeanName.' object bound to this object via the '.implode(' and ', $this->foreignKey->getLocalColumns()).' column.
      *
      * @return '.$referencedBeanName.'
@@ -183,20 +183,20 @@ 
 
 ';
 
-        return $str;
-    }
-
-    /**
-     * Returns the part of code useful when doing json serialization.
-     *
-     * @return string
-     */
-    public function getJsonSerializeCode()
-    {
-        return '        if (!$stopRecursion) {
+		return $str;
+	}
+
+	/**
+	 * Returns the part of code useful when doing json serialization.
+	 *
+	 * @return string
+	 */
+	public function getJsonSerializeCode()
+	{
+		return '        if (!$stopRecursion) {
             $object = $this->'.$this->getGetterName().'();
             $array['.var_export($this->getLowerCamelCaseName(), true).'] = $object ? $object->jsonSerialize(true) : null;
         }
 ';
-    }
+	}
 }

src/Mouf/Database/TDBM/InnerResultArray.php

Spacing +2 added lines, -2 removed lines

@@ -83,7 +83,7 @@ 
 
     private function toIndex($offset)
     {
-        if ($offset < 0 || filter_var($offset, FILTER_VALIDATE_INT) === false) {
+        if ($offset<0 || filter_var($offset, FILTER_VALIDATE_INT) === false) {
             throw new TDBMInvalidOffsetException('Trying to access result set using offset "'.$offset.'". An offset must be a positive integer.');
         }
         if ($this->statement === null) {
@@ -100,7 +100,7 @@ 
     public function next()
     {
         // Let's overload the next() method to store the result.
-        if (isset($this->results[$this->key + 1])) {
+        if (isset($this->results[$this->key+1])) {
             ++$this->key;
             $this->current = $this->results[$this->key];
         } else {

Indentation +89 added lines, -89 removed lines

@@ -27,100 +27,100 @@
  */
 class InnerResultArray extends InnerResultIterator
 {
-    /**
-     * The list of results already fetched.
-     *
-     * @var AbstractTDBMObject[]
-     */
-    private $results = [];
+	/**
+	 * The list of results already fetched.
+	 *
+	 * @var AbstractTDBMObject[]
+	 */
+	private $results = [];
 
-    /**
-     * 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)
-    {
-        try {
-            $this->toIndex($offset);
-        } catch (TDBMInvalidOffsetException $e) {
-            return false;
-        }
+	/**
+	 * 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)
+	{
+		try {
+			$this->toIndex($offset);
+		} catch (TDBMInvalidOffsetException $e) {
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * 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)
-    {
-        $this->toIndex($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)
+	{
+		$this->toIndex($offset);
 
-        return $this->results[$offset];
-    }
+		return $this->results[$offset];
+	}
 
-    private function toIndex($offset)
-    {
-        if ($offset < 0 || filter_var($offset, FILTER_VALIDATE_INT) === false) {
-            throw new TDBMInvalidOffsetException('Trying to access result set using offset "'.$offset.'". An offset must be a positive integer.');
-        }
-        if ($this->statement === null) {
-            $this->executeQuery();
-        }
-        while (!isset($this->results[$offset])) {
-            $this->next();
-            if ($this->current === null) {
-                throw new TDBMInvalidOffsetException('Offset "'.$offset.'" does not exist in result set.');
-            }
-        }
-    }
+	private function toIndex($offset)
+	{
+		if ($offset < 0 || filter_var($offset, FILTER_VALIDATE_INT) === false) {
+			throw new TDBMInvalidOffsetException('Trying to access result set using offset "'.$offset.'". An offset must be a positive integer.');
+		}
+		if ($this->statement === null) {
+			$this->executeQuery();
+		}
+		while (!isset($this->results[$offset])) {
+			$this->next();
+			if ($this->current === null) {
+				throw new TDBMInvalidOffsetException('Offset "'.$offset.'" does not exist in result set.');
+			}
+		}
+	}
 
-    public function next()
-    {
-        // Let's overload the next() method to store the result.
-        if (isset($this->results[$this->key + 1])) {
-            ++$this->key;
-            $this->current = $this->results[$this->key];
-        } else {
-            parent::next();
-            if ($this->current !== null) {
-                $this->results[$this->key] = $this->current;
-            }
-        }
-    }
+	public function next()
+	{
+		// Let's overload the next() method to store the result.
+		if (isset($this->results[$this->key + 1])) {
+			++$this->key;
+			$this->current = $this->results[$this->key];
+		} else {
+			parent::next();
+			if ($this->current !== null) {
+				$this->results[$this->key] = $this->current;
+			}
+		}
+	}
 
-    /**
-     * Overloads the rewind implementation.
-     * Do not reexecute the query.
-     */
-    public function rewind()
-    {
-        if (!$this->fetchStarted) {
-            $this->executeQuery();
-        }
-        $this->key = -1;
-        $this->next();
-    }
+	/**
+	 * Overloads the rewind implementation.
+	 * Do not reexecute the query.
+	 */
+	public function rewind()
+	{
+		if (!$this->fetchStarted) {
+			$this->executeQuery();
+		}
+		$this->key = -1;
+		$this->next();
+	}
 }

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 +211 added lines, -211 removed lines

@@ -30,238 +30,238 @@
  */
 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;
 
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
+	/**
+	 * @var LoggerInterface
+	 */
+	private $logger;
 
-    public function __construct(ResultIterator $parentResult, $magicSql, array $parameters, $limit, $offset, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode, LoggerInterface $logger)
-    {
-        $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;
-        $this->logger = $logger;
-    }
+	public function __construct(ResultIterator $parentResult, $magicSql, array $parameters, $limit, $offset, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode, LoggerInterface $logger)
+	{
+		$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;
+		$this->logger = $logger;
+	}
 
-    /**
-     * 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, $this->logger);
-            } else {
-                $this->innerResultIterator = new InnerResultArray($this->magicSql, $this->parameters, $this->limit, $this->offset, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery, $this->logger);
-            }
-        }
+	/**
+	 * 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, $this->logger);
+			} else {
+				$this->innerResultIterator = new InnerResultArray($this->magicSql, $this->parameters, $this->limit, $this->offset, $this->columnDescriptors, $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery, $this->logger);
+			}
+		}
 
-        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/Mouf/Database/TDBM/Controllers/TdbmController.php

Indentation +144 added lines, -144 removed lines

@@ -18,148 +18,148 @@
  */
 class TdbmController extends AbstractMoufInstanceController
 {
-    /**
-     * @var HtmlBlock
-     */
-    public $content;
-
-    protected $daoNamespace;
-    protected $beanNamespace;
-    protected $daoFactoryName;
-    protected $daoFactoryInstanceName;
-    protected $autoloadDetected;
-    protected $storeInUtc;
-    protected $useCustomComposer;
-
-    /**
-     * Admin page used to display the DAO generation form.
-     *
-     * @Action
-     */
-    public function defaultAction($name, $selfedit = 'false')
-    {
-        $this->initController($name, $selfedit);
-
-        // Fill variables
-        if ($this->moufManager->getVariable('tdbmDefaultSourceDirectory_'.$name) != null) {
-            $this->daoNamespace = $this->moufManager->getVariable('tdbmDefaultDaoNamespace_'.$name);
-            $this->beanNamespace = $this->moufManager->getVariable('tdbmDefaultBeanNamespace_'.$name);
-            $this->daoFactoryName = $this->moufManager->getVariable('tdbmDefaultDaoFactoryName_'.$name);
-            $this->daoFactoryInstanceName = $this->moufManager->getVariable('tdbmDefaultDaoFactoryInstanceName_'.$name);
-            $this->storeInUtc = $this->moufManager->getVariable('tdbmDefaultStoreInUtc_'.$name);
-            $this->useCustomComposer = $this->moufManager->getVariable('tdbmDefaultUseCustomComposer_'.$name);
-            $this->composerFile = $this->moufManager->getVariable('tdbmDefaultComposerFile_'.$name);
-        } else {
-            $this->daoNamespace = $this->moufManager->getVariable('tdbmDefaultDaoNamespace');
-            $this->beanNamespace = $this->moufManager->getVariable('tdbmDefaultBeanNamespace');
-            $this->daoFactoryName = $this->moufManager->getVariable('tdbmDefaultDaoFactoryName');
-            $this->daoFactoryInstanceName = $this->moufManager->getVariable('tdbmDefaultDaoFactoryInstanceName');
-            $this->storeInUtc = $this->moufManager->getVariable('tdbmDefaultStoreInUtc');
-            $this->useCustomComposer = $this->moufManager->getVariable('tdbmDefaultUseCustomComposer');
-            $this->composerFile = $this->moufManager->getVariable('tdbmDefaultComposerFile');
-        }
-
-        if ($this->daoNamespace == null && $this->beanNamespace == null) {
-            $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
-
-            $autoloadNamespaces = $classNameMapper->getManagedNamespaces();
-            if ($autoloadNamespaces) {
-                $this->autoloadDetected = true;
-                $rootNamespace = $autoloadNamespaces[0];
-                $this->daoNamespace = $rootNamespace.'Dao';
-                $this->beanNamespace = $rootNamespace.'Dao\\Bean';
-            } else {
-                $this->autoloadDetected = false;
-                $this->daoNamespace = 'YourApplication\\Dao';
-                $this->beanNamespace = 'YourApplication\\Dao\\Bean';
-            }
-        } else {
-            $this->autoloadDetected = true;
-        }
-
-        $this->content->addFile(__DIR__.'/../../../../views/tdbmGenerate.php', $this);
-        $this->template->toHtml();
-    }
-
-    /**
-     * This action generates the DAOs and Beans for the TDBM service passed in parameter.
-     *
-     * @Action
-     *
-     * @param string $name
-     * @param bool   $selfedit
-     */
-    public function generate($name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $storeInUtc = 0, $selfedit = 'false', $useCustomComposer = false, $composerFile = '')
-    {
-        $this->initController($name, $selfedit);
-
-        self::generateDaos($this->moufManager, $name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit, $storeInUtc, $useCustomComposer, $composerFile);
-
-        // TODO: better: we should redirect to a screen that list the number of DAOs generated, etc...
-        header('Location: '.ROOT_URL.'ajaxinstance/?name='.urlencode($name).'&selfedit='.$selfedit);
-    }
-
-    /**
-     * This function generates the DAOs and Beans for the TDBM service passed in parameter.
-     *
-     * @param MoufManager $moufManager
-     * @param string      $name
-     * @param string      $daonamespace
-     * @param string      $beannamespace
-     * @param string      $daofactoryclassname
-     * @param string      $daofactoryinstancename
-     * @param string      $selfedit
-     * @param bool        $storeInUtc
-     *
-     * @throws \Mouf\MoufException
-     */
-    public static function generateDaos(MoufManager $moufManager, $name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit = 'false', $storeInUtc = null, $useCustomComposer = null, $composerFile = null)
-    {
-        $moufManager->setVariable('tdbmDefaultDaoNamespace_'.$name, $daonamespace);
-        $moufManager->setVariable('tdbmDefaultBeanNamespace_'.$name, $beannamespace);
-        $moufManager->setVariable('tdbmDefaultDaoFactoryName_'.$name, $daofactoryclassname);
-        $moufManager->setVariable('tdbmDefaultDaoFactoryInstanceName_'.$name, $daofactoryinstancename);
-        $moufManager->setVariable('tdbmDefaultStoreInUtc_'.$name, $storeInUtc);
-        $moufManager->setVariable('tdbmDefaultUseCustomComposer_'.$name, $useCustomComposer);
-        $moufManager->setVariable('tdbmDefaultComposerFile_'.$name, $composerFile);
-
-        // In case of instance renaming, let's use the last used settings
-        $moufManager->setVariable('tdbmDefaultDaoNamespace', $daonamespace);
-        $moufManager->setVariable('tdbmDefaultBeanNamespace', $beannamespace);
-        $moufManager->setVariable('tdbmDefaultDaoFactoryName', $daofactoryclassname);
-        $moufManager->setVariable('tdbmDefaultDaoFactoryInstanceName', $daofactoryinstancename);
-        $moufManager->setVariable('tdbmDefaultStoreInUtc', $storeInUtc);
-        $moufManager->setVariable('tdbmDefaultUseCustomComposer', $useCustomComposer);
-        $moufManager->setVariable('tdbmDefaultComposerFile', $composerFile);
-
-        // Remove first and last slash in namespace.
-        $daonamespace = trim($daonamespace, '\\');
-        $beannamespace = trim($beannamespace, '\\');
-
-        $tdbmService = new InstanceProxy($name);
-        /* @var $tdbmService TDBMService */
-        $tables = $tdbmService->generateAllDaosAndBeans($daofactoryclassname, $daonamespace, $beannamespace, $storeInUtc, ($useCustomComposer ? $composerFile : null));
-
-        $moufManager->declareComponent($daofactoryinstancename, $daonamespace.'\\Generated\\'.$daofactoryclassname, false, MoufManager::DECLARE_ON_EXIST_KEEP_INCOMING_LINKS);
-
-        $tableToBeanMap = [];
-
-        //$tdbmServiceDescriptor = $moufManager->getInstanceDescriptor('tdbmService');
-
-        foreach ($tables as $table) {
-            $daoName = TDBMDaoGenerator::getDaoNameFromTableName($table);
-
-            $instanceName = TDBMDaoGenerator::toVariableName($daoName);
-            if (!$moufManager->instanceExists($instanceName)) {
-                $moufManager->declareComponent($instanceName, $daonamespace.'\\'.$daoName);
-            }
-            $moufManager->setParameterViaConstructor($instanceName, 0, $name, 'object');
-            $moufManager->bindComponentViaSetter($daofactoryinstancename, 'set'.$daoName, $instanceName);
-
-            $tableToBeanMap[$table] = $beannamespace.'\\'.TDBMDaoGenerator::getBeanNameFromTableName($table);
-        }
-        $tdbmServiceDescriptor = $moufManager->getInstanceDescriptor($name);
-        $tdbmServiceDescriptor->getSetterProperty('setTableToBeanMap')->setValue($tableToBeanMap);
-        $moufManager->rewriteMouf();
-    }
+	/**
+	 * @var HtmlBlock
+	 */
+	public $content;
+
+	protected $daoNamespace;
+	protected $beanNamespace;
+	protected $daoFactoryName;
+	protected $daoFactoryInstanceName;
+	protected $autoloadDetected;
+	protected $storeInUtc;
+	protected $useCustomComposer;
+
+	/**
+	 * Admin page used to display the DAO generation form.
+	 *
+	 * @Action
+	 */
+	public function defaultAction($name, $selfedit = 'false')
+	{
+		$this->initController($name, $selfedit);
+
+		// Fill variables
+		if ($this->moufManager->getVariable('tdbmDefaultSourceDirectory_'.$name) != null) {
+			$this->daoNamespace = $this->moufManager->getVariable('tdbmDefaultDaoNamespace_'.$name);
+			$this->beanNamespace = $this->moufManager->getVariable('tdbmDefaultBeanNamespace_'.$name);
+			$this->daoFactoryName = $this->moufManager->getVariable('tdbmDefaultDaoFactoryName_'.$name);
+			$this->daoFactoryInstanceName = $this->moufManager->getVariable('tdbmDefaultDaoFactoryInstanceName_'.$name);
+			$this->storeInUtc = $this->moufManager->getVariable('tdbmDefaultStoreInUtc_'.$name);
+			$this->useCustomComposer = $this->moufManager->getVariable('tdbmDefaultUseCustomComposer_'.$name);
+			$this->composerFile = $this->moufManager->getVariable('tdbmDefaultComposerFile_'.$name);
+		} else {
+			$this->daoNamespace = $this->moufManager->getVariable('tdbmDefaultDaoNamespace');
+			$this->beanNamespace = $this->moufManager->getVariable('tdbmDefaultBeanNamespace');
+			$this->daoFactoryName = $this->moufManager->getVariable('tdbmDefaultDaoFactoryName');
+			$this->daoFactoryInstanceName = $this->moufManager->getVariable('tdbmDefaultDaoFactoryInstanceName');
+			$this->storeInUtc = $this->moufManager->getVariable('tdbmDefaultStoreInUtc');
+			$this->useCustomComposer = $this->moufManager->getVariable('tdbmDefaultUseCustomComposer');
+			$this->composerFile = $this->moufManager->getVariable('tdbmDefaultComposerFile');
+		}
+
+		if ($this->daoNamespace == null && $this->beanNamespace == null) {
+			$classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
+
+			$autoloadNamespaces = $classNameMapper->getManagedNamespaces();
+			if ($autoloadNamespaces) {
+				$this->autoloadDetected = true;
+				$rootNamespace = $autoloadNamespaces[0];
+				$this->daoNamespace = $rootNamespace.'Dao';
+				$this->beanNamespace = $rootNamespace.'Dao\\Bean';
+			} else {
+				$this->autoloadDetected = false;
+				$this->daoNamespace = 'YourApplication\\Dao';
+				$this->beanNamespace = 'YourApplication\\Dao\\Bean';
+			}
+		} else {
+			$this->autoloadDetected = true;
+		}
+
+		$this->content->addFile(__DIR__.'/../../../../views/tdbmGenerate.php', $this);
+		$this->template->toHtml();
+	}
+
+	/**
+	 * This action generates the DAOs and Beans for the TDBM service passed in parameter.
+	 *
+	 * @Action
+	 *
+	 * @param string $name
+	 * @param bool   $selfedit
+	 */
+	public function generate($name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $storeInUtc = 0, $selfedit = 'false', $useCustomComposer = false, $composerFile = '')
+	{
+		$this->initController($name, $selfedit);
+
+		self::generateDaos($this->moufManager, $name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit, $storeInUtc, $useCustomComposer, $composerFile);
+
+		// TODO: better: we should redirect to a screen that list the number of DAOs generated, etc...
+		header('Location: '.ROOT_URL.'ajaxinstance/?name='.urlencode($name).'&selfedit='.$selfedit);
+	}
+
+	/**
+	 * This function generates the DAOs and Beans for the TDBM service passed in parameter.
+	 *
+	 * @param MoufManager $moufManager
+	 * @param string      $name
+	 * @param string      $daonamespace
+	 * @param string      $beannamespace
+	 * @param string      $daofactoryclassname
+	 * @param string      $daofactoryinstancename
+	 * @param string      $selfedit
+	 * @param bool        $storeInUtc
+	 *
+	 * @throws \Mouf\MoufException
+	 */
+	public static function generateDaos(MoufManager $moufManager, $name, $daonamespace, $beannamespace, $daofactoryclassname, $daofactoryinstancename, $selfedit = 'false', $storeInUtc = null, $useCustomComposer = null, $composerFile = null)
+	{
+		$moufManager->setVariable('tdbmDefaultDaoNamespace_'.$name, $daonamespace);
+		$moufManager->setVariable('tdbmDefaultBeanNamespace_'.$name, $beannamespace);
+		$moufManager->setVariable('tdbmDefaultDaoFactoryName_'.$name, $daofactoryclassname);
+		$moufManager->setVariable('tdbmDefaultDaoFactoryInstanceName_'.$name, $daofactoryinstancename);
+		$moufManager->setVariable('tdbmDefaultStoreInUtc_'.$name, $storeInUtc);
+		$moufManager->setVariable('tdbmDefaultUseCustomComposer_'.$name, $useCustomComposer);
+		$moufManager->setVariable('tdbmDefaultComposerFile_'.$name, $composerFile);
+
+		// In case of instance renaming, let's use the last used settings
+		$moufManager->setVariable('tdbmDefaultDaoNamespace', $daonamespace);
+		$moufManager->setVariable('tdbmDefaultBeanNamespace', $beannamespace);
+		$moufManager->setVariable('tdbmDefaultDaoFactoryName', $daofactoryclassname);
+		$moufManager->setVariable('tdbmDefaultDaoFactoryInstanceName', $daofactoryinstancename);
+		$moufManager->setVariable('tdbmDefaultStoreInUtc', $storeInUtc);
+		$moufManager->setVariable('tdbmDefaultUseCustomComposer', $useCustomComposer);
+		$moufManager->setVariable('tdbmDefaultComposerFile', $composerFile);
+
+		// Remove first and last slash in namespace.
+		$daonamespace = trim($daonamespace, '\\');
+		$beannamespace = trim($beannamespace, '\\');
+
+		$tdbmService = new InstanceProxy($name);
+		/* @var $tdbmService TDBMService */
+		$tables = $tdbmService->generateAllDaosAndBeans($daofactoryclassname, $daonamespace, $beannamespace, $storeInUtc, ($useCustomComposer ? $composerFile : null));
+
+		$moufManager->declareComponent($daofactoryinstancename, $daonamespace.'\\Generated\\'.$daofactoryclassname, false, MoufManager::DECLARE_ON_EXIST_KEEP_INCOMING_LINKS);
+
+		$tableToBeanMap = [];
+
+		//$tdbmServiceDescriptor = $moufManager->getInstanceDescriptor('tdbmService');
+
+		foreach ($tables as $table) {
+			$daoName = TDBMDaoGenerator::getDaoNameFromTableName($table);
+
+			$instanceName = TDBMDaoGenerator::toVariableName($daoName);
+			if (!$moufManager->instanceExists($instanceName)) {
+				$moufManager->declareComponent($instanceName, $daonamespace.'\\'.$daoName);
+			}
+			$moufManager->setParameterViaConstructor($instanceName, 0, $name, 'object');
+			$moufManager->bindComponentViaSetter($daofactoryinstancename, 'set'.$daoName, $instanceName);
+
+			$tableToBeanMap[$table] = $beannamespace.'\\'.TDBMDaoGenerator::getBeanNameFromTableName($table);
+		}
+		$tdbmServiceDescriptor = $moufManager->getInstanceDescriptor($name);
+		$tdbmServiceDescriptor->getSetterProperty('setTableToBeanMap')->setValue($tableToBeanMap);
+		$moufManager->rewriteMouf();
+	}
 }

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

Indentation +127 added lines, -127 removed lines

@@ -9,131 +9,131 @@
  */
 abstract class AbstractBeanPropertyDescriptor
 {
-    /**
-     * @var Table
-     */
-    protected $table;
-
-    /**
-     * Whether to use the more complex name in case of conflict.
-     *
-     * @var bool
-     */
-    protected $alternativeName = false;
-
-    /**
-     * @param Table $table
-     */
-    public function __construct(Table $table)
-    {
-        $this->table = $table;
-    }
-
-    /**
-     * Use the more complex name in case of conflict.
-     */
-    public function useAlternativeName()
-    {
-        $this->alternativeName = true;
-    }
-
-    /**
-     * Returns the name of the class linked to this property or null if this is not a foreign key.
-     *
-     * @return null|string
-     */
-    abstract public function getClassName();
-
-    /**
-     * Returns the param annotation for this property (useful for constructor).
-     *
-     * @return string
-     */
-    abstract public function getParamAnnotation();
-
-    public function getVariableName()
-    {
-        return '$'.$this->getLowerCamelCaseName();
-    }
-
-    public function getLowerCamelCaseName()
-    {
-        return TDBMDaoGenerator::toVariableName($this->getUpperCamelCaseName());
-    }
-
-    abstract public function getUpperCamelCaseName();
-
-    public function getSetterName()
-    {
-        return 'set'.$this->getUpperCamelCaseName();
-    }
-
-    public function getGetterName()
-    {
-        return 'get'.$this->getUpperCamelCaseName();
-    }
-
-    /**
-     * Returns the PHP code used in the ben constructor for this property.
-     *
-     * @return string
-     */
-    public function getConstructorAssignCode()
-    {
-        $str = '        $this->%s(%s);';
-
-        return sprintf($str, $this->getSetterName(), $this->getVariableName());
-    }
-
-    /**
-     * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
-     *
-     * @return bool
-     */
-    abstract public function isCompulsory();
-
-    /**
-     * Returns true if the property has a default value.
-     *
-     * @return bool
-     */
-    abstract public function hasDefault();
-
-    /**
-     * Returns the code that assigns a value to its default value.
-     *
-     * @return string
-     *
-     * @throws \TDBMException
-     */
-    abstract public function assignToDefaultCode();
-
-    /**
-     * Returns true if the property is the primary key.
-     *
-     * @return bool
-     */
-    abstract public function isPrimaryKey();
-
-    /**
-     * @return Table
-     */
-    public function getTable()
-    {
-        return $this->table;
-    }
-
-    /**
-     * Returns the PHP code for getters and setters.
-     *
-     * @return string
-     */
-    abstract public function getGetterSetterCode();
-
-    /**
-     * Returns the part of code useful when doing json serialization.
-     *
-     * @return string
-     */
-    abstract public function getJsonSerializeCode();
+	/**
+	 * @var Table
+	 */
+	protected $table;
+
+	/**
+	 * Whether to use the more complex name in case of conflict.
+	 *
+	 * @var bool
+	 */
+	protected $alternativeName = false;
+
+	/**
+	 * @param Table $table
+	 */
+	public function __construct(Table $table)
+	{
+		$this->table = $table;
+	}
+
+	/**
+	 * Use the more complex name in case of conflict.
+	 */
+	public function useAlternativeName()
+	{
+		$this->alternativeName = true;
+	}
+
+	/**
+	 * Returns the name of the class linked to this property or null if this is not a foreign key.
+	 *
+	 * @return null|string
+	 */
+	abstract public function getClassName();
+
+	/**
+	 * Returns the param annotation for this property (useful for constructor).
+	 *
+	 * @return string
+	 */
+	abstract public function getParamAnnotation();
+
+	public function getVariableName()
+	{
+		return '$'.$this->getLowerCamelCaseName();
+	}
+
+	public function getLowerCamelCaseName()
+	{
+		return TDBMDaoGenerator::toVariableName($this->getUpperCamelCaseName());
+	}
+
+	abstract public function getUpperCamelCaseName();
+
+	public function getSetterName()
+	{
+		return 'set'.$this->getUpperCamelCaseName();
+	}
+
+	public function getGetterName()
+	{
+		return 'get'.$this->getUpperCamelCaseName();
+	}
+
+	/**
+	 * Returns the PHP code used in the ben constructor for this property.
+	 *
+	 * @return string
+	 */
+	public function getConstructorAssignCode()
+	{
+		$str = '        $this->%s(%s);';
+
+		return sprintf($str, $this->getSetterName(), $this->getVariableName());
+	}
+
+	/**
+	 * Returns true if the property is compulsory (and therefore should be fetched in the constructor).
+	 *
+	 * @return bool
+	 */
+	abstract public function isCompulsory();
+
+	/**
+	 * Returns true if the property has a default value.
+	 *
+	 * @return bool
+	 */
+	abstract public function hasDefault();
+
+	/**
+	 * Returns the code that assigns a value to its default value.
+	 *
+	 * @return string
+	 *
+	 * @throws \TDBMException
+	 */
+	abstract public function assignToDefaultCode();
+
+	/**
+	 * Returns true if the property is the primary key.
+	 *
+	 * @return bool
+	 */
+	abstract public function isPrimaryKey();
+
+	/**
+	 * @return Table
+	 */
+	public function getTable()
+	{
+		return $this->table;
+	}
+
+	/**
+	 * Returns the PHP code for getters and setters.
+	 *
+	 * @return string
+	 */
+	abstract public function getGetterSetterCode();
+
+	/**
+	 * Returns the part of code useful when doing json serialization.
+	 *
+	 * @return string
+	 */
+	abstract public function getJsonSerializeCode();
 }

src/Mouf/Database/TDBM/ResultIterator.php

Spacing +1 added lines, -1 removed lines

@@ -245,7 +245,7 @@
      */
     public function jsonSerialize($stopRecursion = false)
     {
-        return array_map(function (AbstractTDBMObject $item) use ($stopRecursion) {
+        return array_map(function(AbstractTDBMObject $item) use ($stopRecursion) {
             return $item->jsonSerialize($stopRecursion);
         }, $this->toArray());
     }

Indentation +281 added lines, -281 removed lines

@@ -32,285 +32,285 @@
  */
 class ResultIterator implements Result, \ArrayAccess, \JsonSerializable
 {
-    /**
-     * @var Statement
-     */
-    protected $statement;
-
-    private $objectStorage;
-    private $className;
-
-    private $tdbmService;
-    private $parameters;
-    private $magicQuery;
-
-    /**
-     * @var QueryFactory
-     */
-    private $queryFactory;
-
-    /**
-     * @var InnerResultIterator
-     */
-    private $innerResultIterator;
-
-    private $databasePlatform;
-
-    private $totalCount;
-
-    private $mode;
-
-    private $logger;
-
-    public function __construct(QueryFactory $queryFactory, array $parameters, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode, LoggerInterface $logger)
-    {
-        if ($mode !== null && $mode !== TDBMService::MODE_CURSOR && $mode !== TDBMService::MODE_ARRAY) {
-            throw new TDBMException("Unknown fetch mode: '".$mode."'");
-        }
-
-        $this->queryFactory = $queryFactory;
-        $this->objectStorage = $objectStorage;
-        $this->className = $className;
-        $this->tdbmService = $tdbmService;
-        $this->parameters = $parameters;
-        $this->magicQuery = $magicQuery;
-        $this->databasePlatform = $this->tdbmService->getConnection()->getDatabasePlatform();
-        $this->mode = $mode;
-        $this->logger = $logger;
-    }
-
-    protected function executeCountQuery()
-    {
-        $sql = $this->magicQuery->build($this->queryFactory->getMagicSqlCount(), $this->parameters);
-        $this->logger->debug('Running count query: '.$sql);
-        $this->totalCount = $this->tdbmService->getConnection()->fetchColumn($sql, $this->parameters);
-    }
-
-    /**
-     * 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->totalCount === null) {
-            $this->executeCountQuery();
-        }
-
-        return $this->totalCount;
-    }
-
-    /**
-     * 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);
-    }
-
-    /**
-     * 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->queryFactory->getMagicSql(), $this->parameters, null, null, $this->queryFactory->getColumnDescriptors(), $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery, $this->logger);
-            } else {
-                $this->innerResultIterator = new InnerResultArray($this->queryFactory->getMagicSql(), $this->parameters, null, null, $this->queryFactory->getColumnDescriptors(), $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery, $this->logger);
-            }
-        }
-
-        return $this->innerResultIterator;
-    }
-
-    /**
-     * @param int $offset
-     * @param int $limit
-     *
-     * @return PageIterator
-     */
-    public function take($offset, $limit)
-    {
-        return new PageIterator($this, $this->queryFactory->getMagicSql(), $this->parameters, $limit, $offset, $this->queryFactory->getColumnDescriptors(), $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery, $this->mode, $this->logger);
-    }
-
-    /**
-     * 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 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);
-    }
-
-    /**
-     * Specify data which should be serialized to JSON.
-     *
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     *
-     * @param bool $stopRecursion Parameter used internally by TDBM to
-     *                            stop embedded objects from embedding
-     *                            other objects
-     *
-     * @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($stopRecursion = false)
-    {
-        return array_map(function (AbstractTDBMObject $item) use ($stopRecursion) {
-            return $item->jsonSerialize($stopRecursion);
-        }, $this->toArray());
-    }
-
-    /**
-     * Returns only one value (the first) of the result set.
-     * Returns null if no value exists.
-     *
-     * @return mixed|null
-     */
-    public function first()
-    {
-        $page = $this->take(0, 1);
-        foreach ($page as $bean) {
-            return $bean;
-        }
-
-        return;
-    }
-
-    /**
-     * Sets the ORDER BY directive executed in SQL and returns a NEW ResultIterator.
-     *
-     * For instance:
-     *
-     *  $resultSet = $resultSet->withOrder('label ASC, status DESC');
-     *
-     * **Important:** TDBM does its best to protect you from SQL injection. In particular, it will only allow column names in the "ORDER BY" clause. This means you are safe to pass input from the user directly in the ORDER BY parameter.
-     * If you want to pass an expression to the ORDER BY clause, you will need to tell TDBM to stop checking for SQL injections. You do this by passing a `UncheckedOrderBy` object as a parameter:
-     *
-     *  $resultSet->withOrder(new UncheckedOrderBy('RAND()'))
-     *
-     * @param string|UncheckedOrderBy|null $orderBy
-     *
-     * @return ResultIterator
-     */
-    public function withOrder($orderBy) : ResultIterator
-    {
-        $clone = clone $this;
-        $clone->queryFactory = clone $this->queryFactory;
-        $clone->queryFactory->sort($orderBy);
-        $clone->innerResultIterator = null;
-
-        return $clone;
-    }
-
-    /**
-     * Sets new parameters for the SQL query and returns a NEW ResultIterator.
-     *
-     * For instance:
-     *
-     *  $resultSet = $resultSet->withParameters('label ASC, status DESC');
-     *
-     * @param string|UncheckedOrderBy|null $orderBy
-     *
-     * @return ResultIterator
-     */
-    public function withParameters(array $parameters) : ResultIterator
-    {
-        $clone = clone $this;
-        $clone->parameters = $parameters;
-        $clone->innerResultIterator = null;
-        $clone->totalCount = null;
-
-        return $clone;
-    }
+	/**
+	 * @var Statement
+	 */
+	protected $statement;
+
+	private $objectStorage;
+	private $className;
+
+	private $tdbmService;
+	private $parameters;
+	private $magicQuery;
+
+	/**
+	 * @var QueryFactory
+	 */
+	private $queryFactory;
+
+	/**
+	 * @var InnerResultIterator
+	 */
+	private $innerResultIterator;
+
+	private $databasePlatform;
+
+	private $totalCount;
+
+	private $mode;
+
+	private $logger;
+
+	public function __construct(QueryFactory $queryFactory, array $parameters, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode, LoggerInterface $logger)
+	{
+		if ($mode !== null && $mode !== TDBMService::MODE_CURSOR && $mode !== TDBMService::MODE_ARRAY) {
+			throw new TDBMException("Unknown fetch mode: '".$mode."'");
+		}
+
+		$this->queryFactory = $queryFactory;
+		$this->objectStorage = $objectStorage;
+		$this->className = $className;
+		$this->tdbmService = $tdbmService;
+		$this->parameters = $parameters;
+		$this->magicQuery = $magicQuery;
+		$this->databasePlatform = $this->tdbmService->getConnection()->getDatabasePlatform();
+		$this->mode = $mode;
+		$this->logger = $logger;
+	}
+
+	protected function executeCountQuery()
+	{
+		$sql = $this->magicQuery->build($this->queryFactory->getMagicSqlCount(), $this->parameters);
+		$this->logger->debug('Running count query: '.$sql);
+		$this->totalCount = $this->tdbmService->getConnection()->fetchColumn($sql, $this->parameters);
+	}
+
+	/**
+	 * 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->totalCount === null) {
+			$this->executeCountQuery();
+		}
+
+		return $this->totalCount;
+	}
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * 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->queryFactory->getMagicSql(), $this->parameters, null, null, $this->queryFactory->getColumnDescriptors(), $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery, $this->logger);
+			} else {
+				$this->innerResultIterator = new InnerResultArray($this->queryFactory->getMagicSql(), $this->parameters, null, null, $this->queryFactory->getColumnDescriptors(), $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery, $this->logger);
+			}
+		}
+
+		return $this->innerResultIterator;
+	}
+
+	/**
+	 * @param int $offset
+	 * @param int $limit
+	 *
+	 * @return PageIterator
+	 */
+	public function take($offset, $limit)
+	{
+		return new PageIterator($this, $this->queryFactory->getMagicSql(), $this->parameters, $limit, $offset, $this->queryFactory->getColumnDescriptors(), $this->objectStorage, $this->className, $this->tdbmService, $this->magicQuery, $this->mode, $this->logger);
+	}
+
+	/**
+	 * 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 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);
+	}
+
+	/**
+	 * Specify data which should be serialized to JSON.
+	 *
+	 * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+	 *
+	 * @param bool $stopRecursion Parameter used internally by TDBM to
+	 *                            stop embedded objects from embedding
+	 *                            other objects
+	 *
+	 * @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($stopRecursion = false)
+	{
+		return array_map(function (AbstractTDBMObject $item) use ($stopRecursion) {
+			return $item->jsonSerialize($stopRecursion);
+		}, $this->toArray());
+	}
+
+	/**
+	 * Returns only one value (the first) of the result set.
+	 * Returns null if no value exists.
+	 *
+	 * @return mixed|null
+	 */
+	public function first()
+	{
+		$page = $this->take(0, 1);
+		foreach ($page as $bean) {
+			return $bean;
+		}
+
+		return;
+	}
+
+	/**
+	 * Sets the ORDER BY directive executed in SQL and returns a NEW ResultIterator.
+	 *
+	 * For instance:
+	 *
+	 *  $resultSet = $resultSet->withOrder('label ASC, status DESC');
+	 *
+	 * **Important:** TDBM does its best to protect you from SQL injection. In particular, it will only allow column names in the "ORDER BY" clause. This means you are safe to pass input from the user directly in the ORDER BY parameter.
+	 * If you want to pass an expression to the ORDER BY clause, you will need to tell TDBM to stop checking for SQL injections. You do this by passing a `UncheckedOrderBy` object as a parameter:
+	 *
+	 *  $resultSet->withOrder(new UncheckedOrderBy('RAND()'))
+	 *
+	 * @param string|UncheckedOrderBy|null $orderBy
+	 *
+	 * @return ResultIterator
+	 */
+	public function withOrder($orderBy) : ResultIterator
+	{
+		$clone = clone $this;
+		$clone->queryFactory = clone $this->queryFactory;
+		$clone->queryFactory->sort($orderBy);
+		$clone->innerResultIterator = null;
+
+		return $clone;
+	}
+
+	/**
+	 * Sets new parameters for the SQL query and returns a NEW ResultIterator.
+	 *
+	 * For instance:
+	 *
+	 *  $resultSet = $resultSet->withParameters('label ASC, status DESC');
+	 *
+	 * @param string|UncheckedOrderBy|null $orderBy
+	 *
+	 * @return ResultIterator
+	 */
+	public function withParameters(array $parameters) : ResultIterator
+	{
+		$clone = clone $this;
+		$clone->parameters = $parameters;
+		$clone->innerResultIterator = null;
+		$clone->totalCount = null;
+
+		return $clone;
+	}
 }

src/Mouf/Database/TDBM/Controllers/TdbmInstallController.php

Indentation +164 added lines, -164 removed lines

@@ -15,168 +15,168 @@
  */
 class TdbmInstallController extends Controller
 {
-    /**
-     * @var HtmlBlock
-     */
-    public $content;
-
-    public $selfedit;
-
-    /**
-     * The active MoufManager to be edited/viewed.
-     *
-     * @var MoufManager
-     */
-    public $moufManager;
-
-    /**
-     * The template used by the main page for mouf.
-     *
-     * @Property
-     * @Compulsory
-     *
-     * @var TemplateInterface
-     */
-    public $template;
-
-    /**
-     * Displays the first install screen.
-     *
-     * @Action
-     * @Logged
-     *
-     * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
-     */
-    public function defaultAction($selfedit = 'false')
-    {
-        $this->selfedit = $selfedit;
-
-        if ($selfedit == 'true') {
-            $this->moufManager = MoufManager::getMoufManager();
-        } else {
-            $this->moufManager = MoufManager::getMoufManagerHiddenInstance();
-        }
-
-        $this->content->addFile(dirname(__FILE__).'/../../../../views/installStep1.php', $this);
-        $this->template->toHtml();
-    }
-
-    /**
-     * Skips the install process.
-     *
-     * @Action
-     * @Logged
-     *
-     * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
-     */
-    public function skip($selfedit = 'false')
-    {
-        InstallUtils::continueInstall($selfedit == 'true');
-    }
-
-    protected $daoNamespace;
-    protected $beanNamespace;
-    protected $autoloadDetected;
-    protected $storeInUtc;
-    protected $useCustomComposer = false;
-
-    /**
-     * Displays the second install screen.
-     *
-     * @Action
-     * @Logged
-     *
-     * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
-     */
-    public function configure($selfedit = 'false')
-    {
-        $this->selfedit = $selfedit;
-
-        if ($selfedit == 'true') {
-            $this->moufManager = MoufManager::getMoufManager();
-        } else {
-            $this->moufManager = MoufManager::getMoufManagerHiddenInstance();
-        }
-
-        // Let's start by performing basic checks about the instances we assume to exist.
-        if (!$this->moufManager->instanceExists('dbalConnection')) {
-            $this->displayErrorMsg("The TDBM install process assumes your database connection instance is already created, and that the name of this instance is 'dbalConnection'. Could not find the 'dbalConnection' instance.");
-
-            return;
-        }
-
-        $this->daoNamespace = $this->moufManager->getVariable('tdbmDefaultDaoNamespace_tdbmService');
-        $this->beanNamespace = $this->moufManager->getVariable('tdbmDefaultBeanNamespace_tdbmService');
-
-        if ($this->daoNamespace == null && $this->beanNamespace == null) {
-            $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
-
-            $autoloadNamespaces = $classNameMapper->getManagedNamespaces();
-            if ($autoloadNamespaces) {
-                $this->autoloadDetected = true;
-                $rootNamespace = $autoloadNamespaces[0];
-                $this->daoNamespace = $rootNamespace.'Model\\Dao';
-                $this->beanNamespace = $rootNamespace.'Model\\Bean';
-            } else {
-                $this->autoloadDetected = false;
-                $this->daoNamespace = 'YourApplication\\Model\\Dao';
-                $this->beanNamespace = 'YourApplication\\Model\\Bean';
-            }
-        } else {
-            $this->autoloadDetected = true;
-        }
-        $this->defaultPath = true;
-        $this->storePath = '';
-
-        $this->castDatesToDateTime = true;
-
-        $this->content->addFile(dirname(__FILE__).'/../../../../views/installStep2.php', $this);
-        $this->template->toHtml();
-    }
-
-    /**
-     * This action generates the TDBM instance, then the DAOs and Beans.
-     *
-     * @Action
-     *
-     * @param string $daonamespace
-     * @param string $beannamespace
-     * @param int    $storeInUtc
-     * @param string $selfedit
-     *
-     * @throws \Mouf\MoufException
-     */
-    public function generate($daonamespace, $beannamespace, $storeInUtc = 0, $selfedit = 'false', $defaultPath = false, $storePath = '')
-    {
-        $this->selfedit = $selfedit;
-
-        if ($selfedit == 'true') {
-            $this->moufManager = MoufManager::getMoufManager();
-        } else {
-            $this->moufManager = MoufManager::getMoufManagerHiddenInstance();
-        }
-
-        $doctrineCache = $this->moufManager->getInstanceDescriptor('defaultDoctrineCache');
-
-        if (!$this->moufManager->instanceExists('tdbmService')) {
-            $tdbmService = $this->moufManager->createInstance('Mouf\\Database\\TDBM\\TDBMService')->setName('tdbmService');
-            $tdbmService->getConstructorArgumentProperty('connection')->setValue($this->moufManager->getInstanceDescriptor('dbalConnection'));
-            $tdbmService->getConstructorArgumentProperty('cache')->setValue($doctrineCache);
-        }
-
-        $this->moufManager->rewriteMouf();
-
-        TdbmController::generateDaos($this->moufManager, 'tdbmService', $daonamespace, $beannamespace, 'DaoFactory', 'daoFactory', $selfedit, $storeInUtc, $defaultPath, $storePath);
-
-        InstallUtils::continueInstall($selfedit == 'true');
-    }
-
-    protected $errorMsg;
-
-    private function displayErrorMsg($msg)
-    {
-        $this->errorMsg = $msg;
-        $this->content->addFile(dirname(__FILE__).'/../../../../views/installError.php', $this);
-        $this->template->toHtml();
-    }
+	/**
+	 * @var HtmlBlock
+	 */
+	public $content;
+
+	public $selfedit;
+
+	/**
+	 * The active MoufManager to be edited/viewed.
+	 *
+	 * @var MoufManager
+	 */
+	public $moufManager;
+
+	/**
+	 * The template used by the main page for mouf.
+	 *
+	 * @Property
+	 * @Compulsory
+	 *
+	 * @var TemplateInterface
+	 */
+	public $template;
+
+	/**
+	 * Displays the first install screen.
+	 *
+	 * @Action
+	 * @Logged
+	 *
+	 * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
+	 */
+	public function defaultAction($selfedit = 'false')
+	{
+		$this->selfedit = $selfedit;
+
+		if ($selfedit == 'true') {
+			$this->moufManager = MoufManager::getMoufManager();
+		} else {
+			$this->moufManager = MoufManager::getMoufManagerHiddenInstance();
+		}
+
+		$this->content->addFile(dirname(__FILE__).'/../../../../views/installStep1.php', $this);
+		$this->template->toHtml();
+	}
+
+	/**
+	 * Skips the install process.
+	 *
+	 * @Action
+	 * @Logged
+	 *
+	 * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
+	 */
+	public function skip($selfedit = 'false')
+	{
+		InstallUtils::continueInstall($selfedit == 'true');
+	}
+
+	protected $daoNamespace;
+	protected $beanNamespace;
+	protected $autoloadDetected;
+	protected $storeInUtc;
+	protected $useCustomComposer = false;
+
+	/**
+	 * Displays the second install screen.
+	 *
+	 * @Action
+	 * @Logged
+	 *
+	 * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
+	 */
+	public function configure($selfedit = 'false')
+	{
+		$this->selfedit = $selfedit;
+
+		if ($selfedit == 'true') {
+			$this->moufManager = MoufManager::getMoufManager();
+		} else {
+			$this->moufManager = MoufManager::getMoufManagerHiddenInstance();
+		}
+
+		// Let's start by performing basic checks about the instances we assume to exist.
+		if (!$this->moufManager->instanceExists('dbalConnection')) {
+			$this->displayErrorMsg("The TDBM install process assumes your database connection instance is already created, and that the name of this instance is 'dbalConnection'. Could not find the 'dbalConnection' instance.");
+
+			return;
+		}
+
+		$this->daoNamespace = $this->moufManager->getVariable('tdbmDefaultDaoNamespace_tdbmService');
+		$this->beanNamespace = $this->moufManager->getVariable('tdbmDefaultBeanNamespace_tdbmService');
+
+		if ($this->daoNamespace == null && $this->beanNamespace == null) {
+			$classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
+
+			$autoloadNamespaces = $classNameMapper->getManagedNamespaces();
+			if ($autoloadNamespaces) {
+				$this->autoloadDetected = true;
+				$rootNamespace = $autoloadNamespaces[0];
+				$this->daoNamespace = $rootNamespace.'Model\\Dao';
+				$this->beanNamespace = $rootNamespace.'Model\\Bean';
+			} else {
+				$this->autoloadDetected = false;
+				$this->daoNamespace = 'YourApplication\\Model\\Dao';
+				$this->beanNamespace = 'YourApplication\\Model\\Bean';
+			}
+		} else {
+			$this->autoloadDetected = true;
+		}
+		$this->defaultPath = true;
+		$this->storePath = '';
+
+		$this->castDatesToDateTime = true;
+
+		$this->content->addFile(dirname(__FILE__).'/../../../../views/installStep2.php', $this);
+		$this->template->toHtml();
+	}
+
+	/**
+	 * This action generates the TDBM instance, then the DAOs and Beans.
+	 *
+	 * @Action
+	 *
+	 * @param string $daonamespace
+	 * @param string $beannamespace
+	 * @param int    $storeInUtc
+	 * @param string $selfedit
+	 *
+	 * @throws \Mouf\MoufException
+	 */
+	public function generate($daonamespace, $beannamespace, $storeInUtc = 0, $selfedit = 'false', $defaultPath = false, $storePath = '')
+	{
+		$this->selfedit = $selfedit;
+
+		if ($selfedit == 'true') {
+			$this->moufManager = MoufManager::getMoufManager();
+		} else {
+			$this->moufManager = MoufManager::getMoufManagerHiddenInstance();
+		}
+
+		$doctrineCache = $this->moufManager->getInstanceDescriptor('defaultDoctrineCache');
+
+		if (!$this->moufManager->instanceExists('tdbmService')) {
+			$tdbmService = $this->moufManager->createInstance('Mouf\\Database\\TDBM\\TDBMService')->setName('tdbmService');
+			$tdbmService->getConstructorArgumentProperty('connection')->setValue($this->moufManager->getInstanceDescriptor('dbalConnection'));
+			$tdbmService->getConstructorArgumentProperty('cache')->setValue($doctrineCache);
+		}
+
+		$this->moufManager->rewriteMouf();
+
+		TdbmController::generateDaos($this->moufManager, 'tdbmService', $daonamespace, $beannamespace, 'DaoFactory', 'daoFactory', $selfedit, $storeInUtc, $defaultPath, $storePath);
+
+		InstallUtils::continueInstall($selfedit == 'true');
+	}
+
+	protected $errorMsg;
+
+	private function displayErrorMsg($msg)
+	{
+		$this->errorMsg = $msg;
+		$this->content->addFile(dirname(__FILE__).'/../../../../views/installError.php', $this);
+		$this->template->toHtml();
+	}
 }