thecodingmachine / database.tdbm

src/Mouf/Database/TDBM/InnerResultIterator.php

Indentation +263 added lines, -263 removed lines

@@ -29,267 +29,267 @@
  */
 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;
-
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
-
-    public function __construct($magicSql, array $parameters, $limit, $offset, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, LoggerInterface $logger)
-    {
-        $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->logger = $logger;
-    }
-
-    protected function executeQuery()
-    {
-        $sql = $this->magicQuery->build($this->magicSql, $this->parameters);
-        $sql = $this->tdbmService->getConnection()->getDatabasePlatform()->modifyLimitQuery($sql, $this->limit, $this->offset);
-
-        $this->logger->debug('Running SQL request: '.$sql);
-
-        $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];
-
-                if ($columnDescriptor['tableGroup'] === null) {
-                    // A column can have no tableGroup (if it comes from an ORDER BY expression)
-                    continue;
-                }
-
-                // 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, $tablesUsed) = $this->tdbmService->_getClassNameFromBeanData($beanData);
-
-                if ($this->className !== null) {
-                    $actualClassName = $this->className;
-                }
-
-                // Let's filter out the beanData that is not used (because it belongs to a part of the hierarchy that is not fetched:
-                foreach ($beanData as $tableName => $descriptors) {
-                    if (!in_array($tableName, $tablesUsed)) {
-                        unset($beanData[$tableName]);
-                    }
-                }
-
-                // 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;
+
+	/**
+	 * @var LoggerInterface
+	 */
+	private $logger;
+
+	public function __construct($magicSql, array $parameters, $limit, $offset, array $columnDescriptors, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, LoggerInterface $logger)
+	{
+		$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->logger = $logger;
+	}
+
+	protected function executeQuery()
+	{
+		$sql = $this->magicQuery->build($this->magicSql, $this->parameters);
+		$sql = $this->tdbmService->getConnection()->getDatabasePlatform()->modifyLimitQuery($sql, $this->limit, $this->offset);
+
+		$this->logger->debug('Running SQL request: '.$sql);
+
+		$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];
+
+				if ($columnDescriptor['tableGroup'] === null) {
+					// A column can have no tableGroup (if it comes from an ORDER BY expression)
+					continue;
+				}
+
+				// 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, $tablesUsed) = $this->tdbmService->_getClassNameFromBeanData($beanData);
+
+				if ($this->className !== null) {
+					$actualClassName = $this->className;
+				}
+
+				// Let's filter out the beanData that is not used (because it belongs to a part of the hierarchy that is not fetched:
+				foreach ($beanData as $tableName => $descriptors) {
+					if (!in_array($tableName, $tablesUsed)) {
+						unset($beanData[$tableName]);
+					}
+				}
+
+				// 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/OrderByAnalyzer.php

Indentation +118 added lines, -118 removed lines

@@ -12,122 +12,122 @@
  */
 class OrderByAnalyzer
 {
-    /**
-     * The content of the cache variable.
-     *
-     * @var Cache
-     */
-    private $cache;
-
-    /**
-     * @var string
-     */
-    private $cachePrefix;
-
-    /**
-     * OrderByAnalyzer constructor.
-     *
-     * @param Cache       $cache
-     * @param string|null $cachePrefix
-     */
-    public function __construct(Cache $cache, $cachePrefix = null)
-    {
-        $this->cache = $cache;
-        $this->cachePrefix = $cachePrefix;
-    }
-
-    /**
-     * Returns an array for each sorted "column" in the form:.
-     *
-     * [
-     *      [
-     *          'type' => 'colref',
-     *          'table' => null,
-     *          'column' => 'a',
-     *          'direction' => 'ASC'
-     *      ],
-     *      [
-     *          'type' => 'expr',
-     *          'expr' => 'RAND()',
-     *          'direction' => 'DESC'
-     *      ]
-     * ]
-     *
-     * @param string $orderBy
-     *
-     * @return array
-     */
-    public function analyzeOrderBy(string $orderBy) : array
-    {
-        $key = $this->cachePrefix.'_order_by_analysis_'.$orderBy;
-        $results = $this->cache->fetch($key);
-        if ($results !== false) {
-            return $results;
-        }
-        $results = $this->analyzeOrderByNoCache($orderBy);
-        $this->cache->save($key, $results);
-
-        return $results;
-    }
-
-    private function analyzeOrderByNoCache(string $orderBy) : array
-    {
-        $sqlParser = new PHPSQLParser();
-        $sql = 'SELECT 1 FROM a ORDER BY '.$orderBy;
-        $parsed = $sqlParser->parse($sql, true);
-
-        $results = [];
-
-        for ($i = 0, $count = count($parsed['ORDER']); $i < $count; ++$i) {
-            $orderItem = $parsed['ORDER'][$i];
-            if ($orderItem['expr_type'] === 'colref') {
-                $parts = $orderItem['no_quotes']['parts'];
-                $columnName = array_pop($parts);
-                if (!empty($parts)) {
-                    $tableName = array_pop($parts);
-                } else {
-                    $tableName = null;
-                }
-
-                $results[] = [
-                    'type' => 'colref',
-                    'table' => $tableName,
-                    'column' => $columnName,
-                    'direction' => $orderItem['direction'],
-                ];
-            } else {
-                $position = $orderItem['position'];
-                if ($i + 1 < $count) {
-                    $nextPosition = $parsed['ORDER'][$i + 1]['position'];
-                    $str = substr($sql, $position, $nextPosition - $position);
-                } else {
-                    $str = substr($sql, $position);
-                }
-
-                $str = trim($str, " \t\r\n,");
-
-                $results[] = [
-                    'type' => 'expr',
-                    'expr' => $this->trimDirection($str),
-                    'direction' => $orderItem['direction'],
-                ];
-            }
-        }
-
-        return $results;
-    }
-
-    /**
-     * Trims the ASC/DESC direction at the end of the string.
-     *
-     * @param string $sql
-     *
-     * @return string
-     */
-    private function trimDirection(string $sql) : string
-    {
-        preg_match('/^(.*)(\s+(DESC|ASC|))*$/Ui', $sql, $matches);
-
-        return $matches[1];
-    }
+	/**
+	 * The content of the cache variable.
+	 *
+	 * @var Cache
+	 */
+	private $cache;
+
+	/**
+	 * @var string
+	 */
+	private $cachePrefix;
+
+	/**
+	 * OrderByAnalyzer constructor.
+	 *
+	 * @param Cache       $cache
+	 * @param string|null $cachePrefix
+	 */
+	public function __construct(Cache $cache, $cachePrefix = null)
+	{
+		$this->cache = $cache;
+		$this->cachePrefix = $cachePrefix;
+	}
+
+	/**
+	 * Returns an array for each sorted "column" in the form:.
+	 *
+	 * [
+	 *      [
+	 *          'type' => 'colref',
+	 *          'table' => null,
+	 *          'column' => 'a',
+	 *          'direction' => 'ASC'
+	 *      ],
+	 *      [
+	 *          'type' => 'expr',
+	 *          'expr' => 'RAND()',
+	 *          'direction' => 'DESC'
+	 *      ]
+	 * ]
+	 *
+	 * @param string $orderBy
+	 *
+	 * @return array
+	 */
+	public function analyzeOrderBy(string $orderBy) : array
+	{
+		$key = $this->cachePrefix.'_order_by_analysis_'.$orderBy;
+		$results = $this->cache->fetch($key);
+		if ($results !== false) {
+			return $results;
+		}
+		$results = $this->analyzeOrderByNoCache($orderBy);
+		$this->cache->save($key, $results);
+
+		return $results;
+	}
+
+	private function analyzeOrderByNoCache(string $orderBy) : array
+	{
+		$sqlParser = new PHPSQLParser();
+		$sql = 'SELECT 1 FROM a ORDER BY '.$orderBy;
+		$parsed = $sqlParser->parse($sql, true);
+
+		$results = [];
+
+		for ($i = 0, $count = count($parsed['ORDER']); $i < $count; ++$i) {
+			$orderItem = $parsed['ORDER'][$i];
+			if ($orderItem['expr_type'] === 'colref') {
+				$parts = $orderItem['no_quotes']['parts'];
+				$columnName = array_pop($parts);
+				if (!empty($parts)) {
+					$tableName = array_pop($parts);
+				} else {
+					$tableName = null;
+				}
+
+				$results[] = [
+					'type' => 'colref',
+					'table' => $tableName,
+					'column' => $columnName,
+					'direction' => $orderItem['direction'],
+				];
+			} else {
+				$position = $orderItem['position'];
+				if ($i + 1 < $count) {
+					$nextPosition = $parsed['ORDER'][$i + 1]['position'];
+					$str = substr($sql, $position, $nextPosition - $position);
+				} else {
+					$str = substr($sql, $position);
+				}
+
+				$str = trim($str, " \t\r\n,");
+
+				$results[] = [
+					'type' => 'expr',
+					'expr' => $this->trimDirection($str),
+					'direction' => $orderItem['direction'],
+				];
+			}
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Trims the ASC/DESC direction at the end of the string.
+	 *
+	 * @param string $sql
+	 *
+	 * @return string
+	 */
+	private function trimDirection(string $sql) : string
+	{
+		preg_match('/^(.*)(\s+(DESC|ASC|))*$/Ui', $sql, $matches);
+
+		return $matches[1];
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -78,7 +78,7 @@ 
 
         $results = [];
 
-        for ($i = 0, $count = count($parsed['ORDER']); $i < $count; ++$i) {
+        for ($i = 0, $count = count($parsed['ORDER']); $i<$count; ++$i) {
             $orderItem = $parsed['ORDER'][$i];
             if ($orderItem['expr_type'] === 'colref') {
                 $parts = $orderItem['no_quotes']['parts'];
@@ -97,9 +97,9 @@ 
                 ];
             } else {
                 $position = $orderItem['position'];
-                if ($i + 1 < $count) {
-                    $nextPosition = $parsed['ORDER'][$i + 1]['position'];
-                    $str = substr($sql, $position, $nextPosition - $position);
+                if ($i+1<$count) {
+                    $nextPosition = $parsed['ORDER'][$i+1]['position'];
+                    $str = substr($sql, $position, $nextPosition-$position);
                 } else {
                     $str = substr($sql, $position);
                 }

src/Mouf/Database/TDBM/TDBMService.php

Doc Comments +2 added lines, -2 removed lines

@@ -1301,7 +1301,7 @@ 
      * @param string                       $mainTable             The name of the table queried
      * @param string|array|null            $filter                The SQL filters to apply to the query (the WHERE part). Columns from tables different from $mainTable must be prefixed by the table name (in the form: table.column)
      * @param array                        $parameters
-     * @param string|UncheckedOrderBy|null $orderString           The ORDER BY part of the query. Columns from tables different from $mainTable must be prefixed by the table name (in the form: table.column)
+     * @param string|null $orderString           The ORDER BY part of the query. Columns from tables different from $mainTable must be prefixed by the table name (in the form: table.column)
      * @param array                        $additionalTablesFetch
      * @param int                          $mode
      * @param string                       $className             Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned
@@ -1769,7 +1769,7 @@ 
      * @param $pivotTableName
      * @param AbstractTDBMObject $bean
      *
-     * @return AbstractTDBMObject[]
+     * @return ResultIterator
      */
     public function _getRelatedBeans(string $pivotTableName, AbstractTDBMObject $bean)
     {

Spacing +7 added lines, -7 removed lines

@@ -1064,7 +1064,7 @@ 
         sort($tables);
 
         return $this->fromCache($this->cachePrefix.'_linkbetweeninheritedtables_'.implode('__split__', $tables),
-            function () use ($tables) {
+            function() use ($tables) {
                 return $this->_getLinkBetweenInheritedTablesWithoutCache($tables);
             });
     }
@@ -1111,7 +1111,7 @@ 
      */
     public function _getRelatedTablesByInheritance($table)
     {
-        return $this->fromCache($this->cachePrefix.'_relatedtables_'.$table, function () use ($table) {
+        return $this->fromCache($this->cachePrefix.'_relatedtables_'.$table, function() use ($table) {
             return $this->_getRelatedTablesByInheritanceWithoutCache($table);
         });
     }
@@ -1358,7 +1358,7 @@ 
         $objects = $this->findObjects($mainTable, $filter, $parameters, null, $additionalTablesFetch, self::MODE_ARRAY, $className);
         $page = $objects->take(0, 2);
         $count = $page->count();
-        if ($count > 1) {
+        if ($count>1) {
             throw new DuplicateRowException("Error while querying an object for table '$mainTable': More than 1 row have been returned, but we should have received at most one.");
         } elseif ($count === 0) {
             return;
@@ -1385,7 +1385,7 @@ 
         $objects = $this->findObjectsFromSql($mainTable, $from, $filter, $parameters, null, self::MODE_ARRAY, $className);
         $page = $objects->take(0, 2);
         $count = $page->count();
-        if ($count > 1) {
+        if ($count>1) {
             throw new DuplicateRowException("Error while querying an object for table '$mainTable': More than 1 row have been returned, but we should have received at most one.");
         } elseif ($count === 0) {
             return;
@@ -1503,7 +1503,7 @@ 
         $remoteTable = $remoteFk->getForeignTableName();
 
         $primaryKeys = $this->getPrimaryKeyValues($bean);
-        $columnNames = array_map(function ($name) use ($pivotTableName) {
+        $columnNames = array_map(function($name) use ($pivotTableName) {
             return $pivotTableName.'.'.$name;
         }, $localFk->getLocalColumns());
 
@@ -1526,7 +1526,7 @@ 
         $table1 = $fks[0]->getForeignTableName();
         $table2 = $fks[1]->getForeignTableName();
 
-        $beanTables = array_map(function (DbRow $dbRow) {
+        $beanTables = array_map(function(DbRow $dbRow) {
             return $dbRow->_getDbTableName();
         }, $bean->_getDbRows());
 
@@ -1584,7 +1584,7 @@ 
     {
         if (!isset($typesForTable[$tableName])) {
             $columns = $this->tdbmSchemaAnalyzer->getSchema()->getTable($tableName)->getColumns();
-            $typesForTable[$tableName] = array_map(function (Column $column) {
+            $typesForTable[$tableName] = array_map(function(Column $column) {
                 return $column->getType();
             }, $columns);
         }

Unused Use Statements -2 removed lines

@@ -21,11 +21,9 @@
 namespace Mouf\Database\TDBM;
 
 use Doctrine\Common\Cache\Cache;
-use Doctrine\Common\Cache\VoidCache;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\ForeignKeyConstraint;
-use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Types\Type;
 use Mouf\Database\MagicQuery;

Indentation +1364 added lines, -1364 removed lines

@@ -48,384 +48,384 @@ 
  */
 class TDBMService
 {
-    const MODE_CURSOR = 1;
-    const MODE_ARRAY = 2;
-
-    /**
-     * The database connection.
-     *
-     * @var Connection
-     */
-    private $connection;
-
-    /**
-     * @var SchemaAnalyzer
-     */
-    private $schemaAnalyzer;
-
-    /**
-     * @var MagicQuery
-     */
-    private $magicQuery;
-
-    /**
-     * @var TDBMSchemaAnalyzer
-     */
-    private $tdbmSchemaAnalyzer;
-
-    /**
-     * @var string
-     */
-    private $cachePrefix;
-
-    /**
-     * Cache of table of primary keys.
-     * Primary keys are stored by tables, as an array of column.
-     * For instance $primary_key['my_table'][0] will return the first column of the primary key of table 'my_table'.
-     *
-     * @var string[]
-     */
-    private $primaryKeysColumns;
-
-    /**
-     * Service storing objects in memory.
-     * Access is done by table name and then by primary key.
-     * If the primary key is split on several columns, access is done by an array of columns, serialized.
-     *
-     * @var StandardObjectStorage|WeakrefObjectStorage
-     */
-    private $objectStorage;
-
-    /**
-     * The fetch mode of the result sets returned by `getObjects`.
-     * Can be one of: TDBMObjectArray::MODE_CURSOR or TDBMObjectArray::MODE_ARRAY or TDBMObjectArray::MODE_COMPATIBLE_ARRAY.
-     *
-     * In 'MODE_ARRAY' mode (default), the result is an array. Use this mode by default (unless the list returned is very big).
-     * In 'MODE_CURSOR' mode, the result is a Generator which is an iterable collection that can be scanned only once (only one "foreach") on it,
-     * and it cannot be accessed via key. Use this mode for large datasets processed by batch.
-     * In 'MODE_COMPATIBLE_ARRAY' mode, the result is an old TDBMObjectArray (used up to TDBM 3.2).
-     * You can access the array by key, or using foreach, several times.
-     *
-     * @var int
-     */
-    private $mode = self::MODE_ARRAY;
-
-    /**
-     * Table of new objects not yet inserted in database or objects modified that must be saved.
-     *
-     * @var \SplObjectStorage of DbRow objects
-     */
-    private $toSaveObjects;
-
-    /**
-     * A cache service to be used.
-     *
-     * @var Cache|null
-     */
-    private $cache;
-
-    /**
-     * Map associating a table name to a fully qualified Bean class name.
-     *
-     * @var array
-     */
-    private $tableToBeanMap = [];
-
-    /**
-     * @var \ReflectionClass[]
-     */
-    private $reflectionClassCache = array();
-
-    /**
-     * @var LoggerInterface
-     */
-    private $rootLogger;
-
-    /**
-     * @var LevelFilter|NullLogger
-     */
-    private $logger;
-
-    /**
-     * @var OrderByAnalyzer
-     */
-    private $orderByAnalyzer;
-
-    /**
-     * @var string
-     */
-    private $beanNamespace;
-
-    /**
-     * @var NamingStrategyInterface
-     */
-    private $namingStrategy;
-    /**
-     * @var ConfigurationInterface
-     */
-    private $configuration;
-
-    /**
-     * @param ConfigurationInterface $configuration The configuration object
-     */
-    public function __construct(ConfigurationInterface $configuration /*Connection $connection, Cache $cache = null, SchemaAnalyzer $schemaAnalyzer = null, LoggerInterface $logger = null*/)
-    {
-        if (extension_loaded('weakref')) {
-            $this->objectStorage = new WeakrefObjectStorage();
-        } else {
-            $this->objectStorage = new StandardObjectStorage();
-        }
-        $this->connection = $configuration->getConnection();
-        $this->cache = $configuration->getCache();
-        $this->schemaAnalyzer = $configuration->getSchemaAnalyzer();
-
-        $this->magicQuery = new MagicQuery($this->connection, $this->cache, $this->schemaAnalyzer);
-
-        $this->tdbmSchemaAnalyzer = new TDBMSchemaAnalyzer($this->connection, $this->cache, $this->schemaAnalyzer);
-        $this->cachePrefix = $this->tdbmSchemaAnalyzer->getCachePrefix();
-
-        $this->toSaveObjects = new \SplObjectStorage();
-        $logger = $configuration->getLogger();
-        if ($logger === null) {
-            $this->logger = new NullLogger();
-            $this->rootLogger = new NullLogger();
-        } else {
-            $this->rootLogger = $logger;
-            $this->setLogLevel(LogLevel::WARNING);
-        }
-        $this->orderByAnalyzer = new OrderByAnalyzer($this->cache, $this->cachePrefix);
-        $this->beanNamespace = $configuration->getBeanNamespace();
-        $this->namingStrategy = $configuration->getNamingStrategy();
-        $this->configuration = $configuration;
-    }
-
-    /**
-     * Returns the object used to connect to the database.
-     *
-     * @return Connection
-     */
-    public function getConnection(): Connection
-    {
-        return $this->connection;
-    }
-
-    /**
-     * Sets the default fetch mode of the result sets returned by `findObjects`.
-     * Can be one of: TDBMObjectArray::MODE_CURSOR or TDBMObjectArray::MODE_ARRAY.
-     *
-     * In 'MODE_ARRAY' mode (default), the result is a ResultIterator object that behaves like an array. Use this mode by default (unless the list returned is very big).
-     * In 'MODE_CURSOR' mode, the result is a ResultIterator object. If you scan it many times (by calling several time a foreach loop), the query will be run
-     * several times. In cursor mode, you cannot access the result set by key. Use this mode for large datasets processed by batch.
-     *
-     * @param int $mode
-     *
-     * @return $this
-     *
-     * @throws TDBMException
-     */
-    public function setFetchMode($mode)
-    {
-        if ($mode !== self::MODE_CURSOR && $mode !== self::MODE_ARRAY) {
-            throw new TDBMException("Unknown fetch mode: '".$this->mode."'");
-        }
-        $this->mode = $mode;
-
-        return $this;
-    }
-
-    /**
-     * Removes the given object from database.
-     * This cannot be called on an object that is not attached to this TDBMService
-     * (will throw a TDBMInvalidOperationException).
-     *
-     * @param AbstractTDBMObject $object the object to delete
-     *
-     * @throws TDBMException
-     * @throws TDBMInvalidOperationException
-     */
-    public function delete(AbstractTDBMObject $object)
-    {
-        switch ($object->_getStatus()) {
-            case TDBMObjectStateEnum::STATE_DELETED:
-                // Nothing to do, object already deleted.
-                return;
-            case TDBMObjectStateEnum::STATE_DETACHED:
-                throw new TDBMInvalidOperationException('Cannot delete a detached object');
-            case TDBMObjectStateEnum::STATE_NEW:
-                $this->deleteManyToManyRelationships($object);
-                foreach ($object->_getDbRows() as $dbRow) {
-                    $this->removeFromToSaveObjectList($dbRow);
-                }
-                break;
-            case TDBMObjectStateEnum::STATE_DIRTY:
-                foreach ($object->_getDbRows() as $dbRow) {
-                    $this->removeFromToSaveObjectList($dbRow);
-                }
-                // And continue deleting...
-            case TDBMObjectStateEnum::STATE_NOT_LOADED:
-            case TDBMObjectStateEnum::STATE_LOADED:
-                $this->deleteManyToManyRelationships($object);
-                // Let's delete db rows, in reverse order.
-                foreach (array_reverse($object->_getDbRows()) as $dbRow) {
-                    $tableName = $dbRow->_getDbTableName();
-                    $primaryKeys = $dbRow->_getPrimaryKeys();
-                    $this->connection->delete($tableName, $primaryKeys);
-                    $this->objectStorage->remove($dbRow->_getDbTableName(), $this->getObjectHash($primaryKeys));
-                }
-                break;
-            // @codeCoverageIgnoreStart
-            default:
-                throw new TDBMInvalidOperationException('Unexpected status for bean');
-            // @codeCoverageIgnoreEnd
-        }
-
-        $object->_setStatus(TDBMObjectStateEnum::STATE_DELETED);
-    }
-
-    /**
-     * Removes all many to many relationships for this object.
-     *
-     * @param AbstractTDBMObject $object
-     */
-    private function deleteManyToManyRelationships(AbstractTDBMObject $object)
-    {
-        foreach ($object->_getDbRows() as $tableName => $dbRow) {
-            $pivotTables = $this->tdbmSchemaAnalyzer->getPivotTableLinkedToTable($tableName);
-            foreach ($pivotTables as $pivotTable) {
-                $remoteBeans = $object->_getRelationships($pivotTable);
-                foreach ($remoteBeans as $remoteBean) {
-                    $object->_removeRelationship($pivotTable, $remoteBean);
-                }
-            }
-        }
-        $this->persistManyToManyRelationships($object);
-    }
-
-    /**
-     * This function removes the given object from the database. It will also remove all objects relied to the one given
-     * by parameter before all.
-     *
-     * Notice: if the object has a multiple primary key, the function will not work.
-     *
-     * @param AbstractTDBMObject $objToDelete
-     */
-    public function deleteCascade(AbstractTDBMObject $objToDelete)
-    {
-        $this->deleteAllConstraintWithThisObject($objToDelete);
-        $this->delete($objToDelete);
-    }
-
-    /**
-     * This function is used only in TDBMService (private function)
-     * It will call deleteCascade function foreach object relied with a foreign key to the object given by parameter.
-     *
-     * @param AbstractTDBMObject $obj
-     */
-    private function deleteAllConstraintWithThisObject(AbstractTDBMObject $obj)
-    {
-        $dbRows = $obj->_getDbRows();
-        foreach ($dbRows as $dbRow) {
-            $tableName = $dbRow->_getDbTableName();
-            $pks = array_values($dbRow->_getPrimaryKeys());
-            if (!empty($pks)) {
-                $incomingFks = $this->tdbmSchemaAnalyzer->getIncomingForeignKeys($tableName);
-
-                foreach ($incomingFks as $incomingFk) {
-                    $filter = array_combine($incomingFk->getLocalColumns(), $pks);
-
-                    $results = $this->findObjects($incomingFk->getLocalTableName(), $filter);
-
-                    foreach ($results as $bean) {
-                        $this->deleteCascade($bean);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * This function performs a save() of all the objects that have been modified.
-     */
-    public function completeSave()
-    {
-        foreach ($this->toSaveObjects as $dbRow) {
-            $this->save($dbRow->getTDBMObject());
-        }
-    }
-
-    /**
-     * Takes in input a filter_bag (which can be about anything from a string to an array of TDBMObjects... see above from documentation),
-     * and gives back a proper Filter object.
-     *
-     * @param mixed $filter_bag
-     * @param int   $counter
-     *
-     * @return array First item: filter string, second item: parameters
-     *
-     * @throws TDBMException
-     */
-    public function buildFilterFromFilterBag($filter_bag, $counter = 1)
-    {
-        if ($filter_bag === null) {
-            return ['', []];
-        } elseif (is_string($filter_bag)) {
-            return [$filter_bag, []];
-        } elseif (is_array($filter_bag)) {
-            $sqlParts = [];
-            $parameters = [];
-            foreach ($filter_bag as $column => $value) {
-                if (is_int($column)) {
-                    list($subSqlPart, $subParameters) = $this->buildFilterFromFilterBag($value, $counter);
-                    $sqlParts[] = $subSqlPart;
-                    $parameters += $subParameters;
-                } else {
-                    $paramName = 'tdbmparam'.$counter;
-                    if (is_array($value)) {
-                        $sqlParts[] = $this->connection->quoteIdentifier($column).' IN :'.$paramName;
-                    } else {
-                        $sqlParts[] = $this->connection->quoteIdentifier($column).' = :'.$paramName;
-                    }
-                    $parameters[$paramName] = $value;
-                    ++$counter;
-                }
-            }
-
-            return [implode(' AND ', $sqlParts), $parameters];
-        } elseif ($filter_bag instanceof AbstractTDBMObject) {
-            $sqlParts = [];
-            $parameters = [];
-            $dbRows = $filter_bag->_getDbRows();
-            $dbRow = reset($dbRows);
-            $primaryKeys = $dbRow->_getPrimaryKeys();
-
-            foreach ($primaryKeys as $column => $value) {
-                $paramName = 'tdbmparam'.$counter;
-                $sqlParts[] = $this->connection->quoteIdentifier($dbRow->_getDbTableName()).'.'.$this->connection->quoteIdentifier($column).' = :'.$paramName;
-                $parameters[$paramName] = $value;
-                ++$counter;
-            }
-
-            return [implode(' AND ', $sqlParts), $parameters];
-        } elseif ($filter_bag instanceof \Iterator) {
-            return $this->buildFilterFromFilterBag(iterator_to_array($filter_bag), $counter);
-        } else {
-            throw new TDBMException('Error in filter. An object has been passed that is neither a SQL string, nor an array, nor a bean, nor null.');
-        }
-    }
-
-    /**
-     * @param string $table
-     *
-     * @return string[]
-     */
-    public function getPrimaryKeyColumns($table)
-    {
-        if (!isset($this->primaryKeysColumns[$table])) {
-            $this->primaryKeysColumns[$table] = $this->tdbmSchemaAnalyzer->getSchema()->getTable($table)->getPrimaryKeyColumns();
-
-            // TODO TDBM4: See if we need to improve error reporting if table name does not exist.
-
-            /*$arr = array();
+	const MODE_CURSOR = 1;
+	const MODE_ARRAY = 2;
+
+	/**
+	 * The database connection.
+	 *
+	 * @var Connection
+	 */
+	private $connection;
+
+	/**
+	 * @var SchemaAnalyzer
+	 */
+	private $schemaAnalyzer;
+
+	/**
+	 * @var MagicQuery
+	 */
+	private $magicQuery;
+
+	/**
+	 * @var TDBMSchemaAnalyzer
+	 */
+	private $tdbmSchemaAnalyzer;
+
+	/**
+	 * @var string
+	 */
+	private $cachePrefix;
+
+	/**
+	 * Cache of table of primary keys.
+	 * Primary keys are stored by tables, as an array of column.
+	 * For instance $primary_key['my_table'][0] will return the first column of the primary key of table 'my_table'.
+	 *
+	 * @var string[]
+	 */
+	private $primaryKeysColumns;
+
+	/**
+	 * Service storing objects in memory.
+	 * Access is done by table name and then by primary key.
+	 * If the primary key is split on several columns, access is done by an array of columns, serialized.
+	 *
+	 * @var StandardObjectStorage|WeakrefObjectStorage
+	 */
+	private $objectStorage;
+
+	/**
+	 * The fetch mode of the result sets returned by `getObjects`.
+	 * Can be one of: TDBMObjectArray::MODE_CURSOR or TDBMObjectArray::MODE_ARRAY or TDBMObjectArray::MODE_COMPATIBLE_ARRAY.
+	 *
+	 * In 'MODE_ARRAY' mode (default), the result is an array. Use this mode by default (unless the list returned is very big).
+	 * In 'MODE_CURSOR' mode, the result is a Generator which is an iterable collection that can be scanned only once (only one "foreach") on it,
+	 * and it cannot be accessed via key. Use this mode for large datasets processed by batch.
+	 * In 'MODE_COMPATIBLE_ARRAY' mode, the result is an old TDBMObjectArray (used up to TDBM 3.2).
+	 * You can access the array by key, or using foreach, several times.
+	 *
+	 * @var int
+	 */
+	private $mode = self::MODE_ARRAY;
+
+	/**
+	 * Table of new objects not yet inserted in database or objects modified that must be saved.
+	 *
+	 * @var \SplObjectStorage of DbRow objects
+	 */
+	private $toSaveObjects;
+
+	/**
+	 * A cache service to be used.
+	 *
+	 * @var Cache|null
+	 */
+	private $cache;
+
+	/**
+	 * Map associating a table name to a fully qualified Bean class name.
+	 *
+	 * @var array
+	 */
+	private $tableToBeanMap = [];
+
+	/**
+	 * @var \ReflectionClass[]
+	 */
+	private $reflectionClassCache = array();
+
+	/**
+	 * @var LoggerInterface
+	 */
+	private $rootLogger;
+
+	/**
+	 * @var LevelFilter|NullLogger
+	 */
+	private $logger;
+
+	/**
+	 * @var OrderByAnalyzer
+	 */
+	private $orderByAnalyzer;
+
+	/**
+	 * @var string
+	 */
+	private $beanNamespace;
+
+	/**
+	 * @var NamingStrategyInterface
+	 */
+	private $namingStrategy;
+	/**
+	 * @var ConfigurationInterface
+	 */
+	private $configuration;
+
+	/**
+	 * @param ConfigurationInterface $configuration The configuration object
+	 */
+	public function __construct(ConfigurationInterface $configuration /*Connection $connection, Cache $cache = null, SchemaAnalyzer $schemaAnalyzer = null, LoggerInterface $logger = null*/)
+	{
+		if (extension_loaded('weakref')) {
+			$this->objectStorage = new WeakrefObjectStorage();
+		} else {
+			$this->objectStorage = new StandardObjectStorage();
+		}
+		$this->connection = $configuration->getConnection();
+		$this->cache = $configuration->getCache();
+		$this->schemaAnalyzer = $configuration->getSchemaAnalyzer();
+
+		$this->magicQuery = new MagicQuery($this->connection, $this->cache, $this->schemaAnalyzer);
+
+		$this->tdbmSchemaAnalyzer = new TDBMSchemaAnalyzer($this->connection, $this->cache, $this->schemaAnalyzer);
+		$this->cachePrefix = $this->tdbmSchemaAnalyzer->getCachePrefix();
+
+		$this->toSaveObjects = new \SplObjectStorage();
+		$logger = $configuration->getLogger();
+		if ($logger === null) {
+			$this->logger = new NullLogger();
+			$this->rootLogger = new NullLogger();
+		} else {
+			$this->rootLogger = $logger;
+			$this->setLogLevel(LogLevel::WARNING);
+		}
+		$this->orderByAnalyzer = new OrderByAnalyzer($this->cache, $this->cachePrefix);
+		$this->beanNamespace = $configuration->getBeanNamespace();
+		$this->namingStrategy = $configuration->getNamingStrategy();
+		$this->configuration = $configuration;
+	}
+
+	/**
+	 * Returns the object used to connect to the database.
+	 *
+	 * @return Connection
+	 */
+	public function getConnection(): Connection
+	{
+		return $this->connection;
+	}
+
+	/**
+	 * Sets the default fetch mode of the result sets returned by `findObjects`.
+	 * Can be one of: TDBMObjectArray::MODE_CURSOR or TDBMObjectArray::MODE_ARRAY.
+	 *
+	 * In 'MODE_ARRAY' mode (default), the result is a ResultIterator object that behaves like an array. Use this mode by default (unless the list returned is very big).
+	 * In 'MODE_CURSOR' mode, the result is a ResultIterator object. If you scan it many times (by calling several time a foreach loop), the query will be run
+	 * several times. In cursor mode, you cannot access the result set by key. Use this mode for large datasets processed by batch.
+	 *
+	 * @param int $mode
+	 *
+	 * @return $this
+	 *
+	 * @throws TDBMException
+	 */
+	public function setFetchMode($mode)
+	{
+		if ($mode !== self::MODE_CURSOR && $mode !== self::MODE_ARRAY) {
+			throw new TDBMException("Unknown fetch mode: '".$this->mode."'");
+		}
+		$this->mode = $mode;
+
+		return $this;
+	}
+
+	/**
+	 * Removes the given object from database.
+	 * This cannot be called on an object that is not attached to this TDBMService
+	 * (will throw a TDBMInvalidOperationException).
+	 *
+	 * @param AbstractTDBMObject $object the object to delete
+	 *
+	 * @throws TDBMException
+	 * @throws TDBMInvalidOperationException
+	 */
+	public function delete(AbstractTDBMObject $object)
+	{
+		switch ($object->_getStatus()) {
+			case TDBMObjectStateEnum::STATE_DELETED:
+				// Nothing to do, object already deleted.
+				return;
+			case TDBMObjectStateEnum::STATE_DETACHED:
+				throw new TDBMInvalidOperationException('Cannot delete a detached object');
+			case TDBMObjectStateEnum::STATE_NEW:
+				$this->deleteManyToManyRelationships($object);
+				foreach ($object->_getDbRows() as $dbRow) {
+					$this->removeFromToSaveObjectList($dbRow);
+				}
+				break;
+			case TDBMObjectStateEnum::STATE_DIRTY:
+				foreach ($object->_getDbRows() as $dbRow) {
+					$this->removeFromToSaveObjectList($dbRow);
+				}
+				// And continue deleting...
+			case TDBMObjectStateEnum::STATE_NOT_LOADED:
+			case TDBMObjectStateEnum::STATE_LOADED:
+				$this->deleteManyToManyRelationships($object);
+				// Let's delete db rows, in reverse order.
+				foreach (array_reverse($object->_getDbRows()) as $dbRow) {
+					$tableName = $dbRow->_getDbTableName();
+					$primaryKeys = $dbRow->_getPrimaryKeys();
+					$this->connection->delete($tableName, $primaryKeys);
+					$this->objectStorage->remove($dbRow->_getDbTableName(), $this->getObjectHash($primaryKeys));
+				}
+				break;
+			// @codeCoverageIgnoreStart
+			default:
+				throw new TDBMInvalidOperationException('Unexpected status for bean');
+			// @codeCoverageIgnoreEnd
+		}
+
+		$object->_setStatus(TDBMObjectStateEnum::STATE_DELETED);
+	}
+
+	/**
+	 * Removes all many to many relationships for this object.
+	 *
+	 * @param AbstractTDBMObject $object
+	 */
+	private function deleteManyToManyRelationships(AbstractTDBMObject $object)
+	{
+		foreach ($object->_getDbRows() as $tableName => $dbRow) {
+			$pivotTables = $this->tdbmSchemaAnalyzer->getPivotTableLinkedToTable($tableName);
+			foreach ($pivotTables as $pivotTable) {
+				$remoteBeans = $object->_getRelationships($pivotTable);
+				foreach ($remoteBeans as $remoteBean) {
+					$object->_removeRelationship($pivotTable, $remoteBean);
+				}
+			}
+		}
+		$this->persistManyToManyRelationships($object);
+	}
+
+	/**
+	 * This function removes the given object from the database. It will also remove all objects relied to the one given
+	 * by parameter before all.
+	 *
+	 * Notice: if the object has a multiple primary key, the function will not work.
+	 *
+	 * @param AbstractTDBMObject $objToDelete
+	 */
+	public function deleteCascade(AbstractTDBMObject $objToDelete)
+	{
+		$this->deleteAllConstraintWithThisObject($objToDelete);
+		$this->delete($objToDelete);
+	}
+
+	/**
+	 * This function is used only in TDBMService (private function)
+	 * It will call deleteCascade function foreach object relied with a foreign key to the object given by parameter.
+	 *
+	 * @param AbstractTDBMObject $obj
+	 */
+	private function deleteAllConstraintWithThisObject(AbstractTDBMObject $obj)
+	{
+		$dbRows = $obj->_getDbRows();
+		foreach ($dbRows as $dbRow) {
+			$tableName = $dbRow->_getDbTableName();
+			$pks = array_values($dbRow->_getPrimaryKeys());
+			if (!empty($pks)) {
+				$incomingFks = $this->tdbmSchemaAnalyzer->getIncomingForeignKeys($tableName);
+
+				foreach ($incomingFks as $incomingFk) {
+					$filter = array_combine($incomingFk->getLocalColumns(), $pks);
+
+					$results = $this->findObjects($incomingFk->getLocalTableName(), $filter);
+
+					foreach ($results as $bean) {
+						$this->deleteCascade($bean);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This function performs a save() of all the objects that have been modified.
+	 */
+	public function completeSave()
+	{
+		foreach ($this->toSaveObjects as $dbRow) {
+			$this->save($dbRow->getTDBMObject());
+		}
+	}
+
+	/**
+	 * Takes in input a filter_bag (which can be about anything from a string to an array of TDBMObjects... see above from documentation),
+	 * and gives back a proper Filter object.
+	 *
+	 * @param mixed $filter_bag
+	 * @param int   $counter
+	 *
+	 * @return array First item: filter string, second item: parameters
+	 *
+	 * @throws TDBMException
+	 */
+	public function buildFilterFromFilterBag($filter_bag, $counter = 1)
+	{
+		if ($filter_bag === null) {
+			return ['', []];
+		} elseif (is_string($filter_bag)) {
+			return [$filter_bag, []];
+		} elseif (is_array($filter_bag)) {
+			$sqlParts = [];
+			$parameters = [];
+			foreach ($filter_bag as $column => $value) {
+				if (is_int($column)) {
+					list($subSqlPart, $subParameters) = $this->buildFilterFromFilterBag($value, $counter);
+					$sqlParts[] = $subSqlPart;
+					$parameters += $subParameters;
+				} else {
+					$paramName = 'tdbmparam'.$counter;
+					if (is_array($value)) {
+						$sqlParts[] = $this->connection->quoteIdentifier($column).' IN :'.$paramName;
+					} else {
+						$sqlParts[] = $this->connection->quoteIdentifier($column).' = :'.$paramName;
+					}
+					$parameters[$paramName] = $value;
+					++$counter;
+				}
+			}
+
+			return [implode(' AND ', $sqlParts), $parameters];
+		} elseif ($filter_bag instanceof AbstractTDBMObject) {
+			$sqlParts = [];
+			$parameters = [];
+			$dbRows = $filter_bag->_getDbRows();
+			$dbRow = reset($dbRows);
+			$primaryKeys = $dbRow->_getPrimaryKeys();
+
+			foreach ($primaryKeys as $column => $value) {
+				$paramName = 'tdbmparam'.$counter;
+				$sqlParts[] = $this->connection->quoteIdentifier($dbRow->_getDbTableName()).'.'.$this->connection->quoteIdentifier($column).' = :'.$paramName;
+				$parameters[$paramName] = $value;
+				++$counter;
+			}
+
+			return [implode(' AND ', $sqlParts), $parameters];
+		} elseif ($filter_bag instanceof \Iterator) {
+			return $this->buildFilterFromFilterBag(iterator_to_array($filter_bag), $counter);
+		} else {
+			throw new TDBMException('Error in filter. An object has been passed that is neither a SQL string, nor an array, nor a bean, nor null.');
+		}
+	}
+
+	/**
+	 * @param string $table
+	 *
+	 * @return string[]
+	 */
+	public function getPrimaryKeyColumns($table)
+	{
+		if (!isset($this->primaryKeysColumns[$table])) {
+			$this->primaryKeysColumns[$table] = $this->tdbmSchemaAnalyzer->getSchema()->getTable($table)->getPrimaryKeyColumns();
+
+			// TODO TDBM4: See if we need to improve error reporting if table name does not exist.
+
+			/*$arr = array();
             foreach ($this->connection->getPrimaryKey($table) as $col) {
                 $arr[] = $col->name;
             }
@@ -446,161 +446,161 @@ 
                     throw new TDBMException($str);
                 }
             }*/
-        }
-
-        return $this->primaryKeysColumns[$table];
-    }
-
-    /**
-     * This is an internal function, you should not use it in your application.
-     * This is used internally by TDBM to add an object to the object cache.
-     *
-     * @param DbRow $dbRow
-     */
-    public function _addToCache(DbRow $dbRow)
-    {
-        $primaryKey = $this->getPrimaryKeysForObjectFromDbRow($dbRow);
-        $hash = $this->getObjectHash($primaryKey);
-        $this->objectStorage->set($dbRow->_getDbTableName(), $hash, $dbRow);
-    }
-
-    /**
-     * This is an internal function, you should not use it in your application.
-     * This is used internally by TDBM to remove the object from the list of objects that have been
-     * created/updated but not saved yet.
-     *
-     * @param DbRow $myObject
-     */
-    private function removeFromToSaveObjectList(DbRow $myObject)
-    {
-        unset($this->toSaveObjects[$myObject]);
-    }
-
-    /**
-     * This is an internal function, you should not use it in your application.
-     * This is used internally by TDBM to add an object to the list of objects that have been
-     * created/updated but not saved yet.
-     *
-     * @param DbRow $myObject
-     */
-    public function _addToToSaveObjectList(DbRow $myObject)
-    {
-        $this->toSaveObjects[$myObject] = true;
-    }
-
-    /**
-     * Generates all the daos and beans.
-     *
-     * @param string $composerFile        If it's set, location of custom Composer file. Relative to project root
-     *
-     * @return \string[] the list of tables (key) and bean name (value)
-     */
-    public function generateAllDaosAndBeans($composerFile = null)
-    {
-        // Purge cache before generating anything.
-        $this->cache->deleteAll();
-
-        $tdbmDaoGenerator = new TDBMDaoGenerator($this->configuration, $this->tdbmSchemaAnalyzer->getSchema(), $this->tdbmSchemaAnalyzer);
-        if (null !== $composerFile) {
-            $tdbmDaoGenerator->setComposerFile(__DIR__.'/../../../../../../../'.$composerFile);
-        }
-
-        $tdbmDaoGenerator->generateAllDaosAndBeans();
-    }
-
-    /**
-     * Returns the fully qualified class name of the bean associated with table $tableName.
-     *
-     *
-     * @param string $tableName
-     *
-     * @return string
-     */
-    public function getBeanClassName(string $tableName) : string
-    {
-        if (isset($this->tableToBeanMap[$tableName])) {
-            return $this->tableToBeanMap[$tableName];
-        } else {
-            $className = $this->beanNamespace.'\\'.$this->namingStrategy->getBeanClassName($tableName);
-
-            if (!class_exists($className)) {
-                throw new TDBMInvalidArgumentException(sprintf('Could not find class "%s". Does table "%s" exist? If yes, consider regenerating the DAOs and beans.', $className, $tableName));
-            }
-
-            $this->tableToBeanMap[$tableName] = $className;
-            return $className;
-        }
-    }
-
-    /**
-     * Saves $object by INSERTing or UPDAT(E)ing it in the database.
-     *
-     * @param AbstractTDBMObject $object
-     *
-     * @throws TDBMException
-     */
-    public function save(AbstractTDBMObject $object)
-    {
-        $status = $object->_getStatus();
-
-        if ($status === null) {
-            throw new TDBMException(sprintf('Your bean for class %s has no status. It is likely that you overloaded the __construct method and forgot to call parent::__construct.', get_class($object)));
-        }
-
-        // Let's attach this object if it is in detached state.
-        if ($status === TDBMObjectStateEnum::STATE_DETACHED) {
-            $object->_attach($this);
-            $status = $object->_getStatus();
-        }
-
-        if ($status === TDBMObjectStateEnum::STATE_NEW) {
-            $dbRows = $object->_getDbRows();
-
-            $unindexedPrimaryKeys = array();
-
-            foreach ($dbRows as $dbRow) {
-                if ($dbRow->_getStatus() == TDBMObjectStateEnum::STATE_SAVING) {
-                    throw TDBMCyclicReferenceException::createCyclicReference($dbRow->_getDbTableName(), $object);
-                }
-                $dbRow->_setStatus(TDBMObjectStateEnum::STATE_SAVING);
-                $tableName = $dbRow->_getDbTableName();
-
-                $schema = $this->tdbmSchemaAnalyzer->getSchema();
-                $tableDescriptor = $schema->getTable($tableName);
-
-                $primaryKeyColumns = $this->getPrimaryKeyColumns($tableName);
-
-                $references = $dbRow->_getReferences();
-
-                // Let's save all references in NEW or DETACHED state (we need their primary key)
-                foreach ($references as $fkName => $reference) {
-                    if ($reference !== null) {
-                        $refStatus = $reference->_getStatus();
-                        if ($refStatus === TDBMObjectStateEnum::STATE_NEW || $refStatus === TDBMObjectStateEnum::STATE_DETACHED) {
-                            try {
-                                $this->save($reference);
-                            } catch (TDBMCyclicReferenceException $e) {
-                                throw TDBMCyclicReferenceException::extendCyclicReference($e, $dbRow->_getDbTableName(), $object, $fkName);
-                            }
-                        }
-                    }
-                }
-
-                if (empty($unindexedPrimaryKeys)) {
-                    $primaryKeys = $this->getPrimaryKeysForObjectFromDbRow($dbRow);
-                } else {
-                    // First insert, the children must have the same primary key as the parent.
-                    $primaryKeys = $this->_getPrimaryKeysFromIndexedPrimaryKeys($tableName, $unindexedPrimaryKeys);
-                    $dbRow->_setPrimaryKeys($primaryKeys);
-                }
-
-                $dbRowData = $dbRow->_getDbRow();
-
-                // Let's see if the columns for primary key have been set before inserting.
-                // We assume that if one of the value of the PK has been set, the PK is set.
-                $isPkSet = !empty($primaryKeys);
-
-                /*if (!$isPkSet) {
+		}
+
+		return $this->primaryKeysColumns[$table];
+	}
+
+	/**
+	 * This is an internal function, you should not use it in your application.
+	 * This is used internally by TDBM to add an object to the object cache.
+	 *
+	 * @param DbRow $dbRow
+	 */
+	public function _addToCache(DbRow $dbRow)
+	{
+		$primaryKey = $this->getPrimaryKeysForObjectFromDbRow($dbRow);
+		$hash = $this->getObjectHash($primaryKey);
+		$this->objectStorage->set($dbRow->_getDbTableName(), $hash, $dbRow);
+	}
+
+	/**
+	 * This is an internal function, you should not use it in your application.
+	 * This is used internally by TDBM to remove the object from the list of objects that have been
+	 * created/updated but not saved yet.
+	 *
+	 * @param DbRow $myObject
+	 */
+	private function removeFromToSaveObjectList(DbRow $myObject)
+	{
+		unset($this->toSaveObjects[$myObject]);
+	}
+
+	/**
+	 * This is an internal function, you should not use it in your application.
+	 * This is used internally by TDBM to add an object to the list of objects that have been
+	 * created/updated but not saved yet.
+	 *
+	 * @param DbRow $myObject
+	 */
+	public function _addToToSaveObjectList(DbRow $myObject)
+	{
+		$this->toSaveObjects[$myObject] = true;
+	}
+
+	/**
+	 * Generates all the daos and beans.
+	 *
+	 * @param string $composerFile        If it's set, location of custom Composer file. Relative to project root
+	 *
+	 * @return \string[] the list of tables (key) and bean name (value)
+	 */
+	public function generateAllDaosAndBeans($composerFile = null)
+	{
+		// Purge cache before generating anything.
+		$this->cache->deleteAll();
+
+		$tdbmDaoGenerator = new TDBMDaoGenerator($this->configuration, $this->tdbmSchemaAnalyzer->getSchema(), $this->tdbmSchemaAnalyzer);
+		if (null !== $composerFile) {
+			$tdbmDaoGenerator->setComposerFile(__DIR__.'/../../../../../../../'.$composerFile);
+		}
+
+		$tdbmDaoGenerator->generateAllDaosAndBeans();
+	}
+
+	/**
+	 * Returns the fully qualified class name of the bean associated with table $tableName.
+	 *
+	 *
+	 * @param string $tableName
+	 *
+	 * @return string
+	 */
+	public function getBeanClassName(string $tableName) : string
+	{
+		if (isset($this->tableToBeanMap[$tableName])) {
+			return $this->tableToBeanMap[$tableName];
+		} else {
+			$className = $this->beanNamespace.'\\'.$this->namingStrategy->getBeanClassName($tableName);
+
+			if (!class_exists($className)) {
+				throw new TDBMInvalidArgumentException(sprintf('Could not find class "%s". Does table "%s" exist? If yes, consider regenerating the DAOs and beans.', $className, $tableName));
+			}
+
+			$this->tableToBeanMap[$tableName] = $className;
+			return $className;
+		}
+	}
+
+	/**
+	 * Saves $object by INSERTing or UPDAT(E)ing it in the database.
+	 *
+	 * @param AbstractTDBMObject $object
+	 *
+	 * @throws TDBMException
+	 */
+	public function save(AbstractTDBMObject $object)
+	{
+		$status = $object->_getStatus();
+
+		if ($status === null) {
+			throw new TDBMException(sprintf('Your bean for class %s has no status. It is likely that you overloaded the __construct method and forgot to call parent::__construct.', get_class($object)));
+		}
+
+		// Let's attach this object if it is in detached state.
+		if ($status === TDBMObjectStateEnum::STATE_DETACHED) {
+			$object->_attach($this);
+			$status = $object->_getStatus();
+		}
+
+		if ($status === TDBMObjectStateEnum::STATE_NEW) {
+			$dbRows = $object->_getDbRows();
+
+			$unindexedPrimaryKeys = array();
+
+			foreach ($dbRows as $dbRow) {
+				if ($dbRow->_getStatus() == TDBMObjectStateEnum::STATE_SAVING) {
+					throw TDBMCyclicReferenceException::createCyclicReference($dbRow->_getDbTableName(), $object);
+				}
+				$dbRow->_setStatus(TDBMObjectStateEnum::STATE_SAVING);
+				$tableName = $dbRow->_getDbTableName();
+
+				$schema = $this->tdbmSchemaAnalyzer->getSchema();
+				$tableDescriptor = $schema->getTable($tableName);
+
+				$primaryKeyColumns = $this->getPrimaryKeyColumns($tableName);
+
+				$references = $dbRow->_getReferences();
+
+				// Let's save all references in NEW or DETACHED state (we need their primary key)
+				foreach ($references as $fkName => $reference) {
+					if ($reference !== null) {
+						$refStatus = $reference->_getStatus();
+						if ($refStatus === TDBMObjectStateEnum::STATE_NEW || $refStatus === TDBMObjectStateEnum::STATE_DETACHED) {
+							try {
+								$this->save($reference);
+							} catch (TDBMCyclicReferenceException $e) {
+								throw TDBMCyclicReferenceException::extendCyclicReference($e, $dbRow->_getDbTableName(), $object, $fkName);
+							}
+						}
+					}
+				}
+
+				if (empty($unindexedPrimaryKeys)) {
+					$primaryKeys = $this->getPrimaryKeysForObjectFromDbRow($dbRow);
+				} else {
+					// First insert, the children must have the same primary key as the parent.
+					$primaryKeys = $this->_getPrimaryKeysFromIndexedPrimaryKeys($tableName, $unindexedPrimaryKeys);
+					$dbRow->_setPrimaryKeys($primaryKeys);
+				}
+
+				$dbRowData = $dbRow->_getDbRow();
+
+				// Let's see if the columns for primary key have been set before inserting.
+				// We assume that if one of the value of the PK has been set, the PK is set.
+				$isPkSet = !empty($primaryKeys);
+
+				/*if (!$isPkSet) {
                     // if there is no autoincrement and no pk set, let's go in error.
                     $isAutoIncrement = true;
 
@@ -618,30 +618,30 @@ 
 
                 }*/
 
-                $types = [];
-                $escapedDbRowData = [];
+				$types = [];
+				$escapedDbRowData = [];
 
-                foreach ($dbRowData as $columnName => $value) {
-                    $columnDescriptor = $tableDescriptor->getColumn($columnName);
-                    $types[] = $columnDescriptor->getType();
-                    $escapedDbRowData[$this->connection->quoteIdentifier($columnName)] = $value;
-                }
+				foreach ($dbRowData as $columnName => $value) {
+					$columnDescriptor = $tableDescriptor->getColumn($columnName);
+					$types[] = $columnDescriptor->getType();
+					$escapedDbRowData[$this->connection->quoteIdentifier($columnName)] = $value;
+				}
 
-                $this->connection->insert($tableName, $escapedDbRowData, $types);
+				$this->connection->insert($tableName, $escapedDbRowData, $types);
 
-                if (!$isPkSet && count($primaryKeyColumns) == 1) {
-                    $id = $this->connection->lastInsertId();
-                    $pkColumn = $primaryKeyColumns[0];
-                    // lastInsertId returns a string but the column type is usually a int. Let's convert it back to the correct type.
-                    $id = $tableDescriptor->getColumn($pkColumn)->getType()->convertToPHPValue($id, $this->getConnection()->getDatabasePlatform());
-                    $primaryKeys[$pkColumn] = $id;
-                }
+				if (!$isPkSet && count($primaryKeyColumns) == 1) {
+					$id = $this->connection->lastInsertId();
+					$pkColumn = $primaryKeyColumns[0];
+					// lastInsertId returns a string but the column type is usually a int. Let's convert it back to the correct type.
+					$id = $tableDescriptor->getColumn($pkColumn)->getType()->convertToPHPValue($id, $this->getConnection()->getDatabasePlatform());
+					$primaryKeys[$pkColumn] = $id;
+				}
 
-                // TODO: change this to some private magic accessor in future
-                $dbRow->_setPrimaryKeys($primaryKeys);
-                $unindexedPrimaryKeys = array_values($primaryKeys);
+				// TODO: change this to some private magic accessor in future
+				$dbRow->_setPrimaryKeys($primaryKeys);
+				$unindexedPrimaryKeys = array_values($primaryKeys);
 
-                /*
+				/*
                  * When attached, on "save", we check if the column updated is part of a primary key
                  * If this is part of a primary key, we call the _update_id method that updates the id in the list of known objects.
                  * This method should first verify that the id is not already used (and is not auto-incremented)
@@ -651,7 +651,7 @@ 
                  *
                  */
 
-                /*try {
+				/*try {
                     $this->db_connection->exec($sql);
                 } catch (TDBMException $e) {
                     $this->db_onerror = true;
@@ -670,405 +670,405 @@ 
                     }
                 }*/
 
-                // Let's remove this object from the $new_objects static table.
-                $this->removeFromToSaveObjectList($dbRow);
-
-                // TODO: change this behaviour to something more sensible performance-wise
-                // Maybe a setting to trigger this globally?
-                //$this->status = TDBMObjectStateEnum::STATE_NOT_LOADED;
-                //$this->db_modified_state = false;
-                //$dbRow = array();
-
-                // Let's add this object to the list of objects in cache.
-                $this->_addToCache($dbRow);
-            }
-
-            $object->_setStatus(TDBMObjectStateEnum::STATE_LOADED);
-        } elseif ($status === TDBMObjectStateEnum::STATE_DIRTY) {
-            $dbRows = $object->_getDbRows();
-
-            foreach ($dbRows as $dbRow) {
-                $references = $dbRow->_getReferences();
-
-                // Let's save all references in NEW state (we need their primary key)
-                foreach ($references as $fkName => $reference) {
-                    if ($reference !== null && $reference->_getStatus() === TDBMObjectStateEnum::STATE_NEW) {
-                        $this->save($reference);
-                    }
-                }
-
-                // Let's first get the primary keys
-                $tableName = $dbRow->_getDbTableName();
-                $dbRowData = $dbRow->_getDbRow();
-
-                $schema = $this->tdbmSchemaAnalyzer->getSchema();
-                $tableDescriptor = $schema->getTable($tableName);
-
-                $primaryKeys = $dbRow->_getPrimaryKeys();
-
-                $types = [];
-                $escapedDbRowData = [];
-                $escapedPrimaryKeys = [];
-
-                foreach ($dbRowData as $columnName => $value) {
-                    $columnDescriptor = $tableDescriptor->getColumn($columnName);
-                    $types[] = $columnDescriptor->getType();
-                    $escapedDbRowData[$this->connection->quoteIdentifier($columnName)] = $value;
-                }
-                foreach ($primaryKeys as $columnName => $value) {
-                    $columnDescriptor = $tableDescriptor->getColumn($columnName);
-                    $types[] = $columnDescriptor->getType();
-                    $escapedPrimaryKeys[$this->connection->quoteIdentifier($columnName)] = $value;
-                }
-
-                $this->connection->update($tableName, $escapedDbRowData, $escapedPrimaryKeys, $types);
-
-                // Let's check if the primary key has been updated...
-                $needsUpdatePk = false;
-                foreach ($primaryKeys as $column => $value) {
-                    if (!isset($dbRowData[$column]) || $dbRowData[$column] != $value) {
-                        $needsUpdatePk = true;
-                        break;
-                    }
-                }
-                if ($needsUpdatePk) {
-                    $this->objectStorage->remove($tableName, $this->getObjectHash($primaryKeys));
-                    $newPrimaryKeys = $this->getPrimaryKeysForObjectFromDbRow($dbRow);
-                    $dbRow->_setPrimaryKeys($newPrimaryKeys);
-                    $this->objectStorage->set($tableName, $this->getObjectHash($primaryKeys), $dbRow);
-                }
-
-                // Let's remove this object from the list of objects to save.
-                $this->removeFromToSaveObjectList($dbRow);
-            }
-
-            $object->_setStatus(TDBMObjectStateEnum::STATE_LOADED);
-        } elseif ($status === TDBMObjectStateEnum::STATE_DELETED) {
-            throw new TDBMInvalidOperationException('This object has been deleted. It cannot be saved.');
-        }
-
-        // Finally, let's save all the many to many relationships to this bean.
-        $this->persistManyToManyRelationships($object);
-    }
-
-    private function persistManyToManyRelationships(AbstractTDBMObject $object)
-    {
-        foreach ($object->_getCachedRelationships() as $pivotTableName => $storage) {
-            $tableDescriptor = $this->tdbmSchemaAnalyzer->getSchema()->getTable($pivotTableName);
-            list($localFk, $remoteFk) = $this->getPivotTableForeignKeys($pivotTableName, $object);
-
-            $toRemoveFromStorage = [];
-
-            foreach ($storage as $remoteBean) {
-                /* @var $remoteBean AbstractTDBMObject */
-                $statusArr = $storage[$remoteBean];
-                $status = $statusArr['status'];
-                $reverse = $statusArr['reverse'];
-                if ($reverse) {
-                    continue;
-                }
-
-                if ($status === 'new') {
-                    $remoteBeanStatus = $remoteBean->_getStatus();
-                    if ($remoteBeanStatus === TDBMObjectStateEnum::STATE_NEW || $remoteBeanStatus === TDBMObjectStateEnum::STATE_DETACHED) {
-                        // Let's save remote bean if needed.
-                        $this->save($remoteBean);
-                    }
-
-                    $filters = $this->getPivotFilters($object, $remoteBean, $localFk, $remoteFk);
-
-                    $types = [];
-                    $escapedFilters = [];
-
-                    foreach ($filters as $columnName => $value) {
-                        $columnDescriptor = $tableDescriptor->getColumn($columnName);
-                        $types[] = $columnDescriptor->getType();
-                        $escapedFilters[$this->connection->quoteIdentifier($columnName)] = $value;
-                    }
-
-                    $this->connection->insert($pivotTableName, $escapedFilters, $types);
-
-                    // Finally, let's mark relationships as saved.
-                    $statusArr['status'] = 'loaded';
-                    $storage[$remoteBean] = $statusArr;
-                    $remoteStorage = $remoteBean->_getCachedRelationships()[$pivotTableName];
-                    $remoteStatusArr = $remoteStorage[$object];
-                    $remoteStatusArr['status'] = 'loaded';
-                    $remoteStorage[$object] = $remoteStatusArr;
-                } elseif ($status === 'delete') {
-                    $filters = $this->getPivotFilters($object, $remoteBean, $localFk, $remoteFk);
-
-                    $types = [];
-
-                    foreach ($filters as $columnName => $value) {
-                        $columnDescriptor = $tableDescriptor->getColumn($columnName);
-                        $types[] = $columnDescriptor->getType();
-                    }
-
-                    $this->connection->delete($pivotTableName, $filters, $types);
-
-                    // Finally, let's remove relationships completely from bean.
-                    $toRemoveFromStorage[] = $remoteBean;
-
-                    $remoteBean->_getCachedRelationships()[$pivotTableName]->detach($object);
-                }
-            }
-
-            // Note: due to https://bugs.php.net/bug.php?id=65629, we cannot delete an element inside a foreach loop on a SplStorageObject.
-            // Therefore, we cache elements in the $toRemoveFromStorage to remove them at a later stage.
-            foreach ($toRemoveFromStorage as $remoteBean) {
-                $storage->detach($remoteBean);
-            }
-        }
-    }
-
-    private function getPivotFilters(AbstractTDBMObject $localBean, AbstractTDBMObject $remoteBean, ForeignKeyConstraint $localFk, ForeignKeyConstraint $remoteFk)
-    {
-        $localBeanPk = $this->getPrimaryKeyValues($localBean);
-        $remoteBeanPk = $this->getPrimaryKeyValues($remoteBean);
-        $localColumns = $localFk->getLocalColumns();
-        $remoteColumns = $remoteFk->getLocalColumns();
-
-        $localFilters = array_combine($localColumns, $localBeanPk);
-        $remoteFilters = array_combine($remoteColumns, $remoteBeanPk);
-
-        return array_merge($localFilters, $remoteFilters);
-    }
-
-    /**
-     * Returns the "values" of the primary key.
-     * This returns the primary key from the $primaryKey attribute, not the one stored in the columns.
-     *
-     * @param AbstractTDBMObject $bean
-     *
-     * @return array numerically indexed array of values
-     */
-    private function getPrimaryKeyValues(AbstractTDBMObject $bean)
-    {
-        $dbRows = $bean->_getDbRows();
-        $dbRow = reset($dbRows);
-
-        return array_values($dbRow->_getPrimaryKeys());
-    }
-
-    /**
-     * Returns a unique hash used to store the object based on its primary key.
-     * If the array contains only one value, then the value is returned.
-     * Otherwise, a hash representing the array is returned.
-     *
-     * @param array $primaryKeys An array of columns => values forming the primary key
-     *
-     * @return string
-     */
-    public function getObjectHash(array $primaryKeys)
-    {
-        if (count($primaryKeys) === 1) {
-            return reset($primaryKeys);
-        } else {
-            ksort($primaryKeys);
-
-            return md5(json_encode($primaryKeys));
-        }
-    }
-
-    /**
-     * Returns an array of primary keys from the object.
-     * The primary keys are extracted from the object columns and not from the primary keys stored in the
-     * $primaryKeys variable of the object.
-     *
-     * @param DbRow $dbRow
-     *
-     * @return array Returns an array of column => value
-     */
-    public function getPrimaryKeysForObjectFromDbRow(DbRow $dbRow)
-    {
-        $table = $dbRow->_getDbTableName();
-        $dbRowData = $dbRow->_getDbRow();
-
-        return $this->_getPrimaryKeysFromObjectData($table, $dbRowData);
-    }
-
-    /**
-     * Returns an array of primary keys for the given row.
-     * The primary keys are extracted from the object columns.
-     *
-     * @param $table
-     * @param array $columns
-     *
-     * @return array
-     */
-    public function _getPrimaryKeysFromObjectData($table, array $columns)
-    {
-        $primaryKeyColumns = $this->getPrimaryKeyColumns($table);
-        $values = array();
-        foreach ($primaryKeyColumns as $column) {
-            if (isset($columns[$column])) {
-                $values[$column] = $columns[$column];
-            }
-        }
-
-        return $values;
-    }
-
-    /**
-     * Attaches $object to this TDBMService.
-     * The $object must be in DETACHED state and will pass in NEW state.
-     *
-     * @param AbstractTDBMObject $object
-     *
-     * @throws TDBMInvalidOperationException
-     */
-    public function attach(AbstractTDBMObject $object)
-    {
-        $object->_attach($this);
-    }
-
-    /**
-     * Returns an associative array (column => value) for the primary keys from the table name and an
-     * indexed array of primary key values.
-     *
-     * @param string $tableName
-     * @param array  $indexedPrimaryKeys
-     */
-    public function _getPrimaryKeysFromIndexedPrimaryKeys($tableName, array $indexedPrimaryKeys)
-    {
-        $primaryKeyColumns = $this->tdbmSchemaAnalyzer->getSchema()->getTable($tableName)->getPrimaryKeyColumns();
-
-        if (count($primaryKeyColumns) !== count($indexedPrimaryKeys)) {
-            throw new TDBMException(sprintf('Wrong number of columns passed for primary key. Expected %s columns for table "%s",
+				// Let's remove this object from the $new_objects static table.
+				$this->removeFromToSaveObjectList($dbRow);
+
+				// TODO: change this behaviour to something more sensible performance-wise
+				// Maybe a setting to trigger this globally?
+				//$this->status = TDBMObjectStateEnum::STATE_NOT_LOADED;
+				//$this->db_modified_state = false;
+				//$dbRow = array();
+
+				// Let's add this object to the list of objects in cache.
+				$this->_addToCache($dbRow);
+			}
+
+			$object->_setStatus(TDBMObjectStateEnum::STATE_LOADED);
+		} elseif ($status === TDBMObjectStateEnum::STATE_DIRTY) {
+			$dbRows = $object->_getDbRows();
+
+			foreach ($dbRows as $dbRow) {
+				$references = $dbRow->_getReferences();
+
+				// Let's save all references in NEW state (we need their primary key)
+				foreach ($references as $fkName => $reference) {
+					if ($reference !== null && $reference->_getStatus() === TDBMObjectStateEnum::STATE_NEW) {
+						$this->save($reference);
+					}
+				}
+
+				// Let's first get the primary keys
+				$tableName = $dbRow->_getDbTableName();
+				$dbRowData = $dbRow->_getDbRow();
+
+				$schema = $this->tdbmSchemaAnalyzer->getSchema();
+				$tableDescriptor = $schema->getTable($tableName);
+
+				$primaryKeys = $dbRow->_getPrimaryKeys();
+
+				$types = [];
+				$escapedDbRowData = [];
+				$escapedPrimaryKeys = [];
+
+				foreach ($dbRowData as $columnName => $value) {
+					$columnDescriptor = $tableDescriptor->getColumn($columnName);
+					$types[] = $columnDescriptor->getType();
+					$escapedDbRowData[$this->connection->quoteIdentifier($columnName)] = $value;
+				}
+				foreach ($primaryKeys as $columnName => $value) {
+					$columnDescriptor = $tableDescriptor->getColumn($columnName);
+					$types[] = $columnDescriptor->getType();
+					$escapedPrimaryKeys[$this->connection->quoteIdentifier($columnName)] = $value;
+				}
+
+				$this->connection->update($tableName, $escapedDbRowData, $escapedPrimaryKeys, $types);
+
+				// Let's check if the primary key has been updated...
+				$needsUpdatePk = false;
+				foreach ($primaryKeys as $column => $value) {
+					if (!isset($dbRowData[$column]) || $dbRowData[$column] != $value) {
+						$needsUpdatePk = true;
+						break;
+					}
+				}
+				if ($needsUpdatePk) {
+					$this->objectStorage->remove($tableName, $this->getObjectHash($primaryKeys));
+					$newPrimaryKeys = $this->getPrimaryKeysForObjectFromDbRow($dbRow);
+					$dbRow->_setPrimaryKeys($newPrimaryKeys);
+					$this->objectStorage->set($tableName, $this->getObjectHash($primaryKeys), $dbRow);
+				}
+
+				// Let's remove this object from the list of objects to save.
+				$this->removeFromToSaveObjectList($dbRow);
+			}
+
+			$object->_setStatus(TDBMObjectStateEnum::STATE_LOADED);
+		} elseif ($status === TDBMObjectStateEnum::STATE_DELETED) {
+			throw new TDBMInvalidOperationException('This object has been deleted. It cannot be saved.');
+		}
+
+		// Finally, let's save all the many to many relationships to this bean.
+		$this->persistManyToManyRelationships($object);
+	}
+
+	private function persistManyToManyRelationships(AbstractTDBMObject $object)
+	{
+		foreach ($object->_getCachedRelationships() as $pivotTableName => $storage) {
+			$tableDescriptor = $this->tdbmSchemaAnalyzer->getSchema()->getTable($pivotTableName);
+			list($localFk, $remoteFk) = $this->getPivotTableForeignKeys($pivotTableName, $object);
+
+			$toRemoveFromStorage = [];
+
+			foreach ($storage as $remoteBean) {
+				/* @var $remoteBean AbstractTDBMObject */
+				$statusArr = $storage[$remoteBean];
+				$status = $statusArr['status'];
+				$reverse = $statusArr['reverse'];
+				if ($reverse) {
+					continue;
+				}
+
+				if ($status === 'new') {
+					$remoteBeanStatus = $remoteBean->_getStatus();
+					if ($remoteBeanStatus === TDBMObjectStateEnum::STATE_NEW || $remoteBeanStatus === TDBMObjectStateEnum::STATE_DETACHED) {
+						// Let's save remote bean if needed.
+						$this->save($remoteBean);
+					}
+
+					$filters = $this->getPivotFilters($object, $remoteBean, $localFk, $remoteFk);
+
+					$types = [];
+					$escapedFilters = [];
+
+					foreach ($filters as $columnName => $value) {
+						$columnDescriptor = $tableDescriptor->getColumn($columnName);
+						$types[] = $columnDescriptor->getType();
+						$escapedFilters[$this->connection->quoteIdentifier($columnName)] = $value;
+					}
+
+					$this->connection->insert($pivotTableName, $escapedFilters, $types);
+
+					// Finally, let's mark relationships as saved.
+					$statusArr['status'] = 'loaded';
+					$storage[$remoteBean] = $statusArr;
+					$remoteStorage = $remoteBean->_getCachedRelationships()[$pivotTableName];
+					$remoteStatusArr = $remoteStorage[$object];
+					$remoteStatusArr['status'] = 'loaded';
+					$remoteStorage[$object] = $remoteStatusArr;
+				} elseif ($status === 'delete') {
+					$filters = $this->getPivotFilters($object, $remoteBean, $localFk, $remoteFk);
+
+					$types = [];
+
+					foreach ($filters as $columnName => $value) {
+						$columnDescriptor = $tableDescriptor->getColumn($columnName);
+						$types[] = $columnDescriptor->getType();
+					}
+
+					$this->connection->delete($pivotTableName, $filters, $types);
+
+					// Finally, let's remove relationships completely from bean.
+					$toRemoveFromStorage[] = $remoteBean;
+
+					$remoteBean->_getCachedRelationships()[$pivotTableName]->detach($object);
+				}
+			}
+
+			// Note: due to https://bugs.php.net/bug.php?id=65629, we cannot delete an element inside a foreach loop on a SplStorageObject.
+			// Therefore, we cache elements in the $toRemoveFromStorage to remove them at a later stage.
+			foreach ($toRemoveFromStorage as $remoteBean) {
+				$storage->detach($remoteBean);
+			}
+		}
+	}
+
+	private function getPivotFilters(AbstractTDBMObject $localBean, AbstractTDBMObject $remoteBean, ForeignKeyConstraint $localFk, ForeignKeyConstraint $remoteFk)
+	{
+		$localBeanPk = $this->getPrimaryKeyValues($localBean);
+		$remoteBeanPk = $this->getPrimaryKeyValues($remoteBean);
+		$localColumns = $localFk->getLocalColumns();
+		$remoteColumns = $remoteFk->getLocalColumns();
+
+		$localFilters = array_combine($localColumns, $localBeanPk);
+		$remoteFilters = array_combine($remoteColumns, $remoteBeanPk);
+
+		return array_merge($localFilters, $remoteFilters);
+	}
+
+	/**
+	 * Returns the "values" of the primary key.
+	 * This returns the primary key from the $primaryKey attribute, not the one stored in the columns.
+	 *
+	 * @param AbstractTDBMObject $bean
+	 *
+	 * @return array numerically indexed array of values
+	 */
+	private function getPrimaryKeyValues(AbstractTDBMObject $bean)
+	{
+		$dbRows = $bean->_getDbRows();
+		$dbRow = reset($dbRows);
+
+		return array_values($dbRow->_getPrimaryKeys());
+	}
+
+	/**
+	 * Returns a unique hash used to store the object based on its primary key.
+	 * If the array contains only one value, then the value is returned.
+	 * Otherwise, a hash representing the array is returned.
+	 *
+	 * @param array $primaryKeys An array of columns => values forming the primary key
+	 *
+	 * @return string
+	 */
+	public function getObjectHash(array $primaryKeys)
+	{
+		if (count($primaryKeys) === 1) {
+			return reset($primaryKeys);
+		} else {
+			ksort($primaryKeys);
+
+			return md5(json_encode($primaryKeys));
+		}
+	}
+
+	/**
+	 * Returns an array of primary keys from the object.
+	 * The primary keys are extracted from the object columns and not from the primary keys stored in the
+	 * $primaryKeys variable of the object.
+	 *
+	 * @param DbRow $dbRow
+	 *
+	 * @return array Returns an array of column => value
+	 */
+	public function getPrimaryKeysForObjectFromDbRow(DbRow $dbRow)
+	{
+		$table = $dbRow->_getDbTableName();
+		$dbRowData = $dbRow->_getDbRow();
+
+		return $this->_getPrimaryKeysFromObjectData($table, $dbRowData);
+	}
+
+	/**
+	 * Returns an array of primary keys for the given row.
+	 * The primary keys are extracted from the object columns.
+	 *
+	 * @param $table
+	 * @param array $columns
+	 *
+	 * @return array
+	 */
+	public function _getPrimaryKeysFromObjectData($table, array $columns)
+	{
+		$primaryKeyColumns = $this->getPrimaryKeyColumns($table);
+		$values = array();
+		foreach ($primaryKeyColumns as $column) {
+			if (isset($columns[$column])) {
+				$values[$column] = $columns[$column];
+			}
+		}
+
+		return $values;
+	}
+
+	/**
+	 * Attaches $object to this TDBMService.
+	 * The $object must be in DETACHED state and will pass in NEW state.
+	 *
+	 * @param AbstractTDBMObject $object
+	 *
+	 * @throws TDBMInvalidOperationException
+	 */
+	public function attach(AbstractTDBMObject $object)
+	{
+		$object->_attach($this);
+	}
+
+	/**
+	 * Returns an associative array (column => value) for the primary keys from the table name and an
+	 * indexed array of primary key values.
+	 *
+	 * @param string $tableName
+	 * @param array  $indexedPrimaryKeys
+	 */
+	public function _getPrimaryKeysFromIndexedPrimaryKeys($tableName, array $indexedPrimaryKeys)
+	{
+		$primaryKeyColumns = $this->tdbmSchemaAnalyzer->getSchema()->getTable($tableName)->getPrimaryKeyColumns();
+
+		if (count($primaryKeyColumns) !== count($indexedPrimaryKeys)) {
+			throw new TDBMException(sprintf('Wrong number of columns passed for primary key. Expected %s columns for table "%s",
 			got %s instead.', count($primaryKeyColumns), $tableName, count($indexedPrimaryKeys)));
-        }
-
-        return array_combine($primaryKeyColumns, $indexedPrimaryKeys);
-    }
-
-    /**
-     * Return the list of tables (from child to parent) joining the tables passed in parameter.
-     * Tables must be in a single line of inheritance. The method will find missing tables.
-     *
-     * Algorithm: one of those tables is the ultimate child. From this child, by recursively getting the parent,
-     * we must be able to find all other tables.
-     *
-     * @param string[] $tables
-     *
-     * @return string[]
-     */
-    public function _getLinkBetweenInheritedTables(array $tables)
-    {
-        sort($tables);
-
-        return $this->fromCache($this->cachePrefix.'_linkbetweeninheritedtables_'.implode('__split__', $tables),
-            function () use ($tables) {
-                return $this->_getLinkBetweenInheritedTablesWithoutCache($tables);
-            });
-    }
-
-    /**
-     * Return the list of tables (from child to parent) joining the tables passed in parameter.
-     * Tables must be in a single line of inheritance. The method will find missing tables.
-     *
-     * Algorithm: one of those tables is the ultimate child. From this child, by recursively getting the parent,
-     * we must be able to find all other tables.
-     *
-     * @param string[] $tables
-     *
-     * @return string[]
-     */
-    private function _getLinkBetweenInheritedTablesWithoutCache(array $tables)
-    {
-        $schemaAnalyzer = $this->schemaAnalyzer;
-
-        foreach ($tables as $currentTable) {
-            $allParents = [$currentTable];
-            while ($currentFk = $schemaAnalyzer->getParentRelationship($currentTable)) {
-                $currentTable = $currentFk->getForeignTableName();
-                $allParents[] = $currentTable;
-            }
-
-            // Now, does the $allParents contain all the tables we want?
-            $notFoundTables = array_diff($tables, $allParents);
-            if (empty($notFoundTables)) {
-                // We have a winner!
-                return $allParents;
-            }
-        }
-
-        throw TDBMInheritanceException::create($tables);
-    }
-
-    /**
-     * Returns the list of tables related to this table (via a parent or child inheritance relationship).
-     *
-     * @param string $table
-     *
-     * @return string[]
-     */
-    public function _getRelatedTablesByInheritance($table)
-    {
-        return $this->fromCache($this->cachePrefix.'_relatedtables_'.$table, function () use ($table) {
-            return $this->_getRelatedTablesByInheritanceWithoutCache($table);
-        });
-    }
-
-    /**
-     * Returns the list of tables related to this table (via a parent or child inheritance relationship).
-     *
-     * @param string $table
-     *
-     * @return string[]
-     */
-    private function _getRelatedTablesByInheritanceWithoutCache($table)
-    {
-        $schemaAnalyzer = $this->schemaAnalyzer;
-
-        // Let's scan the parent tables
-        $currentTable = $table;
-
-        $parentTables = [];
-
-        // Get parent relationship
-        while ($currentFk = $schemaAnalyzer->getParentRelationship($currentTable)) {
-            $currentTable = $currentFk->getForeignTableName();
-            $parentTables[] = $currentTable;
-        }
-
-        // Let's recurse in children
-        $childrenTables = $this->exploreChildrenTablesRelationships($schemaAnalyzer, $table);
-
-        return array_merge(array_reverse($parentTables), $childrenTables);
-    }
-
-    /**
-     * Explore all the children and descendant of $table and returns ForeignKeyConstraints on those.
-     *
-     * @param string $table
-     *
-     * @return string[]
-     */
-    private function exploreChildrenTablesRelationships(SchemaAnalyzer $schemaAnalyzer, $table)
-    {
-        $tables = [$table];
-        $keys = $schemaAnalyzer->getChildrenRelationships($table);
-
-        foreach ($keys as $key) {
-            $tables = array_merge($tables, $this->exploreChildrenTablesRelationships($schemaAnalyzer, $key->getLocalTableName()));
-        }
-
-        return $tables;
-    }
-
-    /**
-     * Casts a foreign key into SQL, assuming table name is used with no alias.
-     * The returned value does contain only one table. For instance:.
-     *
-     * " LEFT JOIN table2 ON table1.id = table2.table1_id"
-     *
-     * @param ForeignKeyConstraint $fk
-     * @param bool                 $leftTableIsLocal
-     *
-     * @return string
-     */
-    /*private function foreignKeyToSql(ForeignKeyConstraint $fk, $leftTableIsLocal) {
+		}
+
+		return array_combine($primaryKeyColumns, $indexedPrimaryKeys);
+	}
+
+	/**
+	 * Return the list of tables (from child to parent) joining the tables passed in parameter.
+	 * Tables must be in a single line of inheritance. The method will find missing tables.
+	 *
+	 * Algorithm: one of those tables is the ultimate child. From this child, by recursively getting the parent,
+	 * we must be able to find all other tables.
+	 *
+	 * @param string[] $tables
+	 *
+	 * @return string[]
+	 */
+	public function _getLinkBetweenInheritedTables(array $tables)
+	{
+		sort($tables);
+
+		return $this->fromCache($this->cachePrefix.'_linkbetweeninheritedtables_'.implode('__split__', $tables),
+			function () use ($tables) {
+				return $this->_getLinkBetweenInheritedTablesWithoutCache($tables);
+			});
+	}
+
+	/**
+	 * Return the list of tables (from child to parent) joining the tables passed in parameter.
+	 * Tables must be in a single line of inheritance. The method will find missing tables.
+	 *
+	 * Algorithm: one of those tables is the ultimate child. From this child, by recursively getting the parent,
+	 * we must be able to find all other tables.
+	 *
+	 * @param string[] $tables
+	 *
+	 * @return string[]
+	 */
+	private function _getLinkBetweenInheritedTablesWithoutCache(array $tables)
+	{
+		$schemaAnalyzer = $this->schemaAnalyzer;
+
+		foreach ($tables as $currentTable) {
+			$allParents = [$currentTable];
+			while ($currentFk = $schemaAnalyzer->getParentRelationship($currentTable)) {
+				$currentTable = $currentFk->getForeignTableName();
+				$allParents[] = $currentTable;
+			}
+
+			// Now, does the $allParents contain all the tables we want?
+			$notFoundTables = array_diff($tables, $allParents);
+			if (empty($notFoundTables)) {
+				// We have a winner!
+				return $allParents;
+			}
+		}
+
+		throw TDBMInheritanceException::create($tables);
+	}
+
+	/**
+	 * Returns the list of tables related to this table (via a parent or child inheritance relationship).
+	 *
+	 * @param string $table
+	 *
+	 * @return string[]
+	 */
+	public function _getRelatedTablesByInheritance($table)
+	{
+		return $this->fromCache($this->cachePrefix.'_relatedtables_'.$table, function () use ($table) {
+			return $this->_getRelatedTablesByInheritanceWithoutCache($table);
+		});
+	}
+
+	/**
+	 * Returns the list of tables related to this table (via a parent or child inheritance relationship).
+	 *
+	 * @param string $table
+	 *
+	 * @return string[]
+	 */
+	private function _getRelatedTablesByInheritanceWithoutCache($table)
+	{
+		$schemaAnalyzer = $this->schemaAnalyzer;
+
+		// Let's scan the parent tables
+		$currentTable = $table;
+
+		$parentTables = [];
+
+		// Get parent relationship
+		while ($currentFk = $schemaAnalyzer->getParentRelationship($currentTable)) {
+			$currentTable = $currentFk->getForeignTableName();
+			$parentTables[] = $currentTable;
+		}
+
+		// Let's recurse in children
+		$childrenTables = $this->exploreChildrenTablesRelationships($schemaAnalyzer, $table);
+
+		return array_merge(array_reverse($parentTables), $childrenTables);
+	}
+
+	/**
+	 * Explore all the children and descendant of $table and returns ForeignKeyConstraints on those.
+	 *
+	 * @param string $table
+	 *
+	 * @return string[]
+	 */
+	private function exploreChildrenTablesRelationships(SchemaAnalyzer $schemaAnalyzer, $table)
+	{
+		$tables = [$table];
+		$keys = $schemaAnalyzer->getChildrenRelationships($table);
+
+		foreach ($keys as $key) {
+			$tables = array_merge($tables, $this->exploreChildrenTablesRelationships($schemaAnalyzer, $key->getLocalTableName()));
+		}
+
+		return $tables;
+	}
+
+	/**
+	 * Casts a foreign key into SQL, assuming table name is used with no alias.
+	 * The returned value does contain only one table. For instance:.
+	 *
+	 * " LEFT JOIN table2 ON table1.id = table2.table1_id"
+	 *
+	 * @param ForeignKeyConstraint $fk
+	 * @param bool                 $leftTableIsLocal
+	 *
+	 * @return string
+	 */
+	/*private function foreignKeyToSql(ForeignKeyConstraint $fk, $leftTableIsLocal) {
         $onClauses = [];
         $foreignTableName = $this->connection->quoteIdentifier($fk->getForeignTableName());
         $foreignColumns = $fk->getForeignColumns();
@@ -1094,417 +1094,417 @@ 
         }
     }*/
 
-    /**
-     * Returns a `ResultIterator` object representing filtered records of "$mainTable" .
-     *
-     * The findObjects method should be the most used query method in TDBM if you want to query the database for objects.
-     * (Note: if you want to query the database for an object by its primary key, use the findObjectByPk method).
-     *
-     * The findObjects method takes in parameter:
-     * 	- mainTable: the kind of bean you want to retrieve. In TDBM, a bean matches a database row, so the
-     * 			`$mainTable` parameter should be the name of an existing table in database.
-     *  - filter: The filter is a filter bag. It is what you use to filter your request (the WHERE part in SQL).
-     *          It can be a string (SQL Where clause), or even a bean or an associative array (key = column to filter, value = value to find)
-     *  - parameters: The parameters used in the filter. If you pass a SQL string as a filter, be sure to avoid
-     *          concatenating parameters in the string (this leads to SQL injection and also to poor caching performance).
-     *          Instead, please consider passing parameters (see documentation for more details).
-     *  - additionalTablesFetch: An array of SQL tables names. The beans related to those tables will be fetched along
-     *          the main table. This is useful to avoid hitting the database with numerous subqueries.
-     *  - mode: The fetch mode of the result. See `setFetchMode()` method for more details.
-     *
-     * The `findObjects` method will return a `ResultIterator`. A `ResultIterator` is an object that behaves as an array
-     * (in ARRAY mode) at least. It can be iterated using a `foreach` loop.
-     *
-     * Finally, if filter_bag is null, the whole table is returned.
-     *
-     * @param string                       $mainTable             The name of the table queried
-     * @param string|array|null            $filter                The SQL filters to apply to the query (the WHERE part). Columns from tables different from $mainTable must be prefixed by the table name (in the form: table.column)
-     * @param array                        $parameters
-     * @param string|UncheckedOrderBy|null $orderString           The ORDER BY part of the query. Columns from tables different from $mainTable must be prefixed by the table name (in the form: table.column)
-     * @param array                        $additionalTablesFetch
-     * @param int                          $mode
-     * @param string                       $className             Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned
-     *
-     * @return ResultIterator An object representing an array of results
-     *
-     * @throws TDBMException
-     */
-    public function findObjects(string $mainTable, $filter = null, array $parameters = array(), $orderString = null, array $additionalTablesFetch = array(), $mode = null, string $className = null)
-    {
-        // $mainTable is not secured in MagicJoin, let's add a bit of security to avoid SQL injection.
-        if (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $mainTable)) {
-            throw new TDBMException(sprintf("Invalid table name: '%s'", $mainTable));
-        }
-
-        $mode = $mode ?: $this->mode;
-
-        list($filterString, $additionalParameters) = $this->buildFilterFromFilterBag($filter);
-
-        $parameters = array_merge($parameters, $additionalParameters);
-
-        $queryFactory = new FindObjectsQueryFactory($mainTable, $additionalTablesFetch, $filterString, $orderString, $this, $this->tdbmSchemaAnalyzer->getSchema(), $this->orderByAnalyzer);
-
-        return new ResultIterator($queryFactory, $parameters, $this->objectStorage, $className, $this, $this->magicQuery, $mode, $this->logger);
-    }
-
-    /**
-     * @param string                       $mainTable   The name of the table queried
-     * @param string                       $from        The from sql statement
-     * @param string|array|null            $filter      The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column)
-     * @param array                        $parameters
-     * @param string|UncheckedOrderBy|null $orderString The ORDER BY part of the query. All columns must be prefixed by the table name (in the form: table.column)
-     * @param int                          $mode
-     * @param string                       $className   Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned
-     *
-     * @return ResultIterator An object representing an array of results
-     *
-     * @throws TDBMException
-     */
-    public function findObjectsFromSql(string $mainTable, string $from, $filter = null, array $parameters = array(), $orderString = null, $mode = null, string $className = null)
-    {
-        // $mainTable is not secured in MagicJoin, let's add a bit of security to avoid SQL injection.
-        if (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $mainTable)) {
-            throw new TDBMException(sprintf("Invalid table name: '%s'", $mainTable));
-        }
-
-        $mode = $mode ?: $this->mode;
-
-        list($filterString, $additionalParameters) = $this->buildFilterFromFilterBag($filter);
-
-        $parameters = array_merge($parameters, $additionalParameters);
-
-        $queryFactory = new FindObjectsFromSqlQueryFactory($mainTable, $from, $filterString, $orderString, $this, $this->tdbmSchemaAnalyzer->getSchema(), $this->orderByAnalyzer, $this->schemaAnalyzer, $this->cache, $this->cachePrefix);
-
-        return new ResultIterator($queryFactory, $parameters, $this->objectStorage, $className, $this, $this->magicQuery, $mode, $this->logger);
-    }
-
-    /**
-     * @param $table
-     * @param array  $primaryKeys
-     * @param array  $additionalTablesFetch
-     * @param bool   $lazy                  Whether to perform lazy loading on this object or not
-     * @param string $className
-     *
-     * @return AbstractTDBMObject
-     *
-     * @throws TDBMException
-     */
-    public function findObjectByPk(string $table, array $primaryKeys, array $additionalTablesFetch = array(), bool $lazy = false, string $className = null)
-    {
-        $primaryKeys = $this->_getPrimaryKeysFromObjectData($table, $primaryKeys);
-        $hash = $this->getObjectHash($primaryKeys);
-
-        if ($this->objectStorage->has($table, $hash)) {
-            $dbRow = $this->objectStorage->get($table, $hash);
-            $bean = $dbRow->getTDBMObject();
-            if ($className !== null && !is_a($bean, $className)) {
-                throw new TDBMException("TDBM cannot create a bean of class '".$className."'. The requested object was already loaded and its class is '".get_class($bean)."'");
-            }
-
-            return $bean;
-        }
-
-        // Are we performing lazy fetching?
-        if ($lazy === true) {
-            // Can we perform lazy fetching?
-            $tables = $this->_getRelatedTablesByInheritance($table);
-            // Only allowed if no inheritance.
-            if (count($tables) === 1) {
-                if ($className === null) {
-                    try {
-                        $className = $this->getBeanClassName($table);
-                    } catch (TDBMInvalidArgumentException $e) {
-                        $className = TDBMObject::class;
-                    }
-                }
-
-                // Let's construct the bean
-                if (!isset($this->reflectionClassCache[$className])) {
-                    $this->reflectionClassCache[$className] = new \ReflectionClass($className);
-                }
-                // Let's bypass the constructor when creating the bean!
-                $bean = $this->reflectionClassCache[$className]->newInstanceWithoutConstructor();
-                /* @var $bean AbstractTDBMObject */
-                $bean->_constructLazy($table, $primaryKeys, $this);
-
-                return $bean;
-            }
-        }
-
-        // Did not find the object in cache? Let's query it!
-        return $this->findObjectOrFail($table, $primaryKeys, [], $additionalTablesFetch, $className);
-    }
-
-    /**
-     * Returns a unique bean (or null) according to the filters passed in parameter.
-     *
-     * @param string            $mainTable             The name of the table queried
-     * @param string|array|null $filter                The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column)
-     * @param array             $parameters
-     * @param array             $additionalTablesFetch
-     * @param string            $className             Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned
-     *
-     * @return AbstractTDBMObject|null The object we want, or null if no object matches the filters
-     *
-     * @throws TDBMException
-     */
-    public function findObject(string $mainTable, $filter = null, array $parameters = array(), array $additionalTablesFetch = array(), string $className = null)
-    {
-        $objects = $this->findObjects($mainTable, $filter, $parameters, null, $additionalTablesFetch, self::MODE_ARRAY, $className);
-        $page = $objects->take(0, 2);
-        $count = $page->count();
-        if ($count > 1) {
-            throw new DuplicateRowException("Error while querying an object for table '$mainTable': More than 1 row have been returned, but we should have received at most one.");
-        } elseif ($count === 0) {
-            return;
-        }
-
-        return $page[0];
-    }
-
-    /**
-     * Returns a unique bean (or null) according to the filters passed in parameter.
-     *
-     * @param string            $mainTable  The name of the table queried
-     * @param string            $from       The from sql statement
-     * @param string|array|null $filter     The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column)
-     * @param array             $parameters
-     * @param string            $className  Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned
-     *
-     * @return AbstractTDBMObject|null The object we want, or null if no object matches the filters
-     *
-     * @throws TDBMException
-     */
-    public function findObjectFromSql($mainTable, $from, $filter = null, array $parameters = array(), $className = null)
-    {
-        $objects = $this->findObjectsFromSql($mainTable, $from, $filter, $parameters, null, self::MODE_ARRAY, $className);
-        $page = $objects->take(0, 2);
-        $count = $page->count();
-        if ($count > 1) {
-            throw new DuplicateRowException("Error while querying an object for table '$mainTable': More than 1 row have been returned, but we should have received at most one.");
-        } elseif ($count === 0) {
-            return;
-        }
-
-        return $page[0];
-    }
-
-    /**
-     * Returns a unique bean according to the filters passed in parameter.
-     * Throws a NoBeanFoundException if no bean was found for the filter passed in parameter.
-     *
-     * @param string            $mainTable             The name of the table queried
-     * @param string|array|null $filter                The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column)
-     * @param array             $parameters
-     * @param array             $additionalTablesFetch
-     * @param string            $className             Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned
-     *
-     * @return AbstractTDBMObject The object we want
-     *
-     * @throws TDBMException
-     */
-    public function findObjectOrFail(string $mainTable, $filter = null, array $parameters = array(), array $additionalTablesFetch = array(), string $className = null)
-    {
-        $bean = $this->findObject($mainTable, $filter, $parameters, $additionalTablesFetch, $className);
-        if ($bean === null) {
-            throw new NoBeanFoundException("No result found for query on table '".$mainTable."'");
-        }
-
-        return $bean;
-    }
-
-    /**
-     * @param array $beanData An array of data: array<table, array<column, value>>
-     *
-     * @return array an array with first item = class name, second item = table name and third item = list of tables needed
-     *
-     * @throws TDBMInheritanceException
-     */
-    public function _getClassNameFromBeanData(array $beanData)
-    {
-        if (count($beanData) === 1) {
-            $tableName = array_keys($beanData)[0];
-            $allTables = [$tableName];
-        } else {
-            $tables = [];
-            foreach ($beanData as $table => $row) {
-                $primaryKeyColumns = $this->getPrimaryKeyColumns($table);
-                $pkSet = false;
-                foreach ($primaryKeyColumns as $columnName) {
-                    if ($row[$columnName] !== null) {
-                        $pkSet = true;
-                        break;
-                    }
-                }
-                if ($pkSet) {
-                    $tables[] = $table;
-                }
-            }
-
-            // $tables contains the tables for this bean. Let's view the top most part of the hierarchy
-            try {
-                $allTables = $this->_getLinkBetweenInheritedTables($tables);
-            } catch (TDBMInheritanceException $e) {
-                throw TDBMInheritanceException::extendException($e, $this, $beanData);
-            }
-            $tableName = $allTables[0];
-        }
-
-        // Only one table in this bean. Life is sweat, let's look at its type:
-        try {
-            $className = $this->getBeanClassName($tableName);
-        } catch (TDBMInvalidArgumentException $e) {
-            $className = 'Mouf\\Database\\TDBM\\TDBMObject';
-        }
-
-        return [$className, $tableName, $allTables];
-    }
-
-    /**
-     * Returns an item from cache or computes it using $closure and puts it in cache.
-     *
-     * @param string   $key
-     * @param callable $closure
-     *
-     * @return mixed
-     */
-    private function fromCache(string $key, callable $closure)
-    {
-        $item = $this->cache->fetch($key);
-        if ($item === false) {
-            $item = $closure();
-            $this->cache->save($key, $item);
-        }
-
-        return $item;
-    }
-
-    /**
-     * Returns the foreign key object.
-     *
-     * @param string $table
-     * @param string $fkName
-     *
-     * @return ForeignKeyConstraint
-     */
-    public function _getForeignKeyByName(string $table, string $fkName)
-    {
-        return $this->tdbmSchemaAnalyzer->getSchema()->getTable($table)->getForeignKey($fkName);
-    }
-
-    /**
-     * @param $pivotTableName
-     * @param AbstractTDBMObject $bean
-     *
-     * @return AbstractTDBMObject[]
-     */
-    public function _getRelatedBeans(string $pivotTableName, AbstractTDBMObject $bean)
-    {
-        list($localFk, $remoteFk) = $this->getPivotTableForeignKeys($pivotTableName, $bean);
-        /* @var $localFk ForeignKeyConstraint */
-        /* @var $remoteFk ForeignKeyConstraint */
-        $remoteTable = $remoteFk->getForeignTableName();
-
-        $primaryKeys = $this->getPrimaryKeyValues($bean);
-        $columnNames = array_map(function ($name) use ($pivotTableName) {
-            return $pivotTableName.'.'.$name;
-        }, $localFk->getLocalColumns());
-
-        $filter = array_combine($columnNames, $primaryKeys);
-
-        return $this->findObjects($remoteTable, $filter);
-    }
-
-    /**
-     * @param $pivotTableName
-     * @param AbstractTDBMObject $bean The LOCAL bean
-     *
-     * @return ForeignKeyConstraint[] First item: the LOCAL bean, second item: the REMOTE bean
-     *
-     * @throws TDBMException
-     */
-    private function getPivotTableForeignKeys(string $pivotTableName, AbstractTDBMObject $bean)
-    {
-        $fks = array_values($this->tdbmSchemaAnalyzer->getSchema()->getTable($pivotTableName)->getForeignKeys());
-        $table1 = $fks[0]->getForeignTableName();
-        $table2 = $fks[1]->getForeignTableName();
-
-        $beanTables = array_map(function (DbRow $dbRow) {
-            return $dbRow->_getDbTableName();
-        }, $bean->_getDbRows());
-
-        if (in_array($table1, $beanTables)) {
-            return [$fks[0], $fks[1]];
-        } elseif (in_array($table2, $beanTables)) {
-            return [$fks[1], $fks[0]];
-        } else {
-            throw new TDBMException("Unexpected bean type in getPivotTableForeignKeys. Awaiting beans from table {$table1} and {$table2} for pivot table {$pivotTableName}");
-        }
-    }
-
-    /**
-     * Returns a list of pivot tables linked to $bean.
-     *
-     * @param AbstractTDBMObject $bean
-     *
-     * @return string[]
-     */
-    public function _getPivotTablesLinkedToBean(AbstractTDBMObject $bean)
-    {
-        $junctionTables = [];
-        $allJunctionTables = $this->schemaAnalyzer->detectJunctionTables(true);
-        foreach ($bean->_getDbRows() as $dbRow) {
-            foreach ($allJunctionTables as $table) {
-                // There are exactly 2 FKs since this is a pivot table.
-                $fks = array_values($table->getForeignKeys());
-
-                if ($fks[0]->getForeignTableName() === $dbRow->_getDbTableName() || $fks[1]->getForeignTableName() === $dbRow->_getDbTableName()) {
-                    $junctionTables[] = $table->getName();
-                }
-            }
-        }
-
-        return $junctionTables;
-    }
-
-    /**
-     * Array of types for tables.
-     * Key: table name
-     * Value: array of types indexed by column.
-     *
-     * @var array[]
-     */
-    private $typesForTable = [];
-
-    /**
-     * @internal
-     *
-     * @param string $tableName
-     *
-     * @return Type[]
-     */
-    public function _getColumnTypesForTable(string $tableName)
-    {
-        if (!isset($typesForTable[$tableName])) {
-            $columns = $this->tdbmSchemaAnalyzer->getSchema()->getTable($tableName)->getColumns();
-            $typesForTable[$tableName] = array_map(function (Column $column) {
-                return $column->getType();
-            }, $columns);
-        }
-
-        return $typesForTable[$tableName];
-    }
-
-    /**
-     * Sets the minimum log level.
-     * $level must be one of Psr\Log\LogLevel::xxx.
-     *
-     * Defaults to LogLevel::WARNING
-     *
-     * @param string $level
-     */
-    public function setLogLevel(string $level)
-    {
-        $this->logger = new LevelFilter($this->rootLogger, $level);
-    }
+	/**
+	 * Returns a `ResultIterator` object representing filtered records of "$mainTable" .
+	 *
+	 * The findObjects method should be the most used query method in TDBM if you want to query the database for objects.
+	 * (Note: if you want to query the database for an object by its primary key, use the findObjectByPk method).
+	 *
+	 * The findObjects method takes in parameter:
+	 * 	- mainTable: the kind of bean you want to retrieve. In TDBM, a bean matches a database row, so the
+	 * 			`$mainTable` parameter should be the name of an existing table in database.
+	 *  - filter: The filter is a filter bag. It is what you use to filter your request (the WHERE part in SQL).
+	 *          It can be a string (SQL Where clause), or even a bean or an associative array (key = column to filter, value = value to find)
+	 *  - parameters: The parameters used in the filter. If you pass a SQL string as a filter, be sure to avoid
+	 *          concatenating parameters in the string (this leads to SQL injection and also to poor caching performance).
+	 *          Instead, please consider passing parameters (see documentation for more details).
+	 *  - additionalTablesFetch: An array of SQL tables names. The beans related to those tables will be fetched along
+	 *          the main table. This is useful to avoid hitting the database with numerous subqueries.
+	 *  - mode: The fetch mode of the result. See `setFetchMode()` method for more details.
+	 *
+	 * The `findObjects` method will return a `ResultIterator`. A `ResultIterator` is an object that behaves as an array
+	 * (in ARRAY mode) at least. It can be iterated using a `foreach` loop.
+	 *
+	 * Finally, if filter_bag is null, the whole table is returned.
+	 *
+	 * @param string                       $mainTable             The name of the table queried
+	 * @param string|array|null            $filter                The SQL filters to apply to the query (the WHERE part). Columns from tables different from $mainTable must be prefixed by the table name (in the form: table.column)
+	 * @param array                        $parameters
+	 * @param string|UncheckedOrderBy|null $orderString           The ORDER BY part of the query. Columns from tables different from $mainTable must be prefixed by the table name (in the form: table.column)
+	 * @param array                        $additionalTablesFetch
+	 * @param int                          $mode
+	 * @param string                       $className             Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned
+	 *
+	 * @return ResultIterator An object representing an array of results
+	 *
+	 * @throws TDBMException
+	 */
+	public function findObjects(string $mainTable, $filter = null, array $parameters = array(), $orderString = null, array $additionalTablesFetch = array(), $mode = null, string $className = null)
+	{
+		// $mainTable is not secured in MagicJoin, let's add a bit of security to avoid SQL injection.
+		if (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $mainTable)) {
+			throw new TDBMException(sprintf("Invalid table name: '%s'", $mainTable));
+		}
+
+		$mode = $mode ?: $this->mode;
+
+		list($filterString, $additionalParameters) = $this->buildFilterFromFilterBag($filter);
+
+		$parameters = array_merge($parameters, $additionalParameters);
+
+		$queryFactory = new FindObjectsQueryFactory($mainTable, $additionalTablesFetch, $filterString, $orderString, $this, $this->tdbmSchemaAnalyzer->getSchema(), $this->orderByAnalyzer);
+
+		return new ResultIterator($queryFactory, $parameters, $this->objectStorage, $className, $this, $this->magicQuery, $mode, $this->logger);
+	}
+
+	/**
+	 * @param string                       $mainTable   The name of the table queried
+	 * @param string                       $from        The from sql statement
+	 * @param string|array|null            $filter      The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column)
+	 * @param array                        $parameters
+	 * @param string|UncheckedOrderBy|null $orderString The ORDER BY part of the query. All columns must be prefixed by the table name (in the form: table.column)
+	 * @param int                          $mode
+	 * @param string                       $className   Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned
+	 *
+	 * @return ResultIterator An object representing an array of results
+	 *
+	 * @throws TDBMException
+	 */
+	public function findObjectsFromSql(string $mainTable, string $from, $filter = null, array $parameters = array(), $orderString = null, $mode = null, string $className = null)
+	{
+		// $mainTable is not secured in MagicJoin, let's add a bit of security to avoid SQL injection.
+		if (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $mainTable)) {
+			throw new TDBMException(sprintf("Invalid table name: '%s'", $mainTable));
+		}
+
+		$mode = $mode ?: $this->mode;
+
+		list($filterString, $additionalParameters) = $this->buildFilterFromFilterBag($filter);
+
+		$parameters = array_merge($parameters, $additionalParameters);
+
+		$queryFactory = new FindObjectsFromSqlQueryFactory($mainTable, $from, $filterString, $orderString, $this, $this->tdbmSchemaAnalyzer->getSchema(), $this->orderByAnalyzer, $this->schemaAnalyzer, $this->cache, $this->cachePrefix);
+
+		return new ResultIterator($queryFactory, $parameters, $this->objectStorage, $className, $this, $this->magicQuery, $mode, $this->logger);
+	}
+
+	/**
+	 * @param $table
+	 * @param array  $primaryKeys
+	 * @param array  $additionalTablesFetch
+	 * @param bool   $lazy                  Whether to perform lazy loading on this object or not
+	 * @param string $className
+	 *
+	 * @return AbstractTDBMObject
+	 *
+	 * @throws TDBMException
+	 */
+	public function findObjectByPk(string $table, array $primaryKeys, array $additionalTablesFetch = array(), bool $lazy = false, string $className = null)
+	{
+		$primaryKeys = $this->_getPrimaryKeysFromObjectData($table, $primaryKeys);
+		$hash = $this->getObjectHash($primaryKeys);
+
+		if ($this->objectStorage->has($table, $hash)) {
+			$dbRow = $this->objectStorage->get($table, $hash);
+			$bean = $dbRow->getTDBMObject();
+			if ($className !== null && !is_a($bean, $className)) {
+				throw new TDBMException("TDBM cannot create a bean of class '".$className."'. The requested object was already loaded and its class is '".get_class($bean)."'");
+			}
+
+			return $bean;
+		}
+
+		// Are we performing lazy fetching?
+		if ($lazy === true) {
+			// Can we perform lazy fetching?
+			$tables = $this->_getRelatedTablesByInheritance($table);
+			// Only allowed if no inheritance.
+			if (count($tables) === 1) {
+				if ($className === null) {
+					try {
+						$className = $this->getBeanClassName($table);
+					} catch (TDBMInvalidArgumentException $e) {
+						$className = TDBMObject::class;
+					}
+				}
+
+				// Let's construct the bean
+				if (!isset($this->reflectionClassCache[$className])) {
+					$this->reflectionClassCache[$className] = new \ReflectionClass($className);
+				}
+				// Let's bypass the constructor when creating the bean!
+				$bean = $this->reflectionClassCache[$className]->newInstanceWithoutConstructor();
+				/* @var $bean AbstractTDBMObject */
+				$bean->_constructLazy($table, $primaryKeys, $this);
+
+				return $bean;
+			}
+		}
+
+		// Did not find the object in cache? Let's query it!
+		return $this->findObjectOrFail($table, $primaryKeys, [], $additionalTablesFetch, $className);
+	}
+
+	/**
+	 * Returns a unique bean (or null) according to the filters passed in parameter.
+	 *
+	 * @param string            $mainTable             The name of the table queried
+	 * @param string|array|null $filter                The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column)
+	 * @param array             $parameters
+	 * @param array             $additionalTablesFetch
+	 * @param string            $className             Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned
+	 *
+	 * @return AbstractTDBMObject|null The object we want, or null if no object matches the filters
+	 *
+	 * @throws TDBMException
+	 */
+	public function findObject(string $mainTable, $filter = null, array $parameters = array(), array $additionalTablesFetch = array(), string $className = null)
+	{
+		$objects = $this->findObjects($mainTable, $filter, $parameters, null, $additionalTablesFetch, self::MODE_ARRAY, $className);
+		$page = $objects->take(0, 2);
+		$count = $page->count();
+		if ($count > 1) {
+			throw new DuplicateRowException("Error while querying an object for table '$mainTable': More than 1 row have been returned, but we should have received at most one.");
+		} elseif ($count === 0) {
+			return;
+		}
+
+		return $page[0];
+	}
+
+	/**
+	 * Returns a unique bean (or null) according to the filters passed in parameter.
+	 *
+	 * @param string            $mainTable  The name of the table queried
+	 * @param string            $from       The from sql statement
+	 * @param string|array|null $filter     The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column)
+	 * @param array             $parameters
+	 * @param string            $className  Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned
+	 *
+	 * @return AbstractTDBMObject|null The object we want, or null if no object matches the filters
+	 *
+	 * @throws TDBMException
+	 */
+	public function findObjectFromSql($mainTable, $from, $filter = null, array $parameters = array(), $className = null)
+	{
+		$objects = $this->findObjectsFromSql($mainTable, $from, $filter, $parameters, null, self::MODE_ARRAY, $className);
+		$page = $objects->take(0, 2);
+		$count = $page->count();
+		if ($count > 1) {
+			throw new DuplicateRowException("Error while querying an object for table '$mainTable': More than 1 row have been returned, but we should have received at most one.");
+		} elseif ($count === 0) {
+			return;
+		}
+
+		return $page[0];
+	}
+
+	/**
+	 * Returns a unique bean according to the filters passed in parameter.
+	 * Throws a NoBeanFoundException if no bean was found for the filter passed in parameter.
+	 *
+	 * @param string            $mainTable             The name of the table queried
+	 * @param string|array|null $filter                The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column)
+	 * @param array             $parameters
+	 * @param array             $additionalTablesFetch
+	 * @param string            $className             Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned
+	 *
+	 * @return AbstractTDBMObject The object we want
+	 *
+	 * @throws TDBMException
+	 */
+	public function findObjectOrFail(string $mainTable, $filter = null, array $parameters = array(), array $additionalTablesFetch = array(), string $className = null)
+	{
+		$bean = $this->findObject($mainTable, $filter, $parameters, $additionalTablesFetch, $className);
+		if ($bean === null) {
+			throw new NoBeanFoundException("No result found for query on table '".$mainTable."'");
+		}
+
+		return $bean;
+	}
+
+	/**
+	 * @param array $beanData An array of data: array<table, array<column, value>>
+	 *
+	 * @return array an array with first item = class name, second item = table name and third item = list of tables needed
+	 *
+	 * @throws TDBMInheritanceException
+	 */
+	public function _getClassNameFromBeanData(array $beanData)
+	{
+		if (count($beanData) === 1) {
+			$tableName = array_keys($beanData)[0];
+			$allTables = [$tableName];
+		} else {
+			$tables = [];
+			foreach ($beanData as $table => $row) {
+				$primaryKeyColumns = $this->getPrimaryKeyColumns($table);
+				$pkSet = false;
+				foreach ($primaryKeyColumns as $columnName) {
+					if ($row[$columnName] !== null) {
+						$pkSet = true;
+						break;
+					}
+				}
+				if ($pkSet) {
+					$tables[] = $table;
+				}
+			}
+
+			// $tables contains the tables for this bean. Let's view the top most part of the hierarchy
+			try {
+				$allTables = $this->_getLinkBetweenInheritedTables($tables);
+			} catch (TDBMInheritanceException $e) {
+				throw TDBMInheritanceException::extendException($e, $this, $beanData);
+			}
+			$tableName = $allTables[0];
+		}
+
+		// Only one table in this bean. Life is sweat, let's look at its type:
+		try {
+			$className = $this->getBeanClassName($tableName);
+		} catch (TDBMInvalidArgumentException $e) {
+			$className = 'Mouf\\Database\\TDBM\\TDBMObject';
+		}
+
+		return [$className, $tableName, $allTables];
+	}
+
+	/**
+	 * Returns an item from cache or computes it using $closure and puts it in cache.
+	 *
+	 * @param string   $key
+	 * @param callable $closure
+	 *
+	 * @return mixed
+	 */
+	private function fromCache(string $key, callable $closure)
+	{
+		$item = $this->cache->fetch($key);
+		if ($item === false) {
+			$item = $closure();
+			$this->cache->save($key, $item);
+		}
+
+		return $item;
+	}
+
+	/**
+	 * Returns the foreign key object.
+	 *
+	 * @param string $table
+	 * @param string $fkName
+	 *
+	 * @return ForeignKeyConstraint
+	 */
+	public function _getForeignKeyByName(string $table, string $fkName)
+	{
+		return $this->tdbmSchemaAnalyzer->getSchema()->getTable($table)->getForeignKey($fkName);
+	}
+
+	/**
+	 * @param $pivotTableName
+	 * @param AbstractTDBMObject $bean
+	 *
+	 * @return AbstractTDBMObject[]
+	 */
+	public function _getRelatedBeans(string $pivotTableName, AbstractTDBMObject $bean)
+	{
+		list($localFk, $remoteFk) = $this->getPivotTableForeignKeys($pivotTableName, $bean);
+		/* @var $localFk ForeignKeyConstraint */
+		/* @var $remoteFk ForeignKeyConstraint */
+		$remoteTable = $remoteFk->getForeignTableName();
+
+		$primaryKeys = $this->getPrimaryKeyValues($bean);
+		$columnNames = array_map(function ($name) use ($pivotTableName) {
+			return $pivotTableName.'.'.$name;
+		}, $localFk->getLocalColumns());
+
+		$filter = array_combine($columnNames, $primaryKeys);
+
+		return $this->findObjects($remoteTable, $filter);
+	}
+
+	/**
+	 * @param $pivotTableName
+	 * @param AbstractTDBMObject $bean The LOCAL bean
+	 *
+	 * @return ForeignKeyConstraint[] First item: the LOCAL bean, second item: the REMOTE bean
+	 *
+	 * @throws TDBMException
+	 */
+	private function getPivotTableForeignKeys(string $pivotTableName, AbstractTDBMObject $bean)
+	{
+		$fks = array_values($this->tdbmSchemaAnalyzer->getSchema()->getTable($pivotTableName)->getForeignKeys());
+		$table1 = $fks[0]->getForeignTableName();
+		$table2 = $fks[1]->getForeignTableName();
+
+		$beanTables = array_map(function (DbRow $dbRow) {
+			return $dbRow->_getDbTableName();
+		}, $bean->_getDbRows());
+
+		if (in_array($table1, $beanTables)) {
+			return [$fks[0], $fks[1]];
+		} elseif (in_array($table2, $beanTables)) {
+			return [$fks[1], $fks[0]];
+		} else {
+			throw new TDBMException("Unexpected bean type in getPivotTableForeignKeys. Awaiting beans from table {$table1} and {$table2} for pivot table {$pivotTableName}");
+		}
+	}
+
+	/**
+	 * Returns a list of pivot tables linked to $bean.
+	 *
+	 * @param AbstractTDBMObject $bean
+	 *
+	 * @return string[]
+	 */
+	public function _getPivotTablesLinkedToBean(AbstractTDBMObject $bean)
+	{
+		$junctionTables = [];
+		$allJunctionTables = $this->schemaAnalyzer->detectJunctionTables(true);
+		foreach ($bean->_getDbRows() as $dbRow) {
+			foreach ($allJunctionTables as $table) {
+				// There are exactly 2 FKs since this is a pivot table.
+				$fks = array_values($table->getForeignKeys());
+
+				if ($fks[0]->getForeignTableName() === $dbRow->_getDbTableName() || $fks[1]->getForeignTableName() === $dbRow->_getDbTableName()) {
+					$junctionTables[] = $table->getName();
+				}
+			}
+		}
+
+		return $junctionTables;
+	}
+
+	/**
+	 * Array of types for tables.
+	 * Key: table name
+	 * Value: array of types indexed by column.
+	 *
+	 * @var array[]
+	 */
+	private $typesForTable = [];
+
+	/**
+	 * @internal
+	 *
+	 * @param string $tableName
+	 *
+	 * @return Type[]
+	 */
+	public function _getColumnTypesForTable(string $tableName)
+	{
+		if (!isset($typesForTable[$tableName])) {
+			$columns = $this->tdbmSchemaAnalyzer->getSchema()->getTable($tableName)->getColumns();
+			$typesForTable[$tableName] = array_map(function (Column $column) {
+				return $column->getType();
+			}, $columns);
+		}
+
+		return $typesForTable[$tableName];
+	}
+
+	/**
+	 * Sets the minimum log level.
+	 * $level must be one of Psr\Log\LogLevel::xxx.
+	 *
+	 * Defaults to LogLevel::WARNING
+	 *
+	 * @param string $level
+	 */
+	public function setLogLevel(string $level)
+	{
+		$this->logger = new LevelFilter($this->rootLogger, $level);
+	}
 }

src/Mouf/Database/TDBM/UncheckedOrderBy.php

Indentation +18 added lines, -18 removed lines

@@ -20,24 +20,24 @@
  */
 class UncheckedOrderBy
 {
-    /**
-     * @var string
-     */
-    private $orderBy;
+	/**
+	 * @var string
+	 */
+	private $orderBy;
 
-    /**
-     * @param $orderBy
-     */
-    public function __construct(string $orderBy)
-    {
-        $this->orderBy = $orderBy;
-    }
+	/**
+	 * @param $orderBy
+	 */
+	public function __construct(string $orderBy)
+	{
+		$this->orderBy = $orderBy;
+	}
 
-    /**
-     * @return string
-     */
-    public function getOrderBy() : string
-    {
-        return $this->orderBy;
-    }
+	/**
+	 * @return string
+	 */
+	public function getOrderBy() : string
+	{
+		return $this->orderBy;
+	}
 }

src/Mouf/Database/TDBM/QueryFactory/FindObjectsQueryFactory.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
         $sql = 'SELECT DISTINCT '.implode(', ', $columnsList).' FROM MAGICJOIN('.$this->mainTable.')';
 
         $pkColumnNames = $this->schema->getTable($this->mainTable)->getPrimaryKeyColumns();
-        $pkColumnNames = array_map(function ($pkColumn) {
+        $pkColumnNames = array_map(function($pkColumn) {
             return $this->tdbmService->getConnection()->quoteIdentifier($this->mainTable).'.'.$this->tdbmService->getConnection()->quoteIdentifier($pkColumn);
         }, $pkColumnNames);
 

Indentation +38 added lines, -38 removed lines

@@ -11,44 +11,44 @@
  */
 class FindObjectsQueryFactory extends AbstractQueryFactory
 {
-    private $mainTable;
-    private $additionalTablesFetch;
-    private $filterString;
-
-    public function __construct(string $mainTable, array $additionalTablesFetch, $filterString, $orderBy, TDBMService $tdbmService, Schema $schema, OrderByAnalyzer $orderByAnalyzer)
-    {
-        parent::__construct($tdbmService, $schema, $orderByAnalyzer, $orderBy);
-        $this->mainTable = $mainTable;
-        $this->additionalTablesFetch = $additionalTablesFetch;
-        $this->filterString = $filterString;
-    }
-
-    protected function compute()
-    {
-        list($columnDescList, $columnsList, $orderString) = $this->getColumnsList($this->mainTable, $this->additionalTablesFetch, $this->orderBy);
-
-        $sql = 'SELECT DISTINCT '.implode(', ', $columnsList).' FROM MAGICJOIN('.$this->mainTable.')';
-
-        $pkColumnNames = $this->schema->getTable($this->mainTable)->getPrimaryKeyColumns();
-        $pkColumnNames = array_map(function ($pkColumn) {
-            return $this->tdbmService->getConnection()->quoteIdentifier($this->mainTable).'.'.$this->tdbmService->getConnection()->quoteIdentifier($pkColumn);
-        }, $pkColumnNames);
-
-        $countSql = 'SELECT COUNT(DISTINCT '.implode(', ', $pkColumnNames).') FROM MAGICJOIN('.$this->mainTable.')';
-
-        if (!empty($this->filterString)) {
-            $sql .= ' WHERE '.$this->filterString;
-            $countSql .= ' WHERE '.$this->filterString;
-        }
-
-        if (!empty($orderString)) {
-            $sql .= ' ORDER BY '.$orderString;
-        }
-
-        $this->magicSql = $sql;
-        $this->magicSqlCount = $countSql;
-        $this->columnDescList = $columnDescList;
-    }
+	private $mainTable;
+	private $additionalTablesFetch;
+	private $filterString;
+
+	public function __construct(string $mainTable, array $additionalTablesFetch, $filterString, $orderBy, TDBMService $tdbmService, Schema $schema, OrderByAnalyzer $orderByAnalyzer)
+	{
+		parent::__construct($tdbmService, $schema, $orderByAnalyzer, $orderBy);
+		$this->mainTable = $mainTable;
+		$this->additionalTablesFetch = $additionalTablesFetch;
+		$this->filterString = $filterString;
+	}
+
+	protected function compute()
+	{
+		list($columnDescList, $columnsList, $orderString) = $this->getColumnsList($this->mainTable, $this->additionalTablesFetch, $this->orderBy);
+
+		$sql = 'SELECT DISTINCT '.implode(', ', $columnsList).' FROM MAGICJOIN('.$this->mainTable.')';
+
+		$pkColumnNames = $this->schema->getTable($this->mainTable)->getPrimaryKeyColumns();
+		$pkColumnNames = array_map(function ($pkColumn) {
+			return $this->tdbmService->getConnection()->quoteIdentifier($this->mainTable).'.'.$this->tdbmService->getConnection()->quoteIdentifier($pkColumn);
+		}, $pkColumnNames);
+
+		$countSql = 'SELECT COUNT(DISTINCT '.implode(', ', $pkColumnNames).') FROM MAGICJOIN('.$this->mainTable.')';
+
+		if (!empty($this->filterString)) {
+			$sql .= ' WHERE '.$this->filterString;
+			$countSql .= ' WHERE '.$this->filterString;
+		}
+
+		if (!empty($orderString)) {
+			$sql .= ' ORDER BY '.$orderString;
+		}
+
+		$this->magicSql = $sql;
+		$this->magicSqlCount = $countSql;
+		$this->columnDescList = $columnDescList;
+	}
 
 
 }

src/Mouf/Database/TDBM/QueryFactory/QueryFactory.php

Indentation +18 added lines, -18 removed lines

@@ -9,25 +9,25 @@
  */
 interface QueryFactory
 {
-    /**
-     * Sets the ORDER BY directive executed in SQL.
-     *
-     * For instance:
-     *
-     *  $queryFactory->sort('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:
-     *
-     *  $queryFactory->sort(new UncheckedOrderBy('RAND()'))
-     *
-     * @param string|UncheckedOrderBy|null $orderBy
-     */
-    public function sort($orderBy);
+	/**
+	 * Sets the ORDER BY directive executed in SQL.
+	 *
+	 * For instance:
+	 *
+	 *  $queryFactory->sort('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:
+	 *
+	 *  $queryFactory->sort(new UncheckedOrderBy('RAND()'))
+	 *
+	 * @param string|UncheckedOrderBy|null $orderBy
+	 */
+	public function sort($orderBy);
 
-    public function getMagicSql() : string;
+	public function getMagicSql() : string;
 
-    public function getMagicSqlCount() : string;
+	public function getMagicSqlCount() : string;
 
-    public function getColumnDescriptors() : array;
+	public function getColumnDescriptors() : array;
 }

src/Mouf/Database/TDBM/QueryFactory/AbstractQueryFactory.php

Indentation +210 added lines, -210 removed lines

@@ -10,214 +10,214 @@
 
 abstract class AbstractQueryFactory implements QueryFactory
 {
-    /**
-     * @var TDBMService
-     */
-    protected $tdbmService;
-
-    /**
-     * @var Schema
-     */
-    protected $schema;
-
-    /**
-     * @var OrderByAnalyzer
-     */
-    protected $orderByAnalyzer;
-
-    /**
-     * @var string|UncheckedOrderBy|null
-     */
-    protected $orderBy;
-
-    protected $magicSql;
-    protected $magicSqlCount;
-    protected $columnDescList;
-
-    /**
-     * @param TDBMService $tdbmService
-     */
-    public function __construct(TDBMService $tdbmService, Schema $schema, OrderByAnalyzer $orderByAnalyzer, $orderBy)
-    {
-        $this->tdbmService = $tdbmService;
-        $this->schema = $schema;
-        $this->orderByAnalyzer = $orderByAnalyzer;
-        $this->orderBy = $orderBy;
-    }
-
-    /**
-     * Returns the column list that must be fetched for the SQL request.
-     *
-     * Note: MySQL dictates that ORDER BYed columns should appear in the SELECT clause.
-     *
-     * @param string                       $mainTable
-     * @param array                        $additionalTablesFetch
-     * @param string|UncheckedOrderBy|null $orderBy
-     *
-     * @return array
-     *
-     * @throws \Doctrine\DBAL\Schema\SchemaException
-     */
-    protected function getColumnsList(string $mainTable, array $additionalTablesFetch = array(), $orderBy = null)
-    {
-        // From the table name and the additional tables we want to fetch, let's build a list of all tables
-        // that must be part of the select columns.
-
-        $connection = $this->tdbmService->getConnection();
-
-        $tableGroups = [];
-        $allFetchedTables = $this->tdbmService->_getRelatedTablesByInheritance($mainTable);
-        $tableGroupName = $this->getTableGroupName($allFetchedTables);
-        foreach ($allFetchedTables as $table) {
-            $tableGroups[$table] = $tableGroupName;
-        }
-
-        $columnsList = [];
-        $columnDescList = [];
-        $sortColumn = 0;
-        $reconstructedOrderBy = null;
-
-        if (is_string($orderBy)) {
-            $orderBy = trim($orderBy);
-            if ($orderBy === '') {
-                $orderBy = null;
-            }
-        }
-
-        // Now, let's deal with "order by columns"
-        if ($orderBy !== null) {
-            if ($orderBy instanceof UncheckedOrderBy) {
-                $securedOrderBy = false;
-                $orderBy = $orderBy->getOrderBy();
-                $reconstructedOrderBy = $orderBy;
-            } else {
-                $securedOrderBy = true;
-                $reconstructedOrderBys = [];
-            }
-            $orderByColumns = $this->orderByAnalyzer->analyzeOrderBy($orderBy);
-
-            // If we sort by a column, there is a high chance we will fetch the bean containing this column.
-            // Hence, we should add the table to the $additionalTablesFetch
-            foreach ($orderByColumns as $orderByColumn) {
-                if ($orderByColumn['type'] === 'colref') {
-                    if ($orderByColumn['table'] !== null) {
-                        $additionalTablesFetch[] = $orderByColumn['table'];
-                    }
-                    if ($securedOrderBy) {
-                        $reconstructedOrderBys[] = ($orderByColumn['table'] !== null ? $connection->quoteIdentifier($orderByColumn['table']).'.' : '').$connection->quoteIdentifier($orderByColumn['column']).' '.$orderByColumn['direction'];
-                    }
-                } elseif ($orderByColumn['type'] === 'expr') {
-                    $sortColumnName = 'sort_column_'.$sortColumn;
-                    $columnsList[] = $orderByColumn['expr'].' as '.$sortColumnName;
-                    $columnDescList[] = [
-                        'tableGroup' => null,
-                    ];
-                    ++$sortColumn;
-
-                    if ($securedOrderBy) {
-                        throw new TDBMInvalidArgumentException('Invalid ORDER BY column: "'.$orderByColumn['expr'].'". If you want to use expression in your ORDER BY clause, you must wrap them in a UncheckedOrderBy object. For instance: new UncheckedOrderBy("col1 + col2 DESC")');
-                    }
-                }
-            }
-
-            if ($reconstructedOrderBy === null) {
-                $reconstructedOrderBy = implode(', ', $reconstructedOrderBys);
-            }
-        }
-
-        foreach ($additionalTablesFetch as $additionalTable) {
-            $relatedTables = $this->tdbmService->_getRelatedTablesByInheritance($additionalTable);
-            $tableGroupName = $this->getTableGroupName($relatedTables);
-            foreach ($relatedTables as $table) {
-                $tableGroups[$table] = $tableGroupName;
-            }
-            $allFetchedTables = array_merge($allFetchedTables, $relatedTables);
-        }
-
-        // Let's remove any duplicate
-        $allFetchedTables = array_flip(array_flip($allFetchedTables));
-
-        // Now, let's build the column list
-        foreach ($allFetchedTables as $table) {
-            foreach ($this->schema->getTable($table)->getColumns() as $column) {
-                $columnName = $column->getName();
-                $columnDescList[] = [
-                    'as' => $table.'____'.$columnName,
-                    'table' => $table,
-                    'column' => $columnName,
-                    'type' => $column->getType(),
-                    'tableGroup' => $tableGroups[$table],
-                ];
-                $columnsList[] = $connection->quoteIdentifier($table).'.'.$connection->quoteIdentifier($columnName).' as '.
-                    $connection->quoteIdentifier($table.'____'.$columnName);
-            }
-        }
-
-        return [$columnDescList, $columnsList, $reconstructedOrderBy];
-    }
-
-    abstract protected function compute();
-
-    /**
-     * Returns an identifier for the group of tables passed in parameter.
-     *
-     * @param string[] $relatedTables
-     *
-     * @return string
-     */
-    protected function getTableGroupName(array $relatedTables)
-    {
-        sort($relatedTables);
-
-        return implode('_``_', $relatedTables);
-    }
-
-    public function getMagicSql() : string
-    {
-        if ($this->magicSql === null) {
-            $this->compute();
-        }
-
-        return $this->magicSql;
-    }
-
-    public function getMagicSqlCount() : string
-    {
-        if ($this->magicSqlCount === null) {
-            $this->compute();
-        }
-
-        return $this->magicSqlCount;
-    }
-
-    public function getColumnDescriptors() : array
-    {
-        if ($this->columnDescList === null) {
-            $this->compute();
-        }
-
-        return $this->columnDescList;
-    }
-
-    /**
-     * Sets the ORDER BY directive executed in SQL.
-     *
-     * For instance:
-     *
-     *  $queryFactory->sort('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:
-     *
-     *  $queryFactory->sort(new UncheckedOrderBy('RAND()'))
-     *
-     * @param string|UncheckedOrderBy|null $orderBy
-     */
-    public function sort($orderBy)
-    {
-        $this->orderBy = $orderBy;
-        $this->magicSql = null;
-        $this->magicSqlCount = null;
-        $this->columnDescList = null;
-    }
+	/**
+	 * @var TDBMService
+	 */
+	protected $tdbmService;
+
+	/**
+	 * @var Schema
+	 */
+	protected $schema;
+
+	/**
+	 * @var OrderByAnalyzer
+	 */
+	protected $orderByAnalyzer;
+
+	/**
+	 * @var string|UncheckedOrderBy|null
+	 */
+	protected $orderBy;
+
+	protected $magicSql;
+	protected $magicSqlCount;
+	protected $columnDescList;
+
+	/**
+	 * @param TDBMService $tdbmService
+	 */
+	public function __construct(TDBMService $tdbmService, Schema $schema, OrderByAnalyzer $orderByAnalyzer, $orderBy)
+	{
+		$this->tdbmService = $tdbmService;
+		$this->schema = $schema;
+		$this->orderByAnalyzer = $orderByAnalyzer;
+		$this->orderBy = $orderBy;
+	}
+
+	/**
+	 * Returns the column list that must be fetched for the SQL request.
+	 *
+	 * Note: MySQL dictates that ORDER BYed columns should appear in the SELECT clause.
+	 *
+	 * @param string                       $mainTable
+	 * @param array                        $additionalTablesFetch
+	 * @param string|UncheckedOrderBy|null $orderBy
+	 *
+	 * @return array
+	 *
+	 * @throws \Doctrine\DBAL\Schema\SchemaException
+	 */
+	protected function getColumnsList(string $mainTable, array $additionalTablesFetch = array(), $orderBy = null)
+	{
+		// From the table name and the additional tables we want to fetch, let's build a list of all tables
+		// that must be part of the select columns.
+
+		$connection = $this->tdbmService->getConnection();
+
+		$tableGroups = [];
+		$allFetchedTables = $this->tdbmService->_getRelatedTablesByInheritance($mainTable);
+		$tableGroupName = $this->getTableGroupName($allFetchedTables);
+		foreach ($allFetchedTables as $table) {
+			$tableGroups[$table] = $tableGroupName;
+		}
+
+		$columnsList = [];
+		$columnDescList = [];
+		$sortColumn = 0;
+		$reconstructedOrderBy = null;
+
+		if (is_string($orderBy)) {
+			$orderBy = trim($orderBy);
+			if ($orderBy === '') {
+				$orderBy = null;
+			}
+		}
+
+		// Now, let's deal with "order by columns"
+		if ($orderBy !== null) {
+			if ($orderBy instanceof UncheckedOrderBy) {
+				$securedOrderBy = false;
+				$orderBy = $orderBy->getOrderBy();
+				$reconstructedOrderBy = $orderBy;
+			} else {
+				$securedOrderBy = true;
+				$reconstructedOrderBys = [];
+			}
+			$orderByColumns = $this->orderByAnalyzer->analyzeOrderBy($orderBy);
+
+			// If we sort by a column, there is a high chance we will fetch the bean containing this column.
+			// Hence, we should add the table to the $additionalTablesFetch
+			foreach ($orderByColumns as $orderByColumn) {
+				if ($orderByColumn['type'] === 'colref') {
+					if ($orderByColumn['table'] !== null) {
+						$additionalTablesFetch[] = $orderByColumn['table'];
+					}
+					if ($securedOrderBy) {
+						$reconstructedOrderBys[] = ($orderByColumn['table'] !== null ? $connection->quoteIdentifier($orderByColumn['table']).'.' : '').$connection->quoteIdentifier($orderByColumn['column']).' '.$orderByColumn['direction'];
+					}
+				} elseif ($orderByColumn['type'] === 'expr') {
+					$sortColumnName = 'sort_column_'.$sortColumn;
+					$columnsList[] = $orderByColumn['expr'].' as '.$sortColumnName;
+					$columnDescList[] = [
+						'tableGroup' => null,
+					];
+					++$sortColumn;
+
+					if ($securedOrderBy) {
+						throw new TDBMInvalidArgumentException('Invalid ORDER BY column: "'.$orderByColumn['expr'].'". If you want to use expression in your ORDER BY clause, you must wrap them in a UncheckedOrderBy object. For instance: new UncheckedOrderBy("col1 + col2 DESC")');
+					}
+				}
+			}
+
+			if ($reconstructedOrderBy === null) {
+				$reconstructedOrderBy = implode(', ', $reconstructedOrderBys);
+			}
+		}
+
+		foreach ($additionalTablesFetch as $additionalTable) {
+			$relatedTables = $this->tdbmService->_getRelatedTablesByInheritance($additionalTable);
+			$tableGroupName = $this->getTableGroupName($relatedTables);
+			foreach ($relatedTables as $table) {
+				$tableGroups[$table] = $tableGroupName;
+			}
+			$allFetchedTables = array_merge($allFetchedTables, $relatedTables);
+		}
+
+		// Let's remove any duplicate
+		$allFetchedTables = array_flip(array_flip($allFetchedTables));
+
+		// Now, let's build the column list
+		foreach ($allFetchedTables as $table) {
+			foreach ($this->schema->getTable($table)->getColumns() as $column) {
+				$columnName = $column->getName();
+				$columnDescList[] = [
+					'as' => $table.'____'.$columnName,
+					'table' => $table,
+					'column' => $columnName,
+					'type' => $column->getType(),
+					'tableGroup' => $tableGroups[$table],
+				];
+				$columnsList[] = $connection->quoteIdentifier($table).'.'.$connection->quoteIdentifier($columnName).' as '.
+					$connection->quoteIdentifier($table.'____'.$columnName);
+			}
+		}
+
+		return [$columnDescList, $columnsList, $reconstructedOrderBy];
+	}
+
+	abstract protected function compute();
+
+	/**
+	 * Returns an identifier for the group of tables passed in parameter.
+	 *
+	 * @param string[] $relatedTables
+	 *
+	 * @return string
+	 */
+	protected function getTableGroupName(array $relatedTables)
+	{
+		sort($relatedTables);
+
+		return implode('_``_', $relatedTables);
+	}
+
+	public function getMagicSql() : string
+	{
+		if ($this->magicSql === null) {
+			$this->compute();
+		}
+
+		return $this->magicSql;
+	}
+
+	public function getMagicSqlCount() : string
+	{
+		if ($this->magicSqlCount === null) {
+			$this->compute();
+		}
+
+		return $this->magicSqlCount;
+	}
+
+	public function getColumnDescriptors() : array
+	{
+		if ($this->columnDescList === null) {
+			$this->compute();
+		}
+
+		return $this->columnDescList;
+	}
+
+	/**
+	 * Sets the ORDER BY directive executed in SQL.
+	 *
+	 * For instance:
+	 *
+	 *  $queryFactory->sort('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:
+	 *
+	 *  $queryFactory->sort(new UncheckedOrderBy('RAND()'))
+	 *
+	 * @param string|UncheckedOrderBy|null $orderBy
+	 */
+	public function sort($orderBy)
+	{
+		$this->orderBy = $orderBy;
+		$this->magicSql = null;
+		$this->magicSqlCount = null;
+		$this->columnDescList = null;
+	}
 }

src/Mouf/Database/TDBM/QueryFactory/FindObjectsFromSqlQueryFactory.php

Indentation +187 added lines, -187 removed lines

@@ -15,191 +15,191 @@
  */
 class FindObjectsFromSqlQueryFactory extends AbstractQueryFactory
 {
-    private $mainTable;
-    private $from;
-    private $filterString;
-    private $cache;
-    private $cachePrefix;
-
-    public function __construct(string $mainTable, string $from, $filterString, $orderBy, TDBMService $tdbmService, Schema $schema, OrderByAnalyzer $orderByAnalyzer, SchemaAnalyzer $schemaAnalyzer, Cache $cache, string $cachePrefix)
-    {
-        parent::__construct($tdbmService, $schema, $orderByAnalyzer, $orderBy);
-        $this->mainTable = $mainTable;
-        $this->from = $from;
-        $this->filterString = $filterString;
-        $this->schemaAnalyzer = $schemaAnalyzer;
-        $this->cache = $cache;
-        $this->cachePrefix = $cachePrefix;
-    }
-
-    protected function compute()
-    {
-        $connection = $this->tdbmService->getConnection();
-
-        $columnsList = null;
-
-        $allFetchedTables = $this->tdbmService->_getRelatedTablesByInheritance($this->mainTable);
-
-        $columnDescList = [];
-
-        $tableGroupName = $this->getTableGroupName($allFetchedTables);
-
-        foreach ($this->schema->getTable($this->mainTable)->getColumns() as $column) {
-            $columnName = $column->getName();
-            $columnDescList[] = [
-                'as' => $columnName,
-                'table' => $this->mainTable,
-                'column' => $columnName,
-                'type' => $column->getType(),
-                'tableGroup' => $tableGroupName,
-            ];
-        }
-
-        $sql = 'SELECT DISTINCT '.implode(', ', array_map(function ($columnDesc) {
-            return $this->tdbmService->getConnection()->quoteIdentifier($this->mainTable).'.'.$this->tdbmService->getConnection()->quoteIdentifier($columnDesc['column']);
-        }, $columnDescList)).' FROM '.$this->from;
-
-        if (count($allFetchedTables) > 1) {
-            list($columnDescList, $columnsList, $orderString) = $this->getColumnsList($this->mainTable, [], $this->orderBy);
-        } elseif ($this->orderBy) {
-            list(, , $orderString) = $this->getColumnsList($this->mainTable, [], $this->orderBy);
-        }
-
-        // Let's compute the COUNT.
-        $pkColumnNames = $this->schema->getTable($this->mainTable)->getPrimaryKeyColumns();
-        $pkColumnNames = array_map(function ($pkColumn) {
-            return $this->tdbmService->getConnection()->quoteIdentifier($this->mainTable).'.'.$this->tdbmService->getConnection()->quoteIdentifier($pkColumn);
-        }, $pkColumnNames);
-
-        $countSql = 'SELECT COUNT(DISTINCT '.implode(', ', $pkColumnNames).') FROM '.$this->from;
-
-        if (!empty($this->filterString)) {
-            $sql .= ' WHERE '.$this->filterString;
-            $countSql .= ' WHERE '.$this->filterString;
-        }
-
-        if (!empty($orderString)) {
-            $sql .= ' ORDER BY '.$orderString;
-        }
-
-        if (stripos($countSql, 'GROUP BY') !== false) {
-            throw new TDBMException('Unsupported use of GROUP BY in SQL request.');
-        }
-
-        if ($columnsList !== null) {
-            $joinSql = '';
-            $parentFks = $this->getParentRelationshipForeignKeys($this->mainTable);
-            foreach ($parentFks as $fk) {
-                $joinSql .= sprintf(' JOIN %s ON (%s.%s = %s.%s)',
-                    $connection->quoteIdentifier($fk->getForeignTableName()),
-                    $connection->quoteIdentifier($fk->getLocalTableName()),
-                    $connection->quoteIdentifier($fk->getLocalColumns()[0]),
-                    $connection->quoteIdentifier($fk->getForeignTableName()),
-                    $connection->quoteIdentifier($fk->getForeignColumns()[0])
-                );
-            }
-
-            $childrenFks = $this->getChildrenRelationshipForeignKeys($this->mainTable);
-            foreach ($childrenFks as $fk) {
-                $joinSql .= sprintf(' LEFT JOIN %s ON (%s.%s = %s.%s)',
-                    $connection->quoteIdentifier($fk->getLocalTableName()),
-                    $connection->quoteIdentifier($fk->getForeignTableName()),
-                    $connection->quoteIdentifier($fk->getForeignColumns()[0]),
-                    $connection->quoteIdentifier($fk->getLocalTableName()),
-                    $connection->quoteIdentifier($fk->getLocalColumns()[0])
-                );
-            }
-
-            $sql = 'SELECT '.implode(', ', $columnsList).' FROM ('.$sql.') AS '.$this->mainTable.' '.$joinSql;
-            if (!empty($orderString)) {
-                $sql .= ' ORDER BY '.$orderString;
-            }
-        }
-
-        $this->magicSql = $sql;
-        $this->magicSqlCount = $countSql;
-        $this->columnDescList = $columnDescList;
-    }
-
-    /**
-     * @param string $tableName
-     *
-     * @return ForeignKeyConstraint[]
-     */
-    private function getParentRelationshipForeignKeys($tableName)
-    {
-        return $this->fromCache($this->cachePrefix.'_parentrelationshipfks_'.$tableName, function () use ($tableName) {
-            return $this->getParentRelationshipForeignKeysWithoutCache($tableName);
-        });
-    }
-
-    /**
-     * @param string $tableName
-     *
-     * @return ForeignKeyConstraint[]
-     */
-    private function getParentRelationshipForeignKeysWithoutCache($tableName)
-    {
-        $parentFks = [];
-        $currentTable = $tableName;
-        while ($currentFk = $this->schemaAnalyzer->getParentRelationship($currentTable)) {
-            $currentTable = $currentFk->getForeignTableName();
-            $parentFks[] = $currentFk;
-        }
-
-        return $parentFks;
-    }
-
-    /**
-     * @param string $tableName
-     *
-     * @return ForeignKeyConstraint[]
-     */
-    private function getChildrenRelationshipForeignKeys(string $tableName) : array
-    {
-        return $this->fromCache($this->cachePrefix.'_childrenrelationshipfks_'.$tableName, function () use ($tableName) {
-            return $this->getChildrenRelationshipForeignKeysWithoutCache($tableName);
-        });
-    }
-
-    /**
-     * @param string $tableName
-     *
-     * @return ForeignKeyConstraint[]
-     */
-    private function getChildrenRelationshipForeignKeysWithoutCache(string $tableName) : array
-    {
-        $children = $this->schemaAnalyzer->getChildrenRelationships($tableName);
-
-        if (!empty($children)) {
-            $fksTables = array_map(function (ForeignKeyConstraint $fk) {
-                return $this->getChildrenRelationshipForeignKeys($fk->getLocalTableName());
-            }, $children);
-
-            $fks = array_merge($children, call_user_func_array('array_merge', $fksTables));
-
-            return $fks;
-        } else {
-            return [];
-        }
-    }
-
-    /**
-     * Returns an item from cache or computes it using $closure and puts it in cache.
-     *
-     * @param string   $key
-     * @param callable $closure
-     *
-     * @return mixed
-     */
-    protected function fromCache(string $key, callable $closure)
-    {
-        $item = $this->cache->fetch($key);
-        if ($item === false) {
-            $item = $closure();
-            $this->cache->save($key, $item);
-        }
-
-        return $item;
-    }
+	private $mainTable;
+	private $from;
+	private $filterString;
+	private $cache;
+	private $cachePrefix;
+
+	public function __construct(string $mainTable, string $from, $filterString, $orderBy, TDBMService $tdbmService, Schema $schema, OrderByAnalyzer $orderByAnalyzer, SchemaAnalyzer $schemaAnalyzer, Cache $cache, string $cachePrefix)
+	{
+		parent::__construct($tdbmService, $schema, $orderByAnalyzer, $orderBy);
+		$this->mainTable = $mainTable;
+		$this->from = $from;
+		$this->filterString = $filterString;
+		$this->schemaAnalyzer = $schemaAnalyzer;
+		$this->cache = $cache;
+		$this->cachePrefix = $cachePrefix;
+	}
+
+	protected function compute()
+	{
+		$connection = $this->tdbmService->getConnection();
+
+		$columnsList = null;
+
+		$allFetchedTables = $this->tdbmService->_getRelatedTablesByInheritance($this->mainTable);
+
+		$columnDescList = [];
+
+		$tableGroupName = $this->getTableGroupName($allFetchedTables);
+
+		foreach ($this->schema->getTable($this->mainTable)->getColumns() as $column) {
+			$columnName = $column->getName();
+			$columnDescList[] = [
+				'as' => $columnName,
+				'table' => $this->mainTable,
+				'column' => $columnName,
+				'type' => $column->getType(),
+				'tableGroup' => $tableGroupName,
+			];
+		}
+
+		$sql = 'SELECT DISTINCT '.implode(', ', array_map(function ($columnDesc) {
+			return $this->tdbmService->getConnection()->quoteIdentifier($this->mainTable).'.'.$this->tdbmService->getConnection()->quoteIdentifier($columnDesc['column']);
+		}, $columnDescList)).' FROM '.$this->from;
+
+		if (count($allFetchedTables) > 1) {
+			list($columnDescList, $columnsList, $orderString) = $this->getColumnsList($this->mainTable, [], $this->orderBy);
+		} elseif ($this->orderBy) {
+			list(, , $orderString) = $this->getColumnsList($this->mainTable, [], $this->orderBy);
+		}
+
+		// Let's compute the COUNT.
+		$pkColumnNames = $this->schema->getTable($this->mainTable)->getPrimaryKeyColumns();
+		$pkColumnNames = array_map(function ($pkColumn) {
+			return $this->tdbmService->getConnection()->quoteIdentifier($this->mainTable).'.'.$this->tdbmService->getConnection()->quoteIdentifier($pkColumn);
+		}, $pkColumnNames);
+
+		$countSql = 'SELECT COUNT(DISTINCT '.implode(', ', $pkColumnNames).') FROM '.$this->from;
+
+		if (!empty($this->filterString)) {
+			$sql .= ' WHERE '.$this->filterString;
+			$countSql .= ' WHERE '.$this->filterString;
+		}
+
+		if (!empty($orderString)) {
+			$sql .= ' ORDER BY '.$orderString;
+		}
+
+		if (stripos($countSql, 'GROUP BY') !== false) {
+			throw new TDBMException('Unsupported use of GROUP BY in SQL request.');
+		}
+
+		if ($columnsList !== null) {
+			$joinSql = '';
+			$parentFks = $this->getParentRelationshipForeignKeys($this->mainTable);
+			foreach ($parentFks as $fk) {
+				$joinSql .= sprintf(' JOIN %s ON (%s.%s = %s.%s)',
+					$connection->quoteIdentifier($fk->getForeignTableName()),
+					$connection->quoteIdentifier($fk->getLocalTableName()),
+					$connection->quoteIdentifier($fk->getLocalColumns()[0]),
+					$connection->quoteIdentifier($fk->getForeignTableName()),
+					$connection->quoteIdentifier($fk->getForeignColumns()[0])
+				);
+			}
+
+			$childrenFks = $this->getChildrenRelationshipForeignKeys($this->mainTable);
+			foreach ($childrenFks as $fk) {
+				$joinSql .= sprintf(' LEFT JOIN %s ON (%s.%s = %s.%s)',
+					$connection->quoteIdentifier($fk->getLocalTableName()),
+					$connection->quoteIdentifier($fk->getForeignTableName()),
+					$connection->quoteIdentifier($fk->getForeignColumns()[0]),
+					$connection->quoteIdentifier($fk->getLocalTableName()),
+					$connection->quoteIdentifier($fk->getLocalColumns()[0])
+				);
+			}
+
+			$sql = 'SELECT '.implode(', ', $columnsList).' FROM ('.$sql.') AS '.$this->mainTable.' '.$joinSql;
+			if (!empty($orderString)) {
+				$sql .= ' ORDER BY '.$orderString;
+			}
+		}
+
+		$this->magicSql = $sql;
+		$this->magicSqlCount = $countSql;
+		$this->columnDescList = $columnDescList;
+	}
+
+	/**
+	 * @param string $tableName
+	 *
+	 * @return ForeignKeyConstraint[]
+	 */
+	private function getParentRelationshipForeignKeys($tableName)
+	{
+		return $this->fromCache($this->cachePrefix.'_parentrelationshipfks_'.$tableName, function () use ($tableName) {
+			return $this->getParentRelationshipForeignKeysWithoutCache($tableName);
+		});
+	}
+
+	/**
+	 * @param string $tableName
+	 *
+	 * @return ForeignKeyConstraint[]
+	 */
+	private function getParentRelationshipForeignKeysWithoutCache($tableName)
+	{
+		$parentFks = [];
+		$currentTable = $tableName;
+		while ($currentFk = $this->schemaAnalyzer->getParentRelationship($currentTable)) {
+			$currentTable = $currentFk->getForeignTableName();
+			$parentFks[] = $currentFk;
+		}
+
+		return $parentFks;
+	}
+
+	/**
+	 * @param string $tableName
+	 *
+	 * @return ForeignKeyConstraint[]
+	 */
+	private function getChildrenRelationshipForeignKeys(string $tableName) : array
+	{
+		return $this->fromCache($this->cachePrefix.'_childrenrelationshipfks_'.$tableName, function () use ($tableName) {
+			return $this->getChildrenRelationshipForeignKeysWithoutCache($tableName);
+		});
+	}
+
+	/**
+	 * @param string $tableName
+	 *
+	 * @return ForeignKeyConstraint[]
+	 */
+	private function getChildrenRelationshipForeignKeysWithoutCache(string $tableName) : array
+	{
+		$children = $this->schemaAnalyzer->getChildrenRelationships($tableName);
+
+		if (!empty($children)) {
+			$fksTables = array_map(function (ForeignKeyConstraint $fk) {
+				return $this->getChildrenRelationshipForeignKeys($fk->getLocalTableName());
+			}, $children);
+
+			$fks = array_merge($children, call_user_func_array('array_merge', $fksTables));
+
+			return $fks;
+		} else {
+			return [];
+		}
+	}
+
+	/**
+	 * Returns an item from cache or computes it using $closure and puts it in cache.
+	 *
+	 * @param string   $key
+	 * @param callable $closure
+	 *
+	 * @return mixed
+	 */
+	protected function fromCache(string $key, callable $closure)
+	{
+		$item = $this->cache->fetch($key);
+		if ($item === false) {
+			$item = $closure();
+			$this->cache->save($key, $item);
+		}
+
+		return $item;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -55,19 +55,19 @@ 
             ];
         }
 
-        $sql = 'SELECT DISTINCT '.implode(', ', array_map(function ($columnDesc) {
+        $sql = 'SELECT DISTINCT '.implode(', ', array_map(function($columnDesc) {
             return $this->tdbmService->getConnection()->quoteIdentifier($this->mainTable).'.'.$this->tdbmService->getConnection()->quoteIdentifier($columnDesc['column']);
         }, $columnDescList)).' FROM '.$this->from;
 
-        if (count($allFetchedTables) > 1) {
+        if (count($allFetchedTables)>1) {
             list($columnDescList, $columnsList, $orderString) = $this->getColumnsList($this->mainTable, [], $this->orderBy);
         } elseif ($this->orderBy) {
-            list(, , $orderString) = $this->getColumnsList($this->mainTable, [], $this->orderBy);
+            list(,, $orderString) = $this->getColumnsList($this->mainTable, [], $this->orderBy);
         }
 
         // Let's compute the COUNT.
         $pkColumnNames = $this->schema->getTable($this->mainTable)->getPrimaryKeyColumns();
-        $pkColumnNames = array_map(function ($pkColumn) {
+        $pkColumnNames = array_map(function($pkColumn) {
             return $this->tdbmService->getConnection()->quoteIdentifier($this->mainTable).'.'.$this->tdbmService->getConnection()->quoteIdentifier($pkColumn);
         }, $pkColumnNames);
 
@@ -128,7 +128,7 @@ 
      */
     private function getParentRelationshipForeignKeys($tableName)
     {
-        return $this->fromCache($this->cachePrefix.'_parentrelationshipfks_'.$tableName, function () use ($tableName) {
+        return $this->fromCache($this->cachePrefix.'_parentrelationshipfks_'.$tableName, function() use ($tableName) {
             return $this->getParentRelationshipForeignKeysWithoutCache($tableName);
         });
     }
@@ -157,7 +157,7 @@ 
      */
     private function getChildrenRelationshipForeignKeys(string $tableName) : array
     {
-        return $this->fromCache($this->cachePrefix.'_childrenrelationshipfks_'.$tableName, function () use ($tableName) {
+        return $this->fromCache($this->cachePrefix.'_childrenrelationshipfks_'.$tableName, function() use ($tableName) {
             return $this->getChildrenRelationshipForeignKeysWithoutCache($tableName);
         });
     }
@@ -172,7 +172,7 @@ 
         $children = $this->schemaAnalyzer->getChildrenRelationships($tableName);
 
         if (!empty($children)) {
-            $fksTables = array_map(function (ForeignKeyConstraint $fk) {
+            $fksTables = array_map(function(ForeignKeyConstraint $fk) {
                 return $this->getChildrenRelationshipForeignKeys($fk->getLocalTableName());
             }, $children);
 

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

Indentation +28 added lines, -28 removed lines

@@ -4,36 +4,36 @@
 
 interface MethodDescriptorInterface
 {
-    /**
-     * Returns the name of the method to be generated.
-     *
-     * @return string
-     */
-    public function getName() : string;
+	/**
+	 * Returns the name of the method to be generated.
+	 *
+	 * @return string
+	 */
+	public function getName() : string;
 
-    /**
-     * Requests the use of an alternative name for this method.
-     */
-    public function useAlternativeName();
+	/**
+	 * Requests the use of an alternative name for this method.
+	 */
+	public function useAlternativeName();
 
-    /**
-     * Returns the code of the method.
-     *
-     * @return string
-     */
-    public function getCode() : string;
+	/**
+	 * Returns the code of the method.
+	 *
+	 * @return string
+	 */
+	public function getCode() : string;
 
-    /**
-     * Returns an array of classes that needs a "use" for this method.
-     *
-     * @return string[]
-     */
-    public function getUsedClasses() : array;
+	/**
+	 * Returns an array of classes that needs a "use" for this method.
+	 *
+	 * @return string[]
+	 */
+	public function getUsedClasses() : array;
 
-    /**
-     * Returns the code to past in jsonSerialize.
-     *
-     * @return string
-     */
-    public function getJsonSerializeCode() : string;
+	/**
+	 * Returns the code to past in jsonSerialize.
+	 *
+	 * @return string
+	 */
+	public function getJsonSerializeCode() : string;
 }