thecodingmachine / database.tdbm

src/Mouf/Database/TDBM/WeakrefObjectStorage.php

Indentation +105 added lines, -105 removed lines

@@ -31,117 +31,117 @@
  */
 class WeakrefObjectStorage
 {
-    /**
-     * An array of fetched object, accessible via table name and primary key.
-     * If the primary key is split on several columns, access is done by an array of columns, serialized.
-     *
-     * @var array<string, WeakMap<string, TDBMObject>>
-     */
-    private $objects = array();
+	/**
+	 * An array of fetched object, accessible via table name and primary key.
+	 * If the primary key is split on several columns, access is done by an array of columns, serialized.
+	 *
+	 * @var array<string, WeakMap<string, TDBMObject>>
+	 */
+	private $objects = array();
 
-    /**
-     * Every 10000 set in the dataset, we perform a cleanup to ensure the WeakRef instances
-     * are removed if they are no more valid.
-     * This is to avoid having memory used by dangling WeakRef instances.
-     *
-     * @var int
-     */
-    private $garbageCollectorCount = 0;
+	/**
+	 * Every 10000 set in the dataset, we perform a cleanup to ensure the WeakRef instances
+	 * are removed if they are no more valid.
+	 * This is to avoid having memory used by dangling WeakRef instances.
+	 *
+	 * @var int
+	 */
+	private $garbageCollectorCount = 0;
 
-    /**
-     * Sets an object in the storage.
-     *
-     * @param string $tableName
-     * @param string $id
-     * @param DbRow  $dbRow
-     */
-    public function set($tableName, $id, DbRow $dbRow)
-    {
-        $this->objects[$tableName][$id] = new \WeakRef($dbRow);
-        ++$this->garbageCollectorCount;
-        if ($this->garbageCollectorCount == 10000) {
-            $this->garbageCollectorCount = 0;
-            $this->cleanupDanglingWeakRefs();
-        }
-    }
+	/**
+	 * Sets an object in the storage.
+	 *
+	 * @param string $tableName
+	 * @param string $id
+	 * @param DbRow  $dbRow
+	 */
+	public function set($tableName, $id, DbRow $dbRow)
+	{
+		$this->objects[$tableName][$id] = new \WeakRef($dbRow);
+		++$this->garbageCollectorCount;
+		if ($this->garbageCollectorCount == 10000) {
+			$this->garbageCollectorCount = 0;
+			$this->cleanupDanglingWeakRefs();
+		}
+	}
 
-    /**
-     * Checks if an object is in the storage.
-     *
-     * @param string $tableName
-     * @param string $id
-     *
-     * @return bool
-     */
-    public function has($tableName, $id)
-    {
-        if (isset($this->objects[$tableName][$id])) {
-            if ($this->objects[$tableName][$id]->valid()) {
-                return true;
-            } else {
-                unset($this->objects[$tableName][$id]);
-            }
-        }
+	/**
+	 * Checks if an object is in the storage.
+	 *
+	 * @param string $tableName
+	 * @param string $id
+	 *
+	 * @return bool
+	 */
+	public function has($tableName, $id)
+	{
+		if (isset($this->objects[$tableName][$id])) {
+			if ($this->objects[$tableName][$id]->valid()) {
+				return true;
+			} else {
+				unset($this->objects[$tableName][$id]);
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Returns an object from the storage (or null if no object is set).
-     *
-     * @param string $tableName
-     * @param string $id
-     *
-     * @return DbRow
-     */
-    public function get($tableName, $id)
-    {
-        if (isset($this->objects[$tableName][$id])) {
-            if ($this->objects[$tableName][$id]->valid()) {
-                return $this->objects[$tableName][$id]->get();
-            }
-        } else {
-            return;
-        }
-    }
+	/**
+	 * Returns an object from the storage (or null if no object is set).
+	 *
+	 * @param string $tableName
+	 * @param string $id
+	 *
+	 * @return DbRow
+	 */
+	public function get($tableName, $id)
+	{
+		if (isset($this->objects[$tableName][$id])) {
+			if ($this->objects[$tableName][$id]->valid()) {
+				return $this->objects[$tableName][$id]->get();
+			}
+		} else {
+			return;
+		}
+	}
 
-    /**
-     * Removes an object from the storage.
-     *
-     * @param string $tableName
-     * @param string $id
-     */
-    public function remove($tableName, $id)
-    {
-        unset($this->objects[$tableName][$id]);
-    }
+	/**
+	 * Removes an object from the storage.
+	 *
+	 * @param string $tableName
+	 * @param string $id
+	 */
+	public function remove($tableName, $id)
+	{
+		unset($this->objects[$tableName][$id]);
+	}
 
-    /**
-     * Applies the callback to all objects.
-     *
-     * @param callable $callback
-     */
-    public function apply(callable $callback)
-    {
-        foreach ($this->objects as $tableName => $table) {
-            foreach ($table as $id => $obj) {
-                if ($obj->valid()) {
-                    $callback($obj->get(), $tableName, $id);
-                } else {
-                    unset($this->objects[$tableName][$id]);
-                }
-            }
-        }
-    }
+	/**
+	 * Applies the callback to all objects.
+	 *
+	 * @param callable $callback
+	 */
+	public function apply(callable $callback)
+	{
+		foreach ($this->objects as $tableName => $table) {
+			foreach ($table as $id => $obj) {
+				if ($obj->valid()) {
+					$callback($obj->get(), $tableName, $id);
+				} else {
+					unset($this->objects[$tableName][$id]);
+				}
+			}
+		}
+	}
 
-    private function cleanupDanglingWeakRefs()
-    {
-        foreach ($this->objects as $tableName => $table) {
-            foreach ($table as $id => $obj) {
-                if (!$obj->valid()) {
-                    unset($this->objects[$tableName][$id]);
-                }
-            }
-        }
-    }
+	private function cleanupDanglingWeakRefs()
+	{
+		foreach ($this->objects as $tableName => $table) {
+			foreach ($table as $id => $obj) {
+				if (!$obj->valid()) {
+					unset($this->objects[$tableName][$id]);
+				}
+			}
+		}
+	}
 }

src/Mouf/Database/TDBM/StandardObjectStorage.php

Indentation +69 added lines, -69 removed lines

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

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

Doc Comments +3 added lines

@@ -181,6 +181,9 @@
 
     protected $errorMsg;
 
+    /**
+     * @param string $msg
+     */
     private function displayErrorMsg($msg)
     {
         $this->errorMsg = $msg;

Indentation +215 added lines, -215 removed lines

@@ -21,219 +21,219 @@
  */
 class TdbmInstallController extends Controller
 {
-    /**
-     * @var HtmlBlock
-     */
-    public $content;
-
-    public $selfedit;
-
-    /**
-     * The active MoufManager to be edited/viewed.
-     *
-     * @var MoufManager
-     */
-    public $moufManager;
-
-    /**
-     * The template used by the main page for mouf.
-     *
-     * @Property
-     * @Compulsory
-     *
-     * @var TemplateInterface
-     */
-    public $template;
-
-    /**
-     * Displays the first install screen.
-     *
-     * @Action
-     * @Logged
-     *
-     * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
-     */
-    public function defaultAction($selfedit = 'false')
-    {
-        $this->selfedit = $selfedit;
-
-        if ($selfedit == 'true') {
-            $this->moufManager = MoufManager::getMoufManager();
-        } else {
-            $this->moufManager = MoufManager::getMoufManagerHiddenInstance();
-        }
-
-        $this->content->addFile(dirname(__FILE__).'/../../../../views/installStep1.php', $this);
-        $this->template->toHtml();
-    }
-
-    /**
-     * Skips the install process.
-     *
-     * @Action
-     * @Logged
-     *
-     * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
-     */
-    public function skip($selfedit = 'false')
-    {
-        InstallUtils::continueInstall($selfedit == 'true');
-    }
-
-    protected $daoNamespace;
-    protected $beanNamespace;
-    protected $autoloadDetected;
-    //protected $storeInUtc;
-    protected $useCustomComposer = false;
-    protected $composerFile;
-
-    /**
-     * Displays the second install screen.
-     *
-     * @Action
-     * @Logged
-     *
-     * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
-     */
-    public function configure($selfedit = 'false')
-    {
-        $this->selfedit = $selfedit;
-
-        if ($selfedit == 'true') {
-            $this->moufManager = MoufManager::getMoufManager();
-        } else {
-            $this->moufManager = MoufManager::getMoufManagerHiddenInstance();
-        }
-
-        // Let's start by performing basic checks about the instances we assume to exist.
-        if (!$this->moufManager->instanceExists('dbalConnection')) {
-            $this->displayErrorMsg("The TDBM install process assumes your database connection instance is already created, and that the name of this instance is 'dbalConnection'. Could not find the 'dbalConnection' instance.");
-
-            return;
-        }
-
-        if ($this->moufManager->has('tdbmConfiguration')) {
-            $tdbmConfiguration = $this->moufManager->getInstanceDescriptor('tdbmConfiguration');
-
-            $this->beanNamespace = $tdbmConfiguration->getConstructorArgumentProperty('beanNamespace')->getValue();
-            $this->daoNamespace = $tdbmConfiguration->getConstructorArgumentProperty('daoNamespace')->getValue();
-        } else {
-            // Old TDBM 4.2 fallback
-            $this->daoNamespace = $this->moufManager->getVariable('tdbmDefaultDaoNamespace_tdbmService');
-            $this->beanNamespace = $this->moufManager->getVariable('tdbmDefaultBeanNamespace_tdbmService');
-        }
-
-        if ($this->daoNamespace == null && $this->beanNamespace == null) {
-            $classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
-
-            $autoloadNamespaces = $classNameMapper->getManagedNamespaces();
-            if ($autoloadNamespaces) {
-                $this->autoloadDetected = true;
-                $rootNamespace = $autoloadNamespaces[0];
-                $this->daoNamespace = $rootNamespace.'Dao';
-                $this->beanNamespace = $rootNamespace.'Model';
-            } else {
-                $this->autoloadDetected = false;
-                $this->daoNamespace = 'YourApplication\\Dao';
-                $this->beanNamespace = 'YourApplication\\Model';
-            }
-        } else {
-            $this->autoloadDetected = true;
-        }
-        $this->defaultPath = true;
-        $this->storePath = '';
-
-        $this->castDatesToDateTime = true;
-
-        $this->content->addFile(__DIR__.'/../../../../views/installStep2.php', $this);
-        $this->template->toHtml();
-    }
-
-    /**
-     * This action generates the TDBM instance, then the DAOs and Beans.
-     *
-     * @Action
-     *
-     * @param string $daonamespace
-     * @param string $beannamespace
-     * @param string $selfedit
-     *
-     * @throws \Mouf\MoufException
-     */
-    public function generate($daonamespace, $beannamespace, /*$storeInUtc = 0,*/ $selfedit = 'false', $defaultPath = false, $storePath = '')
-    {
-        $this->selfedit = $selfedit;
-
-        if ($selfedit == 'true') {
-            $this->moufManager = MoufManager::getMoufManager();
-        } else {
-            $this->moufManager = MoufManager::getMoufManagerHiddenInstance();
-        }
-
-        $doctrineCache = $this->moufManager->getInstanceDescriptor('defaultDoctrineCache');
-
-        $migratingFrom42 = false;
-        if ($this->moufManager->has('tdbmService') && !$this->moufManager->has('tdbmConfiguration')) {
-            $migratingFrom42 = true;
-        }
-
-        $namingStrategy = InstallUtils::getOrCreateInstance('namingStrategy', DefaultNamingStrategy::class, $this->moufManager);
-        if ($migratingFrom42) {
-            // Let's setup the naming strategy for compatibility
-            $namingStrategy->getSetterProperty('setBeanPrefix')->setValue('');
-            $namingStrategy->getSetterProperty('setBeanSuffix')->setValue('Bean');
-            $namingStrategy->getSetterProperty('setBaseBeanPrefix')->setValue('');
-            $namingStrategy->getSetterProperty('setBaseBeanSuffix')->setValue('BaseBean');
-            $namingStrategy->getSetterProperty('setDaoPrefix')->setValue('');
-            $namingStrategy->getSetterProperty('setDaoSuffix')->setValue('Dao');
-            $namingStrategy->getSetterProperty('setBaseDaoPrefix')->setValue('');
-            $namingStrategy->getSetterProperty('setBaseDaoSuffix')->setValue('BaseDao');
-        }
-
-        if (!$this->moufManager->instanceExists('tdbmConfiguration')) {
-            $moufListener = InstallUtils::getOrCreateInstance(MoufDiListener::class, MoufDiListener::class, $this->moufManager);
-
-            $tdbmConfiguration = $this->moufManager->createInstance(MoufConfiguration::class)->setName('tdbmConfiguration');
-            $tdbmConfiguration->getConstructorArgumentProperty('connection')->setValue($this->moufManager->getInstanceDescriptor('dbalConnection'));
-            $tdbmConfiguration->getConstructorArgumentProperty('cache')->setValue($doctrineCache);
-            $tdbmConfiguration->getConstructorArgumentProperty('namingStrategy')->setValue($namingStrategy);
-            $tdbmConfiguration->getProperty('daoFactoryInstanceName')->setValue('daoFactory');
-            $tdbmConfiguration->getConstructorArgumentProperty('generatorListeners')->setValue([$moufListener]);
-
-            // Let's also delete the tdbmService if migrating versions <= 4.2
-            if ($migratingFrom42) {
-                $this->moufManager->removeComponent('tdbmService');
-            }
-        } else {
-            $tdbmConfiguration = $this->moufManager->getInstanceDescriptor('tdbmConfiguration');
-        }
-
-        if (!$this->moufManager->instanceExists('tdbmService')) {
-            $tdbmService = $this->moufManager->createInstance('Mouf\\Database\\TDBM\\TDBMService')->setName('tdbmService');
-            $tdbmService->getConstructorArgumentProperty('configuration')->setValue($tdbmConfiguration);
-        }
-
-        // We declare our instance of the Symfony command as a Mouf instance
-        $generateCommand = InstallUtils::getOrCreateInstance('generateCommand', GenerateCommand::class, $this->moufManager);
-        $generateCommand->getConstructorArgumentProperty('configuration')->setValue($tdbmConfiguration);
-
-        // We register that instance descriptor using "ConsoleUtils"
-        $consoleUtils = new ConsoleUtils($this->moufManager);
-        $consoleUtils->registerCommand($generateCommand);
-
-        $this->moufManager->rewriteMouf();
-
-        TdbmController::generateDaos($this->moufManager, 'tdbmService', $daonamespace, $beannamespace, 'daoFactory', $selfedit, /*$storeInUtc,*/ $defaultPath, $storePath);
-
-        InstallUtils::continueInstall($selfedit == 'true');
-    }
-
-    protected $errorMsg;
-
-    private function displayErrorMsg($msg)
-    {
-        $this->errorMsg = $msg;
-        $this->content->addFile(__DIR__.'/../../../../views/installError.php', $this);
-        $this->template->toHtml();
-    }
+	/**
+	 * @var HtmlBlock
+	 */
+	public $content;
+
+	public $selfedit;
+
+	/**
+	 * The active MoufManager to be edited/viewed.
+	 *
+	 * @var MoufManager
+	 */
+	public $moufManager;
+
+	/**
+	 * The template used by the main page for mouf.
+	 *
+	 * @Property
+	 * @Compulsory
+	 *
+	 * @var TemplateInterface
+	 */
+	public $template;
+
+	/**
+	 * Displays the first install screen.
+	 *
+	 * @Action
+	 * @Logged
+	 *
+	 * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
+	 */
+	public function defaultAction($selfedit = 'false')
+	{
+		$this->selfedit = $selfedit;
+
+		if ($selfedit == 'true') {
+			$this->moufManager = MoufManager::getMoufManager();
+		} else {
+			$this->moufManager = MoufManager::getMoufManagerHiddenInstance();
+		}
+
+		$this->content->addFile(dirname(__FILE__).'/../../../../views/installStep1.php', $this);
+		$this->template->toHtml();
+	}
+
+	/**
+	 * Skips the install process.
+	 *
+	 * @Action
+	 * @Logged
+	 *
+	 * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
+	 */
+	public function skip($selfedit = 'false')
+	{
+		InstallUtils::continueInstall($selfedit == 'true');
+	}
+
+	protected $daoNamespace;
+	protected $beanNamespace;
+	protected $autoloadDetected;
+	//protected $storeInUtc;
+	protected $useCustomComposer = false;
+	protected $composerFile;
+
+	/**
+	 * Displays the second install screen.
+	 *
+	 * @Action
+	 * @Logged
+	 *
+	 * @param string $selfedit If true, the name of the component must be a component from the Mouf framework itself (internal use only)
+	 */
+	public function configure($selfedit = 'false')
+	{
+		$this->selfedit = $selfedit;
+
+		if ($selfedit == 'true') {
+			$this->moufManager = MoufManager::getMoufManager();
+		} else {
+			$this->moufManager = MoufManager::getMoufManagerHiddenInstance();
+		}
+
+		// Let's start by performing basic checks about the instances we assume to exist.
+		if (!$this->moufManager->instanceExists('dbalConnection')) {
+			$this->displayErrorMsg("The TDBM install process assumes your database connection instance is already created, and that the name of this instance is 'dbalConnection'. Could not find the 'dbalConnection' instance.");
+
+			return;
+		}
+
+		if ($this->moufManager->has('tdbmConfiguration')) {
+			$tdbmConfiguration = $this->moufManager->getInstanceDescriptor('tdbmConfiguration');
+
+			$this->beanNamespace = $tdbmConfiguration->getConstructorArgumentProperty('beanNamespace')->getValue();
+			$this->daoNamespace = $tdbmConfiguration->getConstructorArgumentProperty('daoNamespace')->getValue();
+		} else {
+			// Old TDBM 4.2 fallback
+			$this->daoNamespace = $this->moufManager->getVariable('tdbmDefaultDaoNamespace_tdbmService');
+			$this->beanNamespace = $this->moufManager->getVariable('tdbmDefaultBeanNamespace_tdbmService');
+		}
+
+		if ($this->daoNamespace == null && $this->beanNamespace == null) {
+			$classNameMapper = ClassNameMapper::createFromComposerFile(__DIR__.'/../../../../../../../../composer.json');
+
+			$autoloadNamespaces = $classNameMapper->getManagedNamespaces();
+			if ($autoloadNamespaces) {
+				$this->autoloadDetected = true;
+				$rootNamespace = $autoloadNamespaces[0];
+				$this->daoNamespace = $rootNamespace.'Dao';
+				$this->beanNamespace = $rootNamespace.'Model';
+			} else {
+				$this->autoloadDetected = false;
+				$this->daoNamespace = 'YourApplication\\Dao';
+				$this->beanNamespace = 'YourApplication\\Model';
+			}
+		} else {
+			$this->autoloadDetected = true;
+		}
+		$this->defaultPath = true;
+		$this->storePath = '';
+
+		$this->castDatesToDateTime = true;
+
+		$this->content->addFile(__DIR__.'/../../../../views/installStep2.php', $this);
+		$this->template->toHtml();
+	}
+
+	/**
+	 * This action generates the TDBM instance, then the DAOs and Beans.
+	 *
+	 * @Action
+	 *
+	 * @param string $daonamespace
+	 * @param string $beannamespace
+	 * @param string $selfedit
+	 *
+	 * @throws \Mouf\MoufException
+	 */
+	public function generate($daonamespace, $beannamespace, /*$storeInUtc = 0,*/ $selfedit = 'false', $defaultPath = false, $storePath = '')
+	{
+		$this->selfedit = $selfedit;
+
+		if ($selfedit == 'true') {
+			$this->moufManager = MoufManager::getMoufManager();
+		} else {
+			$this->moufManager = MoufManager::getMoufManagerHiddenInstance();
+		}
+
+		$doctrineCache = $this->moufManager->getInstanceDescriptor('defaultDoctrineCache');
+
+		$migratingFrom42 = false;
+		if ($this->moufManager->has('tdbmService') && !$this->moufManager->has('tdbmConfiguration')) {
+			$migratingFrom42 = true;
+		}
+
+		$namingStrategy = InstallUtils::getOrCreateInstance('namingStrategy', DefaultNamingStrategy::class, $this->moufManager);
+		if ($migratingFrom42) {
+			// Let's setup the naming strategy for compatibility
+			$namingStrategy->getSetterProperty('setBeanPrefix')->setValue('');
+			$namingStrategy->getSetterProperty('setBeanSuffix')->setValue('Bean');
+			$namingStrategy->getSetterProperty('setBaseBeanPrefix')->setValue('');
+			$namingStrategy->getSetterProperty('setBaseBeanSuffix')->setValue('BaseBean');
+			$namingStrategy->getSetterProperty('setDaoPrefix')->setValue('');
+			$namingStrategy->getSetterProperty('setDaoSuffix')->setValue('Dao');
+			$namingStrategy->getSetterProperty('setBaseDaoPrefix')->setValue('');
+			$namingStrategy->getSetterProperty('setBaseDaoSuffix')->setValue('BaseDao');
+		}
+
+		if (!$this->moufManager->instanceExists('tdbmConfiguration')) {
+			$moufListener = InstallUtils::getOrCreateInstance(MoufDiListener::class, MoufDiListener::class, $this->moufManager);
+
+			$tdbmConfiguration = $this->moufManager->createInstance(MoufConfiguration::class)->setName('tdbmConfiguration');
+			$tdbmConfiguration->getConstructorArgumentProperty('connection')->setValue($this->moufManager->getInstanceDescriptor('dbalConnection'));
+			$tdbmConfiguration->getConstructorArgumentProperty('cache')->setValue($doctrineCache);
+			$tdbmConfiguration->getConstructorArgumentProperty('namingStrategy')->setValue($namingStrategy);
+			$tdbmConfiguration->getProperty('daoFactoryInstanceName')->setValue('daoFactory');
+			$tdbmConfiguration->getConstructorArgumentProperty('generatorListeners')->setValue([$moufListener]);
+
+			// Let's also delete the tdbmService if migrating versions <= 4.2
+			if ($migratingFrom42) {
+				$this->moufManager->removeComponent('tdbmService');
+			}
+		} else {
+			$tdbmConfiguration = $this->moufManager->getInstanceDescriptor('tdbmConfiguration');
+		}
+
+		if (!$this->moufManager->instanceExists('tdbmService')) {
+			$tdbmService = $this->moufManager->createInstance('Mouf\\Database\\TDBM\\TDBMService')->setName('tdbmService');
+			$tdbmService->getConstructorArgumentProperty('configuration')->setValue($tdbmConfiguration);
+		}
+
+		// We declare our instance of the Symfony command as a Mouf instance
+		$generateCommand = InstallUtils::getOrCreateInstance('generateCommand', GenerateCommand::class, $this->moufManager);
+		$generateCommand->getConstructorArgumentProperty('configuration')->setValue($tdbmConfiguration);
+
+		// We register that instance descriptor using "ConsoleUtils"
+		$consoleUtils = new ConsoleUtils($this->moufManager);
+		$consoleUtils->registerCommand($generateCommand);
+
+		$this->moufManager->rewriteMouf();
+
+		TdbmController::generateDaos($this->moufManager, 'tdbmService', $daonamespace, $beannamespace, 'daoFactory', $selfedit, /*$storeInUtc,*/ $defaultPath, $storePath);
+
+		InstallUtils::continueInstall($selfedit == 'true');
+	}
+
+	protected $errorMsg;
+
+	private function displayErrorMsg($msg)
+	{
+		$this->errorMsg = $msg;
+		$this->content->addFile(__DIR__.'/../../../../views/installError.php', $this);
+		$this->template->toHtml();
+	}
 }

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

Indentation +127 added lines, -127 removed lines

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

src/Mouf/Database/TDBM/AlterableResultIterator.php

Doc Comments +4 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
     /**
      * Adds an additional object to the result set (if not already available).
      *
-     * @param $object
+     * @param AbstractTDBMObject $object
      */
     public function add($object)
     {
@@ -85,7 +85,7 @@ 
     /**
      * Removes an object from the result set.
      *
-     * @param $object
+     * @param AbstractTDBMObject $object
      */
     public function remove($object)
     {
@@ -205,6 +205,7 @@ 
 
     /**
      * @param int $offset
+     * @param integer $limit
      *
      * @return \Porpaginas\Page
      */
@@ -227,7 +228,7 @@ 
     /**
      * Return an iterator over all results of the paginatable.
      *
-     * @return Iterator
+     * @return \Iterator
      */
     public function getIterator()
     {

Indentation +245 added lines, -245 removed lines

@@ -14,274 +14,274 @@
  */
 class AlterableResultIterator implements Result, \ArrayAccess, \JsonSerializable
 {
-    /**
-     * @var \Iterator|null
-     */
-    private $resultIterator;
+	/**
+	 * @var \Iterator|null
+	 */
+	private $resultIterator;
 
-    /**
-     * Key: the object to alter in the result set.
-     * Value: "add" => the object will be added to the resultset (if it is not found in it)
-     *        "delete" => the object will be removed from the resultset (if found).
-     *
-     * @var \SplObjectStorage
-     */
-    private $alterations;
+	/**
+	 * Key: the object to alter in the result set.
+	 * Value: "add" => the object will be added to the resultset (if it is not found in it)
+	 *        "delete" => the object will be removed from the resultset (if found).
+	 *
+	 * @var \SplObjectStorage
+	 */
+	private $alterations;
 
-    /**
-     * The result array from the result set.
-     *
-     * @var array|null
-     */
-    private $resultArray;
+	/**
+	 * The result array from the result set.
+	 *
+	 * @var array|null
+	 */
+	private $resultArray;
 
-    /**
-     * @param \Iterator|null $resultIterator
-     */
-    public function __construct(\Iterator $resultIterator = null)
-    {
-        $this->resultIterator = $resultIterator;
-        $this->alterations = new \SplObjectStorage();
-    }
+	/**
+	 * @param \Iterator|null $resultIterator
+	 */
+	public function __construct(\Iterator $resultIterator = null)
+	{
+		$this->resultIterator = $resultIterator;
+		$this->alterations = new \SplObjectStorage();
+	}
 
-    /**
-     * Sets a new iterator as the base iterator to be altered.
-     *
-     * @param \Iterator $resultIterator
-     */
-    public function setResultIterator(\Iterator $resultIterator)
-    {
-        $this->resultIterator = $resultIterator;
-        $this->resultArray = null;
-    }
+	/**
+	 * Sets a new iterator as the base iterator to be altered.
+	 *
+	 * @param \Iterator $resultIterator
+	 */
+	public function setResultIterator(\Iterator $resultIterator)
+	{
+		$this->resultIterator = $resultIterator;
+		$this->resultArray = null;
+	}
 
-    /**
-     * Returns the non altered result iterator (or null if none exist).
-     *
-     * @return \Iterator|null
-     */
-    public function getUnderlyingResultIterator()
-    {
-        return $this->resultIterator;
-    }
+	/**
+	 * Returns the non altered result iterator (or null if none exist).
+	 *
+	 * @return \Iterator|null
+	 */
+	public function getUnderlyingResultIterator()
+	{
+		return $this->resultIterator;
+	}
 
-    /**
-     * Adds an additional object to the result set (if not already available).
-     *
-     * @param $object
-     */
-    public function add($object)
-    {
-        $this->alterations->attach($object, 'add');
+	/**
+	 * Adds an additional object to the result set (if not already available).
+	 *
+	 * @param $object
+	 */
+	public function add($object)
+	{
+		$this->alterations->attach($object, 'add');
 
-        if ($this->resultArray !== null) {
-            $foundKey = array_search($object, $this->resultArray, true);
-            if ($foundKey === false) {
-                $this->resultArray[] = $object;
-            }
-        }
-    }
+		if ($this->resultArray !== null) {
+			$foundKey = array_search($object, $this->resultArray, true);
+			if ($foundKey === false) {
+				$this->resultArray[] = $object;
+			}
+		}
+	}
 
-    /**
-     * Removes an object from the result set.
-     *
-     * @param $object
-     */
-    public function remove($object)
-    {
-        $this->alterations->attach($object, 'delete');
+	/**
+	 * Removes an object from the result set.
+	 *
+	 * @param $object
+	 */
+	public function remove($object)
+	{
+		$this->alterations->attach($object, 'delete');
 
-        if ($this->resultArray !== null) {
-            $foundKey = array_search($object, $this->resultArray, true);
-            if ($foundKey !== false) {
-                unset($this->resultArray[$foundKey]);
-            }
-        }
-    }
+		if ($this->resultArray !== null) {
+			$foundKey = array_search($object, $this->resultArray, true);
+			if ($foundKey !== false) {
+				unset($this->resultArray[$foundKey]);
+			}
+		}
+	}
 
-    /**
-     * Casts the result set to a PHP array.
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        if ($this->resultArray === null) {
-            if ($this->resultIterator !== null) {
-                $this->resultArray = iterator_to_array($this->resultIterator);
-            } else {
-                $this->resultArray = [];
-            }
+	/**
+	 * Casts the result set to a PHP array.
+	 *
+	 * @return array
+	 */
+	public function toArray()
+	{
+		if ($this->resultArray === null) {
+			if ($this->resultIterator !== null) {
+				$this->resultArray = iterator_to_array($this->resultIterator);
+			} else {
+				$this->resultArray = [];
+			}
 
-            foreach ($this->alterations as $obj) {
-                $action = $this->alterations->getInfo(); // return, if exists, associated with cur. obj. data; else NULL
+			foreach ($this->alterations as $obj) {
+				$action = $this->alterations->getInfo(); // return, if exists, associated with cur. obj. data; else NULL
 
-                $foundKey = array_search($obj, $this->resultArray, true);
+				$foundKey = array_search($obj, $this->resultArray, true);
 
-                if ($action === 'add' && $foundKey === false) {
-                    $this->resultArray[] = $obj;
-                } elseif ($action === 'delete' && $foundKey !== false) {
-                    unset($this->resultArray[$foundKey]);
-                }
-            }
-        }
+				if ($action === 'add' && $foundKey === false) {
+					$this->resultArray[] = $obj;
+				} elseif ($action === 'delete' && $foundKey !== false) {
+					unset($this->resultArray[$foundKey]);
+				}
+			}
+		}
 
-        return array_values($this->resultArray);
-    }
+		return array_values($this->resultArray);
+	}
 
-    /**
-     * Whether a offset exists.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetexists.php
-     *
-     * @param mixed $offset <p>
-     *                      An offset to check for.
-     *                      </p>
-     *
-     * @return bool true on success or false on failure.
-     *              </p>
-     *              <p>
-     *              The return value will be casted to boolean if non-boolean was returned
-     *
-     * @since 5.0.0
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->toArray()[$offset]);
-    }
+	/**
+	 * Whether a offset exists.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetexists.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      An offset to check for.
+	 *                      </p>
+	 *
+	 * @return bool true on success or false on failure.
+	 *              </p>
+	 *              <p>
+	 *              The return value will be casted to boolean if non-boolean was returned
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetExists($offset)
+	{
+		return isset($this->toArray()[$offset]);
+	}
 
-    /**
-     * Offset to retrieve.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetget.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to retrieve.
-     *                      </p>
-     *
-     * @return mixed Can return all value types
-     *
-     * @since 5.0.0
-     */
-    public function offsetGet($offset)
-    {
-        return $this->toArray()[$offset];
-    }
+	/**
+	 * Offset to retrieve.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetget.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      The offset to retrieve.
+	 *                      </p>
+	 *
+	 * @return mixed Can return all value types
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetGet($offset)
+	{
+		return $this->toArray()[$offset];
+	}
 
-    /**
-     * Offset to set.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetset.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to assign the value to.
-     *                      </p>
-     * @param mixed $value  <p>
-     *                      The value to set.
-     *                      </p>
-     *
-     * @since 5.0.0
-     */
-    public function offsetSet($offset, $value)
-    {
-        throw new TDBMInvalidOperationException('You can set values in a TDBM result set, even in an alterable one. Use the add method 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, even in an alterable one. Use the add method instead.');
+	}
 
-    /**
-     * 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, even in an alterable one. Use the delete method instead.');
-    }
+	/**
+	 * 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, even in an alterable one. Use the delete method instead.');
+	}
 
-    /**
-     * @param int $offset
-     *
-     * @return \Porpaginas\Page
-     */
-    public function take($offset, $limit)
-    {
-        // TODO: replace this with a class implementing the map method.
-        return new ArrayPage(array_slice($this->toArray(), $offset, $limit), $offset, $limit, count($this->toArray()));
-    }
+	/**
+	 * @param int $offset
+	 *
+	 * @return \Porpaginas\Page
+	 */
+	public function take($offset, $limit)
+	{
+		// TODO: replace this with a class implementing the map method.
+		return new ArrayPage(array_slice($this->toArray(), $offset, $limit), $offset, $limit, count($this->toArray()));
+	}
 
-    /**
-     * Return the number of all results in the paginatable.
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->toArray());
-    }
+	/**
+	 * Return the number of all results in the paginatable.
+	 *
+	 * @return int
+	 */
+	public function count()
+	{
+		return count($this->toArray());
+	}
 
-    /**
-     * Return an iterator over all results of the paginatable.
-     *
-     * @return Iterator
-     */
-    public function getIterator()
-    {
-        if ($this->alterations->count() === 0) {
-            if ($this->resultIterator !== null) {
-                return $this->resultIterator;
-            } else {
-                return new \ArrayIterator([]);
-            }
-        } else {
-            return new \ArrayIterator($this->toArray());
-        }
-    }
+	/**
+	 * Return an iterator over all results of the paginatable.
+	 *
+	 * @return Iterator
+	 */
+	public function getIterator()
+	{
+		if ($this->alterations->count() === 0) {
+			if ($this->resultIterator !== null) {
+				return $this->resultIterator;
+			} else {
+				return new \ArrayIterator([]);
+			}
+		} else {
+			return new \ArrayIterator($this->toArray());
+		}
+	}
 
-    /**
-     * Specify data which should be serialized to JSON.
-     *
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     *
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     *               which is a value of any type other than a resource
-     *
-     * @since 5.4.0
-     */
-    public function jsonSerialize()
-    {
-        return $this->toArray();
-    }
+	/**
+	 * Specify data which should be serialized to JSON.
+	 *
+	 * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+	 *
+	 * @return mixed data which can be serialized by <b>json_encode</b>,
+	 *               which is a value of any type other than a resource
+	 *
+	 * @since 5.4.0
+	 */
+	public function jsonSerialize()
+	{
+		return $this->toArray();
+	}
 
-    /**
-     * Returns only one value (the first) of the result set.
-     * Returns null if no value exists.
-     *
-     * @return mixed|null
-     */
-    public function first()
-    {
-        $page = $this->take(0, 1);
-        foreach ($page as $bean) {
-            return $bean;
-        }
+	/**
+	 * Returns only one value (the first) of the result set.
+	 * Returns null if no value exists.
+	 *
+	 * @return mixed|null
+	 */
+	public function first()
+	{
+		$page = $this->take(0, 1);
+		foreach ($page as $bean) {
+			return $bean;
+		}
 
-        return;
-    }
+		return;
+	}
 
-    /**
-     * Returns a new iterator mapping any call using the $callable function.
-     *
-     * @param callable $callable
-     *
-     * @return MapIterator
-     */
-    public function map(callable $callable)
-    {
-        return new MapIterator($this->getIterator(), $callable);
-    }
+	/**
+	 * Returns a new iterator mapping any call using the $callable function.
+	 *
+	 * @param callable $callable
+	 *
+	 * @return MapIterator
+	 */
+	public function map(callable $callable)
+	{
+		return new MapIterator($this->getIterator(), $callable);
+	}
 }

src/Mouf/Database/TDBM/PageIterator.php

Indentation +211 added lines, -211 removed lines

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

src/Mouf/Database/TDBM/MapIterator.php

Indentation +87 added lines, -87 removed lines

@@ -11,91 +11,91 @@
  */
 class MapIterator implements Iterator, \JsonSerializable
 {
-    /**
-     * @var Iterator
-     */
-    protected $iterator;
-
-    /**
-     * @var callable Modifies the current item in iterator
-     */
-    protected $callable;
-
-    /**
-     * @param $iterator Iterator|array
-     * @param $callable callable This can have two parameters
-     *
-     * @throws TDBMException
-     */
-    public function __construct($iterator, callable $callable)
-    {
-        if (is_array($iterator)) {
-            $this->iterator = new \ArrayIterator($iterator);
-        } elseif (!($iterator instanceof Iterator)) {
-            throw new TDBMException('$iterator parameter must be an instance of Iterator');
-        } else {
-            $this->iterator = $iterator;
-        }
-
-        if ($callable instanceof \Closure) {
-            // make sure there's one argument
-            $reflection = new \ReflectionObject($callable);
-            if ($reflection->hasMethod('__invoke')) {
-                $method = $reflection->getMethod('__invoke');
-                if ($method->getNumberOfParameters() !== 1) {
-                    throw new TDBMException('$callable must accept one and only one parameter.');
-                }
-            }
-        }
-
-        $this->callable = $callable;
-    }
-
-    /**
-     * Alters the current item with $this->callable and returns a new item.
-     * Be careful with your types as we can't do static type checking here!
-     *
-     * @return mixed
-     */
-    public function current()
-    {
-        $callable = $this->callable;
-
-        return $callable($this->iterator->current());
-    }
-
-    public function next()
-    {
-        $this->iterator->next();
-    }
-
-    public function key()
-    {
-        return $this->iterator->key();
-    }
-
-    public function valid()
-    {
-        return $this->iterator->valid();
-    }
-
-    public function rewind()
-    {
-        $this->iterator->rewind();
-    }
-
-    /**
-     * Casts the iterator to a PHP array.
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        return iterator_to_array($this);
-    }
-
-    public function jsonSerialize()
-    {
-        return $this->toArray();
-    }
+	/**
+	 * @var Iterator
+	 */
+	protected $iterator;
+
+	/**
+	 * @var callable Modifies the current item in iterator
+	 */
+	protected $callable;
+
+	/**
+	 * @param $iterator Iterator|array
+	 * @param $callable callable This can have two parameters
+	 *
+	 * @throws TDBMException
+	 */
+	public function __construct($iterator, callable $callable)
+	{
+		if (is_array($iterator)) {
+			$this->iterator = new \ArrayIterator($iterator);
+		} elseif (!($iterator instanceof Iterator)) {
+			throw new TDBMException('$iterator parameter must be an instance of Iterator');
+		} else {
+			$this->iterator = $iterator;
+		}
+
+		if ($callable instanceof \Closure) {
+			// make sure there's one argument
+			$reflection = new \ReflectionObject($callable);
+			if ($reflection->hasMethod('__invoke')) {
+				$method = $reflection->getMethod('__invoke');
+				if ($method->getNumberOfParameters() !== 1) {
+					throw new TDBMException('$callable must accept one and only one parameter.');
+				}
+			}
+		}
+
+		$this->callable = $callable;
+	}
+
+	/**
+	 * Alters the current item with $this->callable and returns a new item.
+	 * Be careful with your types as we can't do static type checking here!
+	 *
+	 * @return mixed
+	 */
+	public function current()
+	{
+		$callable = $this->callable;
+
+		return $callable($this->iterator->current());
+	}
+
+	public function next()
+	{
+		$this->iterator->next();
+	}
+
+	public function key()
+	{
+		return $this->iterator->key();
+	}
+
+	public function valid()
+	{
+		return $this->iterator->valid();
+	}
+
+	public function rewind()
+	{
+		$this->iterator->rewind();
+	}
+
+	/**
+	 * Casts the iterator to a PHP array.
+	 *
+	 * @return array
+	 */
+	public function toArray()
+	{
+		return iterator_to_array($this);
+	}
+
+	public function jsonSerialize()
+	{
+		return $this->toArray();
+	}
 }

src/Mouf/Database/TDBM/TDBMSchemaAnalyzer.php

Indentation +134 added lines, -134 removed lines

@@ -14,138 +14,138 @@
  */
 class TDBMSchemaAnalyzer
 {
-    private $connection;
-
-    /**
-     * @var Schema
-     */
-    private $schema;
-
-    /**
-     * @var string
-     */
-    private $cachePrefix;
-
-    /**
-     * @var Cache
-     */
-    private $cache;
-
-    /**
-     * @var SchemaAnalyzer
-     */
-    private $schemaAnalyzer;
-
-    /**
-     * @param Connection     $connection     The DBAL DB connection to use
-     * @param Cache          $cache          A cache service to be used
-     * @param SchemaAnalyzer $schemaAnalyzer The schema analyzer that will be used to find shortest paths...
-     *                                       Will be automatically created if not passed
-     */
-    public function __construct(Connection $connection, Cache $cache, SchemaAnalyzer $schemaAnalyzer)
-    {
-        $this->connection = $connection;
-        $this->cache = $cache;
-        $this->schemaAnalyzer = $schemaAnalyzer;
-    }
-
-    /**
-     * Returns a unique ID for the current connection. Useful for namespacing cache entries in the current connection.
-     *
-     * @return string
-     */
-    public function getCachePrefix()
-    {
-        if ($this->cachePrefix === null) {
-            $this->cachePrefix = hash('md4', $this->connection->getHost().'-'.$this->connection->getPort().'-'.$this->connection->getDatabase().'-'.$this->connection->getDriver()->getName());
-        }
-
-        return $this->cachePrefix;
-    }
-
-    /**
-     * Returns the (cached) schema.
-     *
-     * @return Schema
-     */
-    public function getSchema()
-    {
-        if ($this->schema === null) {
-            $cacheKey = $this->getCachePrefix().'_schema';
-            if ($this->cache->contains($cacheKey)) {
-                $this->schema = $this->cache->fetch($cacheKey);
-            } else {
-                $this->schema = $this->connection->getSchemaManager()->createSchema();
-                $this->cache->save($cacheKey, $this->schema);
-            }
-        }
-
-        return $this->schema;
-    }
-
-    /**
-     * Returns the list of pivot tables linked to table $tableName.
-     *
-     * @param string $tableName
-     *
-     * @return array|string[]
-     */
-    public function getPivotTableLinkedToTable($tableName)
-    {
-        $cacheKey = $this->getCachePrefix().'_pivottables_link_'.$tableName;
-        if ($this->cache->contains($cacheKey)) {
-            return $this->cache->fetch($cacheKey);
-        }
-
-        $pivotTables = [];
-
-        $junctionTables = $this->schemaAnalyzer->detectJunctionTables(true);
-        foreach ($junctionTables as $table) {
-            $fks = $table->getForeignKeys();
-            foreach ($fks as $fk) {
-                if ($fk->getForeignTableName() == $tableName) {
-                    $pivotTables[] = $table->getName();
-                    break;
-                }
-            }
-        }
-
-        $this->cache->save($cacheKey, $pivotTables);
-
-        return $pivotTables;
-    }
-
-    /**
-     * Returns the list of foreign keys pointing to the table represented by this bean, excluding foreign keys
-     * from junction tables and from inheritance.
-     *
-     * @return ForeignKeyConstraint[]
-     */
-    public function getIncomingForeignKeys($tableName)
-    {
-        $junctionTables = $this->schemaAnalyzer->detectJunctionTables(true);
-        $junctionTableNames = array_map(function (Table $table) {
-            return $table->getName();
-        }, $junctionTables);
-        $childrenRelationships = $this->schemaAnalyzer->getChildrenRelationships($tableName);
-
-        $fks = [];
-        foreach ($this->getSchema()->getTables() as $table) {
-            foreach ($table->getForeignKeys() as $fk) {
-                if ($fk->getForeignTableName() === $tableName) {
-                    if (in_array($fk->getLocalTableName(), $junctionTableNames)) {
-                        continue;
-                    }
-                    foreach ($childrenRelationships as $childFk) {
-                        if ($fk->getLocalTableName() === $childFk->getLocalTableName() && $fk->getLocalColumns() === $childFk->getLocalColumns()) {
-                            continue 2;
-                        }
-                    }
-                    $fks[] = $fk;
-                }
-            }
-        }
-
-        return $fks;
-    }
+	private $connection;
+
+	/**
+	 * @var Schema
+	 */
+	private $schema;
+
+	/**
+	 * @var string
+	 */
+	private $cachePrefix;
+
+	/**
+	 * @var Cache
+	 */
+	private $cache;
+
+	/**
+	 * @var SchemaAnalyzer
+	 */
+	private $schemaAnalyzer;
+
+	/**
+	 * @param Connection     $connection     The DBAL DB connection to use
+	 * @param Cache          $cache          A cache service to be used
+	 * @param SchemaAnalyzer $schemaAnalyzer The schema analyzer that will be used to find shortest paths...
+	 *                                       Will be automatically created if not passed
+	 */
+	public function __construct(Connection $connection, Cache $cache, SchemaAnalyzer $schemaAnalyzer)
+	{
+		$this->connection = $connection;
+		$this->cache = $cache;
+		$this->schemaAnalyzer = $schemaAnalyzer;
+	}
+
+	/**
+	 * Returns a unique ID for the current connection. Useful for namespacing cache entries in the current connection.
+	 *
+	 * @return string
+	 */
+	public function getCachePrefix()
+	{
+		if ($this->cachePrefix === null) {
+			$this->cachePrefix = hash('md4', $this->connection->getHost().'-'.$this->connection->getPort().'-'.$this->connection->getDatabase().'-'.$this->connection->getDriver()->getName());
+		}
+
+		return $this->cachePrefix;
+	}
+
+	/**
+	 * Returns the (cached) schema.
+	 *
+	 * @return Schema
+	 */
+	public function getSchema()
+	{
+		if ($this->schema === null) {
+			$cacheKey = $this->getCachePrefix().'_schema';
+			if ($this->cache->contains($cacheKey)) {
+				$this->schema = $this->cache->fetch($cacheKey);
+			} else {
+				$this->schema = $this->connection->getSchemaManager()->createSchema();
+				$this->cache->save($cacheKey, $this->schema);
+			}
+		}
+
+		return $this->schema;
+	}
+
+	/**
+	 * Returns the list of pivot tables linked to table $tableName.
+	 *
+	 * @param string $tableName
+	 *
+	 * @return array|string[]
+	 */
+	public function getPivotTableLinkedToTable($tableName)
+	{
+		$cacheKey = $this->getCachePrefix().'_pivottables_link_'.$tableName;
+		if ($this->cache->contains($cacheKey)) {
+			return $this->cache->fetch($cacheKey);
+		}
+
+		$pivotTables = [];
+
+		$junctionTables = $this->schemaAnalyzer->detectJunctionTables(true);
+		foreach ($junctionTables as $table) {
+			$fks = $table->getForeignKeys();
+			foreach ($fks as $fk) {
+				if ($fk->getForeignTableName() == $tableName) {
+					$pivotTables[] = $table->getName();
+					break;
+				}
+			}
+		}
+
+		$this->cache->save($cacheKey, $pivotTables);
+
+		return $pivotTables;
+	}
+
+	/**
+	 * Returns the list of foreign keys pointing to the table represented by this bean, excluding foreign keys
+	 * from junction tables and from inheritance.
+	 *
+	 * @return ForeignKeyConstraint[]
+	 */
+	public function getIncomingForeignKeys($tableName)
+	{
+		$junctionTables = $this->schemaAnalyzer->detectJunctionTables(true);
+		$junctionTableNames = array_map(function (Table $table) {
+			return $table->getName();
+		}, $junctionTables);
+		$childrenRelationships = $this->schemaAnalyzer->getChildrenRelationships($tableName);
+
+		$fks = [];
+		foreach ($this->getSchema()->getTables() as $table) {
+			foreach ($table->getForeignKeys() as $fk) {
+				if ($fk->getForeignTableName() === $tableName) {
+					if (in_array($fk->getLocalTableName(), $junctionTableNames)) {
+						continue;
+					}
+					foreach ($childrenRelationships as $childFk) {
+						if ($fk->getLocalTableName() === $childFk->getLocalTableName() && $fk->getLocalColumns() === $childFk->getLocalColumns()) {
+							continue 2;
+						}
+					}
+					$fks[] = $fk;
+				}
+			}
+		}
+
+		return $fks;
+	}
 }

src/Mouf/Database/TDBM/InnerResultArray.php

Indentation +89 added lines, -89 removed lines

@@ -27,100 +27,100 @@
  */
 class InnerResultArray extends InnerResultIterator
 {
-    /**
-     * The list of results already fetched.
-     *
-     * @var AbstractTDBMObject[]
-     */
-    private $results = [];
+	/**
+	 * The list of results already fetched.
+	 *
+	 * @var AbstractTDBMObject[]
+	 */
+	private $results = [];
 
-    /**
-     * Whether a offset exists.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetexists.php
-     *
-     * @param mixed $offset <p>
-     *                      An offset to check for.
-     *                      </p>
-     *
-     * @return bool true on success or false on failure.
-     *              </p>
-     *              <p>
-     *              The return value will be casted to boolean if non-boolean was returned
-     *
-     * @since 5.0.0
-     */
-    public function offsetExists($offset)
-    {
-        try {
-            $this->toIndex($offset);
-        } catch (TDBMInvalidOffsetException $e) {
-            return false;
-        }
+	/**
+	 * Whether a offset exists.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetexists.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      An offset to check for.
+	 *                      </p>
+	 *
+	 * @return bool true on success or false on failure.
+	 *              </p>
+	 *              <p>
+	 *              The return value will be casted to boolean if non-boolean was returned
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetExists($offset)
+	{
+		try {
+			$this->toIndex($offset);
+		} catch (TDBMInvalidOffsetException $e) {
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Offset to retrieve.
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetget.php
-     *
-     * @param mixed $offset <p>
-     *                      The offset to retrieve.
-     *                      </p>
-     *
-     * @return mixed Can return all value types
-     *
-     * @since 5.0.0
-     */
-    public function offsetGet($offset)
-    {
-        $this->toIndex($offset);
+	/**
+	 * Offset to retrieve.
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetget.php
+	 *
+	 * @param mixed $offset <p>
+	 *                      The offset to retrieve.
+	 *                      </p>
+	 *
+	 * @return mixed Can return all value types
+	 *
+	 * @since 5.0.0
+	 */
+	public function offsetGet($offset)
+	{
+		$this->toIndex($offset);
 
-        return $this->results[$offset];
-    }
+		return $this->results[$offset];
+	}
 
-    private function toIndex($offset)
-    {
-        if ($offset < 0 || filter_var($offset, FILTER_VALIDATE_INT) === false) {
-            throw new TDBMInvalidOffsetException('Trying to access result set using offset "'.$offset.'". An offset must be a positive integer.');
-        }
-        if ($this->statement === null) {
-            $this->executeQuery();
-        }
-        while (!isset($this->results[$offset])) {
-            $this->next();
-            if ($this->current === null) {
-                throw new TDBMInvalidOffsetException('Offset "'.$offset.'" does not exist in result set.');
-            }
-        }
-    }
+	private function toIndex($offset)
+	{
+		if ($offset < 0 || filter_var($offset, FILTER_VALIDATE_INT) === false) {
+			throw new TDBMInvalidOffsetException('Trying to access result set using offset "'.$offset.'". An offset must be a positive integer.');
+		}
+		if ($this->statement === null) {
+			$this->executeQuery();
+		}
+		while (!isset($this->results[$offset])) {
+			$this->next();
+			if ($this->current === null) {
+				throw new TDBMInvalidOffsetException('Offset "'.$offset.'" does not exist in result set.');
+			}
+		}
+	}
 
-    public function next()
-    {
-        // Let's overload the next() method to store the result.
-        if (isset($this->results[$this->key + 1])) {
-            ++$this->key;
-            $this->current = $this->results[$this->key];
-        } else {
-            parent::next();
-            if ($this->current !== null) {
-                $this->results[$this->key] = $this->current;
-            }
-        }
-    }
+	public function next()
+	{
+		// Let's overload the next() method to store the result.
+		if (isset($this->results[$this->key + 1])) {
+			++$this->key;
+			$this->current = $this->results[$this->key];
+		} else {
+			parent::next();
+			if ($this->current !== null) {
+				$this->results[$this->key] = $this->current;
+			}
+		}
+	}
 
-    /**
-     * Overloads the rewind implementation.
-     * Do not reexecute the query.
-     */
-    public function rewind()
-    {
-        if (!$this->fetchStarted) {
-            $this->executeQuery();
-        }
-        $this->key = -1;
-        $this->next();
-    }
+	/**
+	 * Overloads the rewind implementation.
+	 * Do not reexecute the query.
+	 */
+	public function rewind()
+	{
+		if (!$this->fetchStarted) {
+			$this->executeQuery();
+		}
+		$this->key = -1;
+		$this->next();
+	}
 }