miBadger / miBadger.ActiveRecord

src/AbstractActiveRecord.php

Doc Comments +4 added lines

@@ -363,6 +363,10 @@
 		$this->pdo->query($this->buildCreateTableSQL());
 	}
 
+	/**
+	 * @param string $parentColumn
+	 * @param string $childTable
+	 */
 	protected function buildConstraint($parentTable, $parentColumn, $childTable, $childColumn)
 	{
 		$template = <<<SQL

Indentation +696 added lines, -696 removed lines

@@ -18,706 +18,706 @@
  */
 abstract class AbstractActiveRecord implements ActiveRecordInterface
 {
-	const COLUMN_NAME_ID = 'id';
-	const COLUMN_TYPE_ID = 'INT UNSIGNED';
-
-	/** @var \PDO The PDO object. */
-	protected $pdo;
-
-	/** @var null|int The ID. */
-	private $id;
-
-	/** @var array A map of column name to functions that hook the insert function */
-	private $registeredCreateHooks;
-
-	/** @var array A map of column name to functions that hook the read function */
-	private $registeredReadHooks;
-
-	/** @var array A map of column name to functions that hook the update function */
-	private $registeredUpdateHooks;
-
-	/** @var array A map of column name to functions that hook the update function */
-	private $registeredDeleteHooks;	
-
-	/** @var array A map of column name to functions that hook the search function */
-	private $registeredSearchHooks;
-
-	/** @var array A list of table column definitions */
-	private $tableDefinition;
-
-	/**
-	 * Construct an abstract active record with the given PDO.
-	 *
-	 * @param \PDO $pdo
-	 */
-	public function __construct(\PDO $pdo)
-	{
-		$pdo->setAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE, \PDO::FETCH_ASSOC);
-		$pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
-
-		$this->setPdo($pdo);
-		$this->tableDefinition = $this->getActiveRecordTableDefinition();
-		$this->registeredCreateHooks = [];
-		$this->registeredReadHooks = [];
-		$this->registeredUpdateHooks = [];
-		$this->registeredDeleteHooks = [];
-		$this->registeredSearchHooks = [];
-
-		// Extend table definition with default ID field, throw exception if field already exists
-		if (array_key_exists('id', $this->tableDefinition)) {
-			$message = "Table definition in record contains a field with name \"id\"";
-			$message .= ", which is a reserved name by ActiveRecord";
-			throw new ActiveRecordException($message, 0);
-		}
-
-		$this->tableDefinition[self::COLUMN_NAME_ID] =
-		[
-			'value' => &$this->id,
-			'validate' => null,
-			'type' => self::COLUMN_TYPE_ID,
-			'properties' => ColumnProperty::NOT_NULL | ColumnProperty::IMMUTABLE | ColumnProperty::AUTO_INCREMENT | ColumnProperty::PRIMARY_KEY
-		];
-	}
-
-	/**
-	 * Register a new hook for a specific column that gets called before execution of the create() method
-	 * Only one hook per column can be registered at a time
-	 * @param string $columnName The name of the column that is registered.
-	 * @param string|callable $fn Either a callable, or the name of a method on the inheriting object.
-	 */
-	public function registerCreateHook($columnName, $fn) 
-	{
-		// Check whether column exists
-		if (!array_key_exists($columnName, $this->tableDefinition)) 
-		{
-			throw new ActiveRecordException("Hook is trying to register on non-existing column \"$columnName\"", 0);
-		}
-
-		// Enforcing 1 hook per table column
-		if (array_key_exists($columnName, $this->registeredCreateHooks)) {
-			$message = "Hook is trying to register on an already registered column \"$columnName\", ";
-			$message .= "do you have conflicting traits?";
-			throw new ActiveRecordException($message, 0);
-		}
-
-		if (is_string($fn) && is_callable([$this, $fn])) {
-			$this->registeredCreateHooks[$columnName] = [$this, $fn];
-		} else if (is_callable($fn)) {
-			$this->registeredCreateHooks[$columnName] = $fn;
-		} else {
-			throw new ActiveRecordException("Provided hook on column \"$columnName\" is not callable", 0);
-		}
-	}
-
-	/**
-	 * Register a new hook for a specific column that gets called before execution of the read() method
-	 * Only one hook per column can be registered at a time
-	 * @param string $columnName The name of the column that is registered.
-	 * @param string|callable $fn Either a callable, or the name of a method on the inheriting object.
-	 */
-	public function registerReadHook($columnName, $fn)
-	{
-		// Check whether column exists
-		if (!array_key_exists($columnName, $this->tableDefinition)) 
-		{
-			throw new ActiveRecordException("Hook is trying to register on non-existing column \"$columnName\"", 0);
-		}
-
-		// Enforcing 1 hook per table column
-		if (array_key_exists($columnName, $this->registeredReadHooks)) {
-			$message = "Hook is trying to register on an already registered column \"$columnName\", ";
-			$message .= "do you have conflicting traits?";
-			throw new ActiveRecordException($message, 0);
-		}
-
-		if (is_string($fn) && is_callable([$this, $fn])) {
-			$this->registeredReadHooks[$columnName] = [$this, $fn];
-		} else if (is_callable($fn)) {
-			$this->registeredReadHooks[$columnName] = $fn;
-		} else {
-			throw new ActiveRecordException("Provided hook on column \"$columnName\" is not callable", 0);
-		}
-	}
-
-	/**
-	 * Register a new hook for a specific column that gets called before execution of the update() method
-	 * Only one hook per column can be registered at a time
-	 * @param string $columnName The name of the column that is registered.
-	 * @param string|callable $fn Either a callable, or the name of a method on the inheriting object.
-	 */
-	public function registerUpdateHook($columnName, $fn)
-	{
-		// Check whether column exists
-		if (!array_key_exists($columnName, $this->tableDefinition)) 
-		{
-			throw new ActiveRecordException("Hook is trying to register on non-existing column \"$columnName\"", 0);
-		}
-
-		// Enforcing 1 hook per table column
-		if (array_key_exists($columnName, $this->registeredUpdateHooks)) {
-			$message = "Hook is trying to register on an already registered column \"$columnName\", ";
-			$message .= "do you have conflicting traits?";
-			throw new ActiveRecordException($message, 0);
-		}
-
-		if (is_string($fn) && is_callable([$this, $fn])) {
-			$this->registeredUpdateHooks[$columnName] = [$this, $fn];
-		} else if (is_callable($fn)) {
-			$this->registeredUpdateHooks[$columnName] = $fn;
-		} else {
-			throw new ActiveRecordException("Provided hook on column \"$columnName\" is not callable", 0);
-		}
-	}
-
-	/**
-	 * Register a new hook for a specific column that gets called before execution of the delete() method
-	 * Only one hook per column can be registered at a time
-	 * @param string $columnName The name of the column that is registered.
-	 * @param string|callable $fn Either a callable, or the name of a method on the inheriting object.
-	 */
-	public function registerDeleteHook($columnName, $fn)
-	{
-		// Check whether column exists
-		if (!array_key_exists($columnName, $this->tableDefinition)) 
-		{
-			throw new ActiveRecordException("Hook is trying to register on non-existing column \"$columnName\"", 0);
-		}
-
-		// Enforcing 1 hook per table column
-		if (array_key_exists($columnName, $this->registeredDeleteHooks)) {
-			$message = "Hook is trying to register on an already registered column \"$columnName\", ";
-			$message .= "do you have conflicting traits?";
-			throw new ActiveRecordException($message, 0);
-		}
-
-		if (is_string($fn) && is_callable([$this, $fn])) {
-			$this->registeredDeleteHooks[$columnName] = [$this, $fn];
-		} else if (is_callable($fn)) {
-			$this->registeredDeleteHooks[$columnName] = $fn;
-		} else {
-			throw new ActiveRecordException("Provided hook on column \"$columnName\" is not callable", 0);
-		}
-	}
-
-	/**
-	 * Register a new hook for a specific column that gets called before execution of the search() method
-	 * Only one hook per column can be registered at a time
-	 * @param string $columnName The name of the column that is registered.
-	 * @param string|callable $fn Either a callable, or the name of a method on the inheriting object. The callable is required to take one argument: an instance of miBadger\Query\Query; 
-	 */
-	public function registerSearchHook($columnName, $fn)
-	{
-		// Check whether column exists
-		if (!array_key_exists($columnName, $this->tableDefinition)) 
-		{
-			throw new ActiveRecordException("Hook is trying to register on non-existing column \"$columnName\"", 0);
-		}
-
-		// Enforcing 1 hook per table column
-		if (array_key_exists($columnName, $this->registeredSearchHooks)) {
-			$message = "Hook is trying to register on an already registered column \"$columnName\", ";
-			$message .= "do you have conflicting traits?";
-			throw new ActiveRecordException($message, 0);
-		}
-
-		if (is_string($fn) && is_callable([$this, $fn])) {
-			$this->registeredSearchHooks[$columnName] = [$this, $fn];
-		} else if (is_callable($fn)) {
-			$this->registeredSearchHooks[$columnName] = $fn;
-		} else {
-			throw new ActiveRecordException("Provided hook on column \"$columnName\" is not callable", 0);
-		}
-	}
-
-	/**
-	 * Adds a new column definition to the table.
-	 * @param string $columnName The name of the column that is registered.
-	 * @param Array $definition The definition of that column.
-	 */
-	public function extendTableDefinition($columnName, $definition)
-	{
-		// Enforcing table can only be extended with new columns
-		if (array_key_exists($columnName, $this->tableDefinition)) {
-			$message = "Table is being extended with a column that already exists, ";
-			$message .= "\"$columnName\" conflicts with your table definition";
-			throw new ActiveRecordException($message, 0);
-		}
-
-		$this->tableDefinition[$columnName] = $definition;
-	}
-
-	private function getDatabaseTypeString($colName, $type, $length)
-	{
-		if ($type === null) 
-		{
-			throw new ActiveRecordException(sprintf("Column %s has invalid type \"NULL\"", $colName));
-		}
-
-		switch (strtoupper($type)) {
-			case 'DATETIME':
-			case 'DATE':
-			case 'TIME':
-			case 'TEXT':
-			case 'INT UNSIGNED':
-				return $type;
-
-			case 'VARCHAR':
-				return sprintf('%s(%d)', $type, $length);
-
-			case 'INT':
-			case 'TINYINT':
-			case 'BIGINT':
-			default: 	
-			// @TODO(Default): throw exception, or implicitly assume that type is correct? (For when using SQL databases with different types)
-				if ($length === null) {
-					return $type;
-				} else {
-					return sprintf('%s(%d)', $type, $length);	
-				}
-		}
-	}
-
-	private function buildCreateTableColumnEntry($colName, $type, $length, $properties, $default)
-	{
-
-		$stmnt = sprintf('`%s` %s ', $colName, $this->getDatabaseTypeString($colName, $type, $length));
-		if ($properties & ColumnProperty::NOT_NULL) {
-			$stmnt .= 'NOT NULL ';
-		} else {
-			$stmnt .= 'NULL ';
-		}
-
-		if ($default !== NULL) {
-			$stmnt .= ' DEFAULT ' . $default . ' ';
-		}
-
-		if ($properties & ColumnProperty::AUTO_INCREMENT) {
-			$stmnt .= 'AUTO_INCREMENT ';
-		}
-
-		if ($properties & ColumnProperty::UNIQUE) {
-			$stmnt .= 'UNIQUE ';
-		}
-
-		if ($properties & ColumnProperty::PRIMARY_KEY) {
-			$stmnt .= 'PRIMARY KEY ';
-		}
-
-		return $stmnt;
-	}
-
-
-	private function sortColumnStatements($colStatements)
-	{
-		// Find ID statement and put it first
-		$sortedStatements = [];
-
-		$sortedStatements[] = $colStatements[self::COLUMN_NAME_ID];
-		unset($colStatements[self::COLUMN_NAME_ID]);
-
-		// Sort remaining columns in alphabetical order
-		$columns = array_keys($colStatements);
-		sort($columns);
-		foreach ($columns as $colName) {
-			$sortedStatements[] = $colStatements[$colName];
-		}
-
-		return $sortedStatements;
-	}
-
-
-	public function buildCreateTableSQL()
-	{
-		$columnStatements = [];
-		foreach ($this->tableDefinition as $colName => $definition) {
-			// Destructure column definition
-			$type    = $definition['type'] ?? null;
-			$default = $definition['default'] ?? null;
-			$length  = $definition['length'] ?? null;
-			$properties = $definition['properties'] ?? null;
-
-			if (isset($definition['relation']) && $type !== null) {
-				$msg = "Column \"$colName\": ";
-				$msg .= "Relationship columns have an automatically inferred type, so type should be omitted";
-				throw new ActiveRecordException($msg);
-			} else if (isset($definition['relation'])) {
-				$type = self::COLUMN_TYPE_ID;
-			}
-
-			$columnStatements[$colName] = $this->buildCreateTableColumnEntry($colName, $type, $length, $properties, $default);
-		}
-
-		// Sort table (first column is id, the remaining are alphabetically sorted)
-		$columnStatements = $this->sortColumnStatements($columnStatements);
-
-		$sql = 'CREATE TABLE ' . $this->getActiveRecordTable() . ' ';
-		$sql .= "(\n";
-		$sql .= join($columnStatements, ",\n");
-		$sql .= "\n);";
-
-		return $sql;
-	}
-
-	public function createTable()
-	{
-		$this->pdo->query($this->buildCreateTableSQL());
-	}
-
-	protected function buildConstraint($parentTable, $parentColumn, $childTable, $childColumn)
-	{
-		$template = <<<SQL
+    const COLUMN_NAME_ID = 'id';
+    const COLUMN_TYPE_ID = 'INT UNSIGNED';
+
+    /** @var \PDO The PDO object. */
+    protected $pdo;
+
+    /** @var null|int The ID. */
+    private $id;
+
+    /** @var array A map of column name to functions that hook the insert function */
+    private $registeredCreateHooks;
+
+    /** @var array A map of column name to functions that hook the read function */
+    private $registeredReadHooks;
+
+    /** @var array A map of column name to functions that hook the update function */
+    private $registeredUpdateHooks;
+
+    /** @var array A map of column name to functions that hook the update function */
+    private $registeredDeleteHooks;	
+
+    /** @var array A map of column name to functions that hook the search function */
+    private $registeredSearchHooks;
+
+    /** @var array A list of table column definitions */
+    private $tableDefinition;
+
+    /**
+     * Construct an abstract active record with the given PDO.
+     *
+     * @param \PDO $pdo
+     */
+    public function __construct(\PDO $pdo)
+    {
+        $pdo->setAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE, \PDO::FETCH_ASSOC);
+        $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+
+        $this->setPdo($pdo);
+        $this->tableDefinition = $this->getActiveRecordTableDefinition();
+        $this->registeredCreateHooks = [];
+        $this->registeredReadHooks = [];
+        $this->registeredUpdateHooks = [];
+        $this->registeredDeleteHooks = [];
+        $this->registeredSearchHooks = [];
+
+        // Extend table definition with default ID field, throw exception if field already exists
+        if (array_key_exists('id', $this->tableDefinition)) {
+            $message = "Table definition in record contains a field with name \"id\"";
+            $message .= ", which is a reserved name by ActiveRecord";
+            throw new ActiveRecordException($message, 0);
+        }
+
+        $this->tableDefinition[self::COLUMN_NAME_ID] =
+        [
+            'value' => &$this->id,
+            'validate' => null,
+            'type' => self::COLUMN_TYPE_ID,
+            'properties' => ColumnProperty::NOT_NULL | ColumnProperty::IMMUTABLE | ColumnProperty::AUTO_INCREMENT | ColumnProperty::PRIMARY_KEY
+        ];
+    }
+
+    /**
+     * Register a new hook for a specific column that gets called before execution of the create() method
+     * Only one hook per column can be registered at a time
+     * @param string $columnName The name of the column that is registered.
+     * @param string|callable $fn Either a callable, or the name of a method on the inheriting object.
+     */
+    public function registerCreateHook($columnName, $fn) 
+    {
+        // Check whether column exists
+        if (!array_key_exists($columnName, $this->tableDefinition)) 
+        {
+            throw new ActiveRecordException("Hook is trying to register on non-existing column \"$columnName\"", 0);
+        }
+
+        // Enforcing 1 hook per table column
+        if (array_key_exists($columnName, $this->registeredCreateHooks)) {
+            $message = "Hook is trying to register on an already registered column \"$columnName\", ";
+            $message .= "do you have conflicting traits?";
+            throw new ActiveRecordException($message, 0);
+        }
+
+        if (is_string($fn) && is_callable([$this, $fn])) {
+            $this->registeredCreateHooks[$columnName] = [$this, $fn];
+        } else if (is_callable($fn)) {
+            $this->registeredCreateHooks[$columnName] = $fn;
+        } else {
+            throw new ActiveRecordException("Provided hook on column \"$columnName\" is not callable", 0);
+        }
+    }
+
+    /**
+     * Register a new hook for a specific column that gets called before execution of the read() method
+     * Only one hook per column can be registered at a time
+     * @param string $columnName The name of the column that is registered.
+     * @param string|callable $fn Either a callable, or the name of a method on the inheriting object.
+     */
+    public function registerReadHook($columnName, $fn)
+    {
+        // Check whether column exists
+        if (!array_key_exists($columnName, $this->tableDefinition)) 
+        {
+            throw new ActiveRecordException("Hook is trying to register on non-existing column \"$columnName\"", 0);
+        }
+
+        // Enforcing 1 hook per table column
+        if (array_key_exists($columnName, $this->registeredReadHooks)) {
+            $message = "Hook is trying to register on an already registered column \"$columnName\", ";
+            $message .= "do you have conflicting traits?";
+            throw new ActiveRecordException($message, 0);
+        }
+
+        if (is_string($fn) && is_callable([$this, $fn])) {
+            $this->registeredReadHooks[$columnName] = [$this, $fn];
+        } else if (is_callable($fn)) {
+            $this->registeredReadHooks[$columnName] = $fn;
+        } else {
+            throw new ActiveRecordException("Provided hook on column \"$columnName\" is not callable", 0);
+        }
+    }
+
+    /**
+     * Register a new hook for a specific column that gets called before execution of the update() method
+     * Only one hook per column can be registered at a time
+     * @param string $columnName The name of the column that is registered.
+     * @param string|callable $fn Either a callable, or the name of a method on the inheriting object.
+     */
+    public function registerUpdateHook($columnName, $fn)
+    {
+        // Check whether column exists
+        if (!array_key_exists($columnName, $this->tableDefinition)) 
+        {
+            throw new ActiveRecordException("Hook is trying to register on non-existing column \"$columnName\"", 0);
+        }
+
+        // Enforcing 1 hook per table column
+        if (array_key_exists($columnName, $this->registeredUpdateHooks)) {
+            $message = "Hook is trying to register on an already registered column \"$columnName\", ";
+            $message .= "do you have conflicting traits?";
+            throw new ActiveRecordException($message, 0);
+        }
+
+        if (is_string($fn) && is_callable([$this, $fn])) {
+            $this->registeredUpdateHooks[$columnName] = [$this, $fn];
+        } else if (is_callable($fn)) {
+            $this->registeredUpdateHooks[$columnName] = $fn;
+        } else {
+            throw new ActiveRecordException("Provided hook on column \"$columnName\" is not callable", 0);
+        }
+    }
+
+    /**
+     * Register a new hook for a specific column that gets called before execution of the delete() method
+     * Only one hook per column can be registered at a time
+     * @param string $columnName The name of the column that is registered.
+     * @param string|callable $fn Either a callable, or the name of a method on the inheriting object.
+     */
+    public function registerDeleteHook($columnName, $fn)
+    {
+        // Check whether column exists
+        if (!array_key_exists($columnName, $this->tableDefinition)) 
+        {
+            throw new ActiveRecordException("Hook is trying to register on non-existing column \"$columnName\"", 0);
+        }
+
+        // Enforcing 1 hook per table column
+        if (array_key_exists($columnName, $this->registeredDeleteHooks)) {
+            $message = "Hook is trying to register on an already registered column \"$columnName\", ";
+            $message .= "do you have conflicting traits?";
+            throw new ActiveRecordException($message, 0);
+        }
+
+        if (is_string($fn) && is_callable([$this, $fn])) {
+            $this->registeredDeleteHooks[$columnName] = [$this, $fn];
+        } else if (is_callable($fn)) {
+            $this->registeredDeleteHooks[$columnName] = $fn;
+        } else {
+            throw new ActiveRecordException("Provided hook on column \"$columnName\" is not callable", 0);
+        }
+    }
+
+    /**
+     * Register a new hook for a specific column that gets called before execution of the search() method
+     * Only one hook per column can be registered at a time
+     * @param string $columnName The name of the column that is registered.
+     * @param string|callable $fn Either a callable, or the name of a method on the inheriting object. The callable is required to take one argument: an instance of miBadger\Query\Query; 
+     */
+    public function registerSearchHook($columnName, $fn)
+    {
+        // Check whether column exists
+        if (!array_key_exists($columnName, $this->tableDefinition)) 
+        {
+            throw new ActiveRecordException("Hook is trying to register on non-existing column \"$columnName\"", 0);
+        }
+
+        // Enforcing 1 hook per table column
+        if (array_key_exists($columnName, $this->registeredSearchHooks)) {
+            $message = "Hook is trying to register on an already registered column \"$columnName\", ";
+            $message .= "do you have conflicting traits?";
+            throw new ActiveRecordException($message, 0);
+        }
+
+        if (is_string($fn) && is_callable([$this, $fn])) {
+            $this->registeredSearchHooks[$columnName] = [$this, $fn];
+        } else if (is_callable($fn)) {
+            $this->registeredSearchHooks[$columnName] = $fn;
+        } else {
+            throw new ActiveRecordException("Provided hook on column \"$columnName\" is not callable", 0);
+        }
+    }
+
+    /**
+     * Adds a new column definition to the table.
+     * @param string $columnName The name of the column that is registered.
+     * @param Array $definition The definition of that column.
+     */
+    public function extendTableDefinition($columnName, $definition)
+    {
+        // Enforcing table can only be extended with new columns
+        if (array_key_exists($columnName, $this->tableDefinition)) {
+            $message = "Table is being extended with a column that already exists, ";
+            $message .= "\"$columnName\" conflicts with your table definition";
+            throw new ActiveRecordException($message, 0);
+        }
+
+        $this->tableDefinition[$columnName] = $definition;
+    }
+
+    private function getDatabaseTypeString($colName, $type, $length)
+    {
+        if ($type === null) 
+        {
+            throw new ActiveRecordException(sprintf("Column %s has invalid type \"NULL\"", $colName));
+        }
+
+        switch (strtoupper($type)) {
+            case 'DATETIME':
+            case 'DATE':
+            case 'TIME':
+            case 'TEXT':
+            case 'INT UNSIGNED':
+                return $type;
+
+            case 'VARCHAR':
+                return sprintf('%s(%d)', $type, $length);
+
+            case 'INT':
+            case 'TINYINT':
+            case 'BIGINT':
+            default: 	
+            // @TODO(Default): throw exception, or implicitly assume that type is correct? (For when using SQL databases with different types)
+                if ($length === null) {
+                    return $type;
+                } else {
+                    return sprintf('%s(%d)', $type, $length);	
+                }
+        }
+    }
+
+    private function buildCreateTableColumnEntry($colName, $type, $length, $properties, $default)
+    {
+
+        $stmnt = sprintf('`%s` %s ', $colName, $this->getDatabaseTypeString($colName, $type, $length));
+        if ($properties & ColumnProperty::NOT_NULL) {
+            $stmnt .= 'NOT NULL ';
+        } else {
+            $stmnt .= 'NULL ';
+        }
+
+        if ($default !== NULL) {
+            $stmnt .= ' DEFAULT ' . $default . ' ';
+        }
+
+        if ($properties & ColumnProperty::AUTO_INCREMENT) {
+            $stmnt .= 'AUTO_INCREMENT ';
+        }
+
+        if ($properties & ColumnProperty::UNIQUE) {
+            $stmnt .= 'UNIQUE ';
+        }
+
+        if ($properties & ColumnProperty::PRIMARY_KEY) {
+            $stmnt .= 'PRIMARY KEY ';
+        }
+
+        return $stmnt;
+    }
+
+
+    private function sortColumnStatements($colStatements)
+    {
+        // Find ID statement and put it first
+        $sortedStatements = [];
+
+        $sortedStatements[] = $colStatements[self::COLUMN_NAME_ID];
+        unset($colStatements[self::COLUMN_NAME_ID]);
+
+        // Sort remaining columns in alphabetical order
+        $columns = array_keys($colStatements);
+        sort($columns);
+        foreach ($columns as $colName) {
+            $sortedStatements[] = $colStatements[$colName];
+        }
+
+        return $sortedStatements;
+    }
+
+
+    public function buildCreateTableSQL()
+    {
+        $columnStatements = [];
+        foreach ($this->tableDefinition as $colName => $definition) {
+            // Destructure column definition
+            $type    = $definition['type'] ?? null;
+            $default = $definition['default'] ?? null;
+            $length  = $definition['length'] ?? null;
+            $properties = $definition['properties'] ?? null;
+
+            if (isset($definition['relation']) && $type !== null) {
+                $msg = "Column \"$colName\": ";
+                $msg .= "Relationship columns have an automatically inferred type, so type should be omitted";
+                throw new ActiveRecordException($msg);
+            } else if (isset($definition['relation'])) {
+                $type = self::COLUMN_TYPE_ID;
+            }
+
+            $columnStatements[$colName] = $this->buildCreateTableColumnEntry($colName, $type, $length, $properties, $default);
+        }
+
+        // Sort table (first column is id, the remaining are alphabetically sorted)
+        $columnStatements = $this->sortColumnStatements($columnStatements);
+
+        $sql = 'CREATE TABLE ' . $this->getActiveRecordTable() . ' ';
+        $sql .= "(\n";
+        $sql .= join($columnStatements, ",\n");
+        $sql .= "\n);";
+
+        return $sql;
+    }
+
+    public function createTable()
+    {
+        $this->pdo->query($this->buildCreateTableSQL());
+    }
+
+    protected function buildConstraint($parentTable, $parentColumn, $childTable, $childColumn)
+    {
+        $template = <<<SQL
 ALTER TABLE `%s`
 ADD CONSTRAINT
 FOREIGN KEY (`%s`)
 REFERENCES `%s`(`%s`)
 ON DELETE CASCADE;
 SQL;
-		return sprintf($template, $childTable, $childColumn, $parentTable, $parentColumn);
-	}
-
-	public function createTableConstraints()
-	{
-		// Iterate over columns, check whether "relation" field exists, if so create constraint
-		foreach ($this->tableDefinition as $colName => $definition) {
-			if ($definition['relation'] ?? null instanceof AbstractActiveRecord) {
-				// Forge new relation
-				$target = $definition['relation'];
-				$constraintSql = $this->buildConstraint($target->getActiveRecordTable(), 'id', $this->getActiveRecordTable(), $colName);
-
-				$this->pdo->query($constraintSql);
-			}
-		}
-	}
-
-	private function getActiveRecordColumns()
-	{
-		$bindings = [];
-		foreach ($this->tableDefinition as $colName => $definition) {
-
-			// Ignore the id column (key) when inserting or updating
-			if ($colName == self::COLUMN_NAME_ID) {
-				continue;
-			}
-
-			$bindings[$colName] = &$definition['value'];
-		}
-		return $bindings;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function create()
-	{
-		foreach ($this->registeredCreateHooks as $colName => $fn) {
-			// @TODO: Would it be better to pass the Query to the function?
-			$fn();
-		}
-
-		try {
-			$q = (new Query($this->getPdo(), $this->getActiveRecordTable()))
-				->insert($this->getActiveRecordColumns())
-				->execute();
-
-			$this->setId(intval($this->getPdo()->lastInsertId()));
-		} catch (\PDOException $e) {
-			throw new ActiveRecordException($e->getMessage(), 0, $e);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function read($id)
-	{
-		foreach ($this->registeredReadHooks as $colName => $fn) {
-			// @TODO: Would it be better to pass the Query to the function?
-			$fn();
-		}
-
-		try {
-			$row = (new Query($this->getPdo(), $this->getActiveRecordTable()))
-				->select()
-				->where('id', '=', $id)
-				->execute()
-				->fetch();
-
-			if ($row === false) {
-				throw new ActiveRecordException(sprintf('Can not read the non-existent active record entry %d from the `%s` table.', $id, $this->getActiveRecordTable()));
-			}
-
-			$this->fill($row)->setId($id);
-		} catch (\PDOException $e) {
-			throw new ActiveRecordException($e->getMessage(), 0, $e);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function update()
-	{
-		foreach ($this->registeredUpdateHooks as $colName => $fn) {
-			// @TODO: Would it be better to pass the Query to the function?
-			$fn();
-		}
-
-		try {
-			(new Query($this->getPdo(), $this->getActiveRecordTable()))
-				->update($this->getActiveRecordColumns())
-				->where('id', '=', $this->getId())
-				->execute();
-		} catch (\PDOException $e) {
-			throw new ActiveRecordException($e->getMessage(), 0, $e);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function delete()
-	{
-		foreach ($this->registeredDeleteHooks as $colName => $fn) {
-			// @TODO: Would it be better to pass the Query to the function?
-			$fn();
-		}
-
-		try {
-			(new Query($this->getPdo(), $this->getActiveRecordTable()))
-				->delete()
-				->where('id', '=', $this->getId())
-				->execute();
-
-			$this->setId(null);
-		} catch (\PDOException $e) {
-			throw new ActiveRecordException($e->getMessage(), 0, $e);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function sync()
-	{
-		if (!$this->exists()) {
-			return $this->create();
-		}
-
-		return $this->update();
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function exists()
-	{
-		return $this->getId() !== null;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function fill(array $attributes)
-	{
-		$columns = $this->getActiveRecordColumns();
-		$columns['id'] = &$this->id;
-
-		foreach ($attributes as $key => $value) {
-			if (array_key_exists($key, $columns)) {
-				$columns[$key] = $value;
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function searchOne(array $where = [], array $orderBy = [])
-	{
-		try {
-			$row = $this->getSearchQueryResult($where, $orderBy, 1)->fetch();
-
-			if ($row === false) {
-				throw new ActiveRecordException(sprintf('Can not search one non-existent entry from the `%s` table.', $this->getActiveRecordTable()));
-			}
-
-			return $this->fill($row)->setId($row['id']);
-		} catch (\PDOException $e) {
-			throw new ActiveRecordException($e->getMessage(), 0, $e);
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function search(array $where = [], array $orderBy = [], $limit = -1, $offset = 0)
-	{
-		try {
-			$queryResult = $this->getSearchQueryResult($where, $orderBy, $limit, $offset);
-			$result = [];
-
-			foreach ($queryResult as $row) {
-				$new = clone $this;
-
-				$result[] = $new->fill($row)->setId($row['id']);
-			}
-
-			return $result;
-		} catch (\PDOException $e) {
-			throw new ActiveRecordException($e->getMessage(), 0, $e);
-		}
-	}
-
-	/**
-	 * Returns the search query result with the given where, order by, limit and offset clauses.
-	 *
-	 * @param array $where = []
-	 * @param array $orderBy = []
-	 * @param int $limit = -1
-	 * @param int $offset = 0
-	 * @return \miBadger\Query\QueryResult the search query result with the given where, order by, limit and offset clauses.
-	 */
-	private function getSearchQueryResult(array $where = [], array $orderBy = [], $limit = -1, $offset = 0)
-	{
-		$query = (new Query($this->getPdo(), $this->getActiveRecordTable()))
-			->select();
-
-		$this->getSearchQueryWhere($query, $where);
-		$this->getSearchQueryOrderBy($query, $orderBy);
-		$this->getSearchQueryLimit($query, $limit, $offset);
-
-		// Ignore all trait modifiers for which a where clause was specified
-		$registeredSearchHooks = $this->registeredSearchHooks;
-		foreach ($where as $index => $clause) {
-			[$colName, , ] = $clause;
-			unset($registeredSearchHooks[$colName]);
-		}
-
-		// Allow traits to modify the query
-		foreach ($registeredSearchHooks as $column => $searchFunction) {
-			$searchFunction($query);
-		}
-
-		return $query->execute();
-	}
-
-	/**
-	 * Returns the given query after adding the given where conditions.
-	 *
-	 * @param \miBadger\Query\Query $query
-	 * @param array $where
-	 * @return \miBadger\Query\Query the given query after adding the given where conditions.
-	 */
-	private function getSearchQueryWhere($query, $where)
-	{
-		foreach ($where as $key => $value) {
-			$query->where($value[0], $value[1], $value[2]);
-		}
-
-		return $query;
-	}
-
-	/**
-	 * Returns the given query after adding the given order by conditions.
-	 *
-	 * @param \miBadger\Query\Query $query
-	 * @param array $orderBy
-	 * @return \miBadger\Query\Query the given query after adding the given order by conditions.
-	 */
-	private function getSearchQueryOrderBy($query, $orderBy)
-	{
-		foreach ($orderBy as $key => $value) {
-			$query->orderBy($key, $value);
-		}
-
-		return $query;
-	}
-
-	/**
-	 * Returns the given query after adding the given limit and offset conditions.
-	 *
-	 * @param \miBadger\Query\Query $query
-	 * @param int $limit
-	 * @param int $offset
-	 * @return \miBadger\Query\Query the given query after adding the given limit and offset conditions.
-	 */
-	private function getSearchQueryLimit($query, $limit, $offset)
-	{
-		if ($limit > -1) {
-			$query->limit($limit);
-			$query->offset($offset);
-		}
-
-		return $query;
-	}
-
-	/**
-	 * Returns the PDO.
-	 *
-	 * @return \PDO the PDO.
-	 */
-	public function getPdo()
-	{
-		return $this->pdo;
-	}
-
-	/**
-	 * Set the PDO.
-	 *
-	 * @param \PDO $pdo
-	 * @return $this
-	 */
-	protected function setPdo($pdo)
-	{
-		$this->pdo = $pdo;
-
-		return $this;
-	}
-
-	/**
-	 * Returns the ID.
-	 *
-	 * @return null|int The ID.
-	 */
-	public function getId()
-	{
-		return $this->id;
-	}
-
-	/**
-	 * Set the ID.
-	 *
-	 * @param int $id
-	 * @return $this
-	 */
-	protected function setId($id)
-	{
-		$this->id = $id;
-
-		return $this;
-	}
-
-	/**
-	 * Returns the active record table.
-	 *
-	 * @return string the active record table.
-	 */
-	abstract protected function getActiveRecordTable();
-
-	/**
-	 * Returns the active record columns.
-	 *
-	 * @return array the active record columns.
-	 */
-	abstract protected function getActiveRecordTableDefinition();
+        return sprintf($template, $childTable, $childColumn, $parentTable, $parentColumn);
+    }
+
+    public function createTableConstraints()
+    {
+        // Iterate over columns, check whether "relation" field exists, if so create constraint
+        foreach ($this->tableDefinition as $colName => $definition) {
+            if ($definition['relation'] ?? null instanceof AbstractActiveRecord) {
+                // Forge new relation
+                $target = $definition['relation'];
+                $constraintSql = $this->buildConstraint($target->getActiveRecordTable(), 'id', $this->getActiveRecordTable(), $colName);
+
+                $this->pdo->query($constraintSql);
+            }
+        }
+    }
+
+    private function getActiveRecordColumns()
+    {
+        $bindings = [];
+        foreach ($this->tableDefinition as $colName => $definition) {
+
+            // Ignore the id column (key) when inserting or updating
+            if ($colName == self::COLUMN_NAME_ID) {
+                continue;
+            }
+
+            $bindings[$colName] = &$definition['value'];
+        }
+        return $bindings;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create()
+    {
+        foreach ($this->registeredCreateHooks as $colName => $fn) {
+            // @TODO: Would it be better to pass the Query to the function?
+            $fn();
+        }
+
+        try {
+            $q = (new Query($this->getPdo(), $this->getActiveRecordTable()))
+                ->insert($this->getActiveRecordColumns())
+                ->execute();
+
+            $this->setId(intval($this->getPdo()->lastInsertId()));
+        } catch (\PDOException $e) {
+            throw new ActiveRecordException($e->getMessage(), 0, $e);
+        }
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function read($id)
+    {
+        foreach ($this->registeredReadHooks as $colName => $fn) {
+            // @TODO: Would it be better to pass the Query to the function?
+            $fn();
+        }
+
+        try {
+            $row = (new Query($this->getPdo(), $this->getActiveRecordTable()))
+                ->select()
+                ->where('id', '=', $id)
+                ->execute()
+                ->fetch();
+
+            if ($row === false) {
+                throw new ActiveRecordException(sprintf('Can not read the non-existent active record entry %d from the `%s` table.', $id, $this->getActiveRecordTable()));
+            }
+
+            $this->fill($row)->setId($id);
+        } catch (\PDOException $e) {
+            throw new ActiveRecordException($e->getMessage(), 0, $e);
+        }
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function update()
+    {
+        foreach ($this->registeredUpdateHooks as $colName => $fn) {
+            // @TODO: Would it be better to pass the Query to the function?
+            $fn();
+        }
+
+        try {
+            (new Query($this->getPdo(), $this->getActiveRecordTable()))
+                ->update($this->getActiveRecordColumns())
+                ->where('id', '=', $this->getId())
+                ->execute();
+        } catch (\PDOException $e) {
+            throw new ActiveRecordException($e->getMessage(), 0, $e);
+        }
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function delete()
+    {
+        foreach ($this->registeredDeleteHooks as $colName => $fn) {
+            // @TODO: Would it be better to pass the Query to the function?
+            $fn();
+        }
+
+        try {
+            (new Query($this->getPdo(), $this->getActiveRecordTable()))
+                ->delete()
+                ->where('id', '=', $this->getId())
+                ->execute();
+
+            $this->setId(null);
+        } catch (\PDOException $e) {
+            throw new ActiveRecordException($e->getMessage(), 0, $e);
+        }
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function sync()
+    {
+        if (!$this->exists()) {
+            return $this->create();
+        }
+
+        return $this->update();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function exists()
+    {
+        return $this->getId() !== null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function fill(array $attributes)
+    {
+        $columns = $this->getActiveRecordColumns();
+        $columns['id'] = &$this->id;
+
+        foreach ($attributes as $key => $value) {
+            if (array_key_exists($key, $columns)) {
+                $columns[$key] = $value;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function searchOne(array $where = [], array $orderBy = [])
+    {
+        try {
+            $row = $this->getSearchQueryResult($where, $orderBy, 1)->fetch();
+
+            if ($row === false) {
+                throw new ActiveRecordException(sprintf('Can not search one non-existent entry from the `%s` table.', $this->getActiveRecordTable()));
+            }
+
+            return $this->fill($row)->setId($row['id']);
+        } catch (\PDOException $e) {
+            throw new ActiveRecordException($e->getMessage(), 0, $e);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function search(array $where = [], array $orderBy = [], $limit = -1, $offset = 0)
+    {
+        try {
+            $queryResult = $this->getSearchQueryResult($where, $orderBy, $limit, $offset);
+            $result = [];
+
+            foreach ($queryResult as $row) {
+                $new = clone $this;
+
+                $result[] = $new->fill($row)->setId($row['id']);
+            }
+
+            return $result;
+        } catch (\PDOException $e) {
+            throw new ActiveRecordException($e->getMessage(), 0, $e);
+        }
+    }
+
+    /**
+     * Returns the search query result with the given where, order by, limit and offset clauses.
+     *
+     * @param array $where = []
+     * @param array $orderBy = []
+     * @param int $limit = -1
+     * @param int $offset = 0
+     * @return \miBadger\Query\QueryResult the search query result with the given where, order by, limit and offset clauses.
+     */
+    private function getSearchQueryResult(array $where = [], array $orderBy = [], $limit = -1, $offset = 0)
+    {
+        $query = (new Query($this->getPdo(), $this->getActiveRecordTable()))
+            ->select();
+
+        $this->getSearchQueryWhere($query, $where);
+        $this->getSearchQueryOrderBy($query, $orderBy);
+        $this->getSearchQueryLimit($query, $limit, $offset);
+
+        // Ignore all trait modifiers for which a where clause was specified
+        $registeredSearchHooks = $this->registeredSearchHooks;
+        foreach ($where as $index => $clause) {
+            [$colName, , ] = $clause;
+            unset($registeredSearchHooks[$colName]);
+        }
+
+        // Allow traits to modify the query
+        foreach ($registeredSearchHooks as $column => $searchFunction) {
+            $searchFunction($query);
+        }
+
+        return $query->execute();
+    }
+
+    /**
+     * Returns the given query after adding the given where conditions.
+     *
+     * @param \miBadger\Query\Query $query
+     * @param array $where
+     * @return \miBadger\Query\Query the given query after adding the given where conditions.
+     */
+    private function getSearchQueryWhere($query, $where)
+    {
+        foreach ($where as $key => $value) {
+            $query->where($value[0], $value[1], $value[2]);
+        }
+
+        return $query;
+    }
+
+    /**
+     * Returns the given query after adding the given order by conditions.
+     *
+     * @param \miBadger\Query\Query $query
+     * @param array $orderBy
+     * @return \miBadger\Query\Query the given query after adding the given order by conditions.
+     */
+    private function getSearchQueryOrderBy($query, $orderBy)
+    {
+        foreach ($orderBy as $key => $value) {
+            $query->orderBy($key, $value);
+        }
+
+        return $query;
+    }
+
+    /**
+     * Returns the given query after adding the given limit and offset conditions.
+     *
+     * @param \miBadger\Query\Query $query
+     * @param int $limit
+     * @param int $offset
+     * @return \miBadger\Query\Query the given query after adding the given limit and offset conditions.
+     */
+    private function getSearchQueryLimit($query, $limit, $offset)
+    {
+        if ($limit > -1) {
+            $query->limit($limit);
+            $query->offset($offset);
+        }
+
+        return $query;
+    }
+
+    /**
+     * Returns the PDO.
+     *
+     * @return \PDO the PDO.
+     */
+    public function getPdo()
+    {
+        return $this->pdo;
+    }
+
+    /**
+     * Set the PDO.
+     *
+     * @param \PDO $pdo
+     * @return $this
+     */
+    protected function setPdo($pdo)
+    {
+        $this->pdo = $pdo;
+
+        return $this;
+    }
+
+    /**
+     * Returns the ID.
+     *
+     * @return null|int The ID.
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Set the ID.
+     *
+     * @param int $id
+     * @return $this
+     */
+    protected function setId($id)
+    {
+        $this->id = $id;
+
+        return $this;
+    }
+
+    /**
+     * Returns the active record table.
+     *
+     * @return string the active record table.
+     */
+    abstract protected function getActiveRecordTable();
+
+    /**
+     * Returns the active record columns.
+     *
+     * @return array the active record columns.
+     */
+    abstract protected function getActiveRecordTableDefinition();
 }

Spacing +3 added lines, -3 removed lines

@@ -288,7 +288,7 @@ 
 		}
 
 		if ($default !== NULL) {
-			$stmnt .= ' DEFAULT ' . $default . ' ';
+			$stmnt .= ' DEFAULT '.$default.' ';
 		}
 
 		if ($properties & ColumnProperty::AUTO_INCREMENT) {
@@ -350,7 +350,7 @@ 
 		// Sort table (first column is id, the remaining are alphabetically sorted)
 		$columnStatements = $this->sortColumnStatements($columnStatements);
 
-		$sql = 'CREATE TABLE ' . $this->getActiveRecordTable() . ' ';
+		$sql = 'CREATE TABLE '.$this->getActiveRecordTable().' ';
 		$sql .= "(\n";
 		$sql .= join($columnStatements, ",\n");
 		$sql .= "\n);";
@@ -599,7 +599,7 @@ 
 		// Ignore all trait modifiers for which a where clause was specified
 		$registeredSearchHooks = $this->registeredSearchHooks;
 		foreach ($where as $index => $clause) {
-			[$colName, , ] = $clause;
+			[$colName,,] = $clause;
 			unset($registeredSearchHooks[$colName]);
 		}
 

src/Traits/Address.php

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
 
 namespace miBadger\ActiveRecord\Traits;
 
-use miBadger\ActiveRecord\ColumnProperty;
-
 const TRAIT_ADDRESS_FIELD_ADDRESS = "address_address";
 const TRAIT_ADDRESS_FIELD_ZIPCODE = "address_zipcode";
 const TRAIT_ADDRESS_FIELD_CITY = "address_city";

Indentation +83 added lines, -83 removed lines

@@ -11,91 +11,91 @@
 
 trait Address
 {
-	protected $address;
-
-	protected $zipcode;
-
-	protected $city;
-
-	protected $country;
-
-	protected function initAddress() 
-	{
-		$this->extendTableDefinition(TRAIT_ADDRESS_FIELD_ADDRESS, [
-			'value' => &$this->address,
-			'validate' => null,
-			'type' => 'VARCHAR',
-			'length' => 1024,
-			'properties' => null
-		]);
-
-		$this->extendTableDefinition(TRAIT_ADDRESS_FIELD_ZIPCODE, [
-			'value' => &$this->zipcode,
-			'validate' => null,
-			'type' => 'VARCHAR',
-			'length' => 1024,
-			'properties' => null
-		]);
-
-		$this->extendTableDefinition(TRAIT_ADDRESS_FIELD_CITY, [
-			'value' => &$this->city,
-			'validate' => null,
-			'type' => 'VARCHAR',
-			'length' => 1024,
-			'properties' => null
-		]);
-
-		$this->extendTableDefinition(TRAIT_ADDRESS_FIELD_COUNTRY, [
-			'value' => &$this->country,
-			'validate' => null,
-			'type' => 'VARCHAR',
-			'length' => 1024,
-			'properties' => null
-		]);
-
-		$this->address = null;
-		$this->zipcode = null;
-		$this->city = null;
-		$this->country = null;
-	}
-
-	public function getAddress()
-	{
-		return $this->address;
-	}
+    protected $address;
+
+    protected $zipcode;
+
+    protected $city;
+
+    protected $country;
+
+    protected function initAddress() 
+    {
+        $this->extendTableDefinition(TRAIT_ADDRESS_FIELD_ADDRESS, [
+            'value' => &$this->address,
+            'validate' => null,
+            'type' => 'VARCHAR',
+            'length' => 1024,
+            'properties' => null
+        ]);
+
+        $this->extendTableDefinition(TRAIT_ADDRESS_FIELD_ZIPCODE, [
+            'value' => &$this->zipcode,
+            'validate' => null,
+            'type' => 'VARCHAR',
+            'length' => 1024,
+            'properties' => null
+        ]);
+
+        $this->extendTableDefinition(TRAIT_ADDRESS_FIELD_CITY, [
+            'value' => &$this->city,
+            'validate' => null,
+            'type' => 'VARCHAR',
+            'length' => 1024,
+            'properties' => null
+        ]);
+
+        $this->extendTableDefinition(TRAIT_ADDRESS_FIELD_COUNTRY, [
+            'value' => &$this->country,
+            'validate' => null,
+            'type' => 'VARCHAR',
+            'length' => 1024,
+            'properties' => null
+        ]);
+
+        $this->address = null;
+        $this->zipcode = null;
+        $this->city = null;
+        $this->country = null;
+    }
+
+    public function getAddress()
+    {
+        return $this->address;
+    }
 	
-	public function setAddress($address)
-	{
-		$this->address = $address;
-	}
-
-	public function getZipcode()
-	{
-		return $this->zipcode;
-	}
+    public function setAddress($address)
+    {
+        $this->address = $address;
+    }
+
+    public function getZipcode()
+    {
+        return $this->zipcode;
+    }
 	
-	public function setZipcode($zipcode)
-	{
-		$this->zipcode = $zipcode;
-	}
-
-	public function getCity()
-	{
-		return $this->city;
-	}
+    public function setZipcode($zipcode)
+    {
+        $this->zipcode = $zipcode;
+    }
+
+    public function getCity()
+    {
+        return $this->city;
+    }
 	
-	public function setCity($city)
-	{
-		$this->city = $city;
-	}
-
-	public function getCountry()
-	{
-		return $this->country;
-	}
+    public function setCity($city)
+    {
+        $this->city = $city;
+    }
+
+    public function getCountry()
+    {
+        return $this->country;
+    }
 	
-	public function setCountry($country)
-	{
-		$this->country = $country;
-	}
+    public function setCountry($country)
+    {
+        $this->country = $country;
+    }
 }
\ No newline at end of file

src/Traits/Datefields.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace miBadger\ActiveRecord\Traits;
 
-use miBadger\Query\Query;
 use miBadger\ActiveRecord\ColumnProperty;
 
 const TRAIT_DATEFIELDS_LAST_MODIFIED = "last_modified";

Indentation +45 added lines, -45 removed lines

@@ -10,59 +10,59 @@
 
 trait Datefields
 {
-	/** @var string The timestamp representing the moment this record was created */
-	protected $created;
+    /** @var string The timestamp representing the moment this record was created */
+    protected $created;
 
-	/** @var string The timestamp representing the moment this record was last updated */
-	protected $lastModified;
+    /** @var string The timestamp representing the moment this record was last updated */
+    protected $lastModified;
 
-	protected function initDatefields()
-	{
-		$this->extendTableDefinition(TRAIT_DATEFIELDS_CREATED, [
-			'value' => &$this->created,
-			'validate' => null,
-			'type' => 'DATETIME',
-			'default' => 'CURRENT_TIMESTAMP',
-			'properties' => ColumnProperty::NOT_NULL | ColumnProperty::IMMUTABLE
-		]);
+    protected function initDatefields()
+    {
+        $this->extendTableDefinition(TRAIT_DATEFIELDS_CREATED, [
+            'value' => &$this->created,
+            'validate' => null,
+            'type' => 'DATETIME',
+            'default' => 'CURRENT_TIMESTAMP',
+            'properties' => ColumnProperty::NOT_NULL | ColumnProperty::IMMUTABLE
+        ]);
 
-		$this->extendTableDefinition(TRAIT_DATEFIELDS_LAST_MODIFIED, [
-			'value' => &$this->lastModified,
-			'validate' => null,
-			'type' => 'DATETIME',
-			'default' => 'CURRENT_TIMESTAMP',
-			// 'on_update' => 'CURRENT_TIMESTAMP',		// @TODO(Discuss): Should we support this? (would not sync with object)
-			'properties' => ColumnProperty::NOT_NULL | ColumnProperty::IMMUTABLE
-		]);
+        $this->extendTableDefinition(TRAIT_DATEFIELDS_LAST_MODIFIED, [
+            'value' => &$this->lastModified,
+            'validate' => null,
+            'type' => 'DATETIME',
+            'default' => 'CURRENT_TIMESTAMP',
+            // 'on_update' => 'CURRENT_TIMESTAMP',		// @TODO(Discuss): Should we support this? (would not sync with object)
+            'properties' => ColumnProperty::NOT_NULL | ColumnProperty::IMMUTABLE
+        ]);
 		
-		$this->registerUpdateHook(TRAIT_DATEFIELDS_LAST_MODIFIED, 'DatefieldsUpdateHook');
-		$this->registerCreateHook(TRAIT_DATEFIELDS_LAST_MODIFIED, 'DatefieldsCreateHook');
+        $this->registerUpdateHook(TRAIT_DATEFIELDS_LAST_MODIFIED, 'DatefieldsUpdateHook');
+        $this->registerCreateHook(TRAIT_DATEFIELDS_LAST_MODIFIED, 'DatefieldsCreateHook');
 
-		$this->created = null;
-		$this->lastModified = null;
-	}
+        $this->created = null;
+        $this->lastModified = null;
+    }
 
-	protected function DatefieldsCreateHook()
-	{
-		// Should this be split up to seperate hooks for "last_modified" and "created" for consistency?
-		$this->created = (new \DateTime('now'))->format('Y-m-d H:i:s');
-		$this->lastModified = (new \DateTime('now'))->format('Y-m-d H:i:s');
-	}
+    protected function DatefieldsCreateHook()
+    {
+        // Should this be split up to seperate hooks for "last_modified" and "created" for consistency?
+        $this->created = (new \DateTime('now'))->format('Y-m-d H:i:s');
+        $this->lastModified = (new \DateTime('now'))->format('Y-m-d H:i:s');
+    }
 
-	protected function DatefieldsUpdateHook()
-	{
-		$this->lastModified = (new \DateTime('now'))->format('Y-m-d H:i:s');
-	}
+    protected function DatefieldsUpdateHook()
+    {
+        $this->lastModified = (new \DateTime('now'))->format('Y-m-d H:i:s');
+    }
 
-	public function getLastModifiedDate()
-	{
-		return new \DateTime($this->lastModified);
-	}
+    public function getLastModifiedDate()
+    {
+        return new \DateTime($this->lastModified);
+    }
 
-	public function getCreationDate()
-	{
-		return new \DateTime($this->created);
-	}
+    public function getCreationDate()
+    {
+        return new \DateTime($this->created);
+    }
 }
 
-	
\ No newline at end of file
+    
\ No newline at end of file

src/Traits/ManyToManyRelation.php

Unused Use Statements +1 added lines, -2 removed lines

@@ -2,9 +2,8 @@
 
 namespace miBadger\ActiveRecord\Traits;
 
-use miBadger\Query\Query;
-use miBadger\ActiveRecord\ColumnProperty;
 use miBadger\ActiveRecord\AbstractActiveRecord;
+use miBadger\ActiveRecord\ColumnProperty;
 
 Trait ManyToManyRelation
 {

Indentation +50 added lines, -50 removed lines

@@ -8,65 +8,65 @@
 
 Trait ManyToManyRelation
 {
-	// These variables are relevant for internal bookkeeping (constraint generation etc)
-	private $_leftColumnName;
+    // These variables are relevant for internal bookkeeping (constraint generation etc)
+    private $_leftColumnName;
 
-	private $_rightColumnName;
+    private $_rightColumnName;
 
-	private $_leftEntityTable;
+    private $_leftEntityTable;
 
-	private $_rightEntityTable;
+    private $_rightEntityTable;
 
-	/**
-	 * Initializes the the ManyToManyRelation trait on the included object
-	 * 
-	 * @param AbstractActiveRecord $leftEntity The left entity of the relation
-	 * @param &variable $leftVariable The variable where the id for the left entity will be stored
-	 * @param AbstractActiveRecord $rightEntity The left entity of the relation
-	 * @param &variable $leftVariable The variable where the id for the right entity will be stored
-	 */
-	protected function initManyToManyRelation(AbstractActiveRecord $leftEntity, &$leftVariable, AbstractActiveRecord $rightEntity, &$rightVariable)
-	{
-		$this->_leftEntityTable = $leftEntity->getActiveRecordTable();
-		$this->_rightEntityTable = $rightEntity->getActiveRecordTable();
+    /**
+     * Initializes the the ManyToManyRelation trait on the included object
+     * 
+     * @param AbstractActiveRecord $leftEntity The left entity of the relation
+     * @param &variable $leftVariable The variable where the id for the left entity will be stored
+     * @param AbstractActiveRecord $rightEntity The left entity of the relation
+     * @param &variable $leftVariable The variable where the id for the right entity will be stored
+     */
+    protected function initManyToManyRelation(AbstractActiveRecord $leftEntity, &$leftVariable, AbstractActiveRecord $rightEntity, &$rightVariable)
+    {
+        $this->_leftEntityTable = $leftEntity->getActiveRecordTable();
+        $this->_rightEntityTable = $rightEntity->getActiveRecordTable();
 
-		if (get_class($leftEntity) === get_class($rightEntity)) {
-			$this->_leftColumnName = sprintf("id_%s_left", $leftEntity->getActiveRecordTable());
-			$this->_rightColumnName = sprintf("id_%s_right", $rightEntity->getActiveRecordTable());
-		} else {
-			$this->_leftColumnName = sprintf("id_%s", $leftEntity->getActiveRecordTable());
-			$this->_rightColumnName = sprintf("id_%s", $rightEntity->getActiveRecordTable());
-		}
+        if (get_class($leftEntity) === get_class($rightEntity)) {
+            $this->_leftColumnName = sprintf("id_%s_left", $leftEntity->getActiveRecordTable());
+            $this->_rightColumnName = sprintf("id_%s_right", $rightEntity->getActiveRecordTable());
+        } else {
+            $this->_leftColumnName = sprintf("id_%s", $leftEntity->getActiveRecordTable());
+            $this->_rightColumnName = sprintf("id_%s", $rightEntity->getActiveRecordTable());
+        }
 
-		$this->extendTableDefinition($this->_leftColumnName, [
-			'value' => &$leftVariable,
-			'validate' => null,
-			'type' => AbstractActiveRecord::COLUMN_TYPE_ID,
-			'properties' => ColumnProperty::NOT_NULL
-		]);
+        $this->extendTableDefinition($this->_leftColumnName, [
+            'value' => &$leftVariable,
+            'validate' => null,
+            'type' => AbstractActiveRecord::COLUMN_TYPE_ID,
+            'properties' => ColumnProperty::NOT_NULL
+        ]);
 
-		$this->extendTableDefinition($this->_rightColumnName, [
-			'value' => &$rightVariable,
-			'validate' => null,
-			'type' => AbstractActiveRecord::COLUMN_TYPE_ID,
-			'properties' => ColumnProperty::NOT_NULL
-		]);
-	}
+        $this->extendTableDefinition($this->_rightColumnName, [
+            'value' => &$rightVariable,
+            'validate' => null,
+            'type' => AbstractActiveRecord::COLUMN_TYPE_ID,
+            'properties' => ColumnProperty::NOT_NULL
+        ]);
+    }
 
-	/**
-	 * Build the constraints for the many-to-many relation table
-	 */
-	public function createTableConstraints()
-	{
-		$childTable = $this->getActiveRecordTable();
+    /**
+     * Build the constraints for the many-to-many relation table
+     */
+    public function createTableConstraints()
+    {
+        $childTable = $this->getActiveRecordTable();
 
-		$leftParentTable = $this->_leftEntityTable;
-		$rightParentTable = $this->_rightEntityTable;
+        $leftParentTable = $this->_leftEntityTable;
+        $rightParentTable = $this->_rightEntityTable;
 
-		$leftConstraint = $this->buildConstraint($leftParentTable, 'id', $childTable, $this->_leftColumnName);
-		$rightConstraint = $this->buildConstraint($rightParentTable, 'id', $childTable, $this->_rightColumnName);
+        $leftConstraint = $this->buildConstraint($leftParentTable, 'id', $childTable, $this->_leftColumnName);
+        $rightConstraint = $this->buildConstraint($rightParentTable, 'id', $childTable, $this->_rightColumnName);
 
-		$this->pdo->query($leftConstraint);
-		$this->pdo->query($rightConstraint);
-	}
+        $this->pdo->query($leftConstraint);
+        $this->pdo->query($rightConstraint);
+    }
 }

src/Traits/SoftDelete.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,8 +2,8 @@
 
 namespace miBadger\ActiveRecord\Traits;
 
-use miBadger\Query\Query;
 use miBadger\ActiveRecord\ColumnProperty;
+use miBadger\Query\Query;
 
 const TRAIT_SOFT_DELETE_FIELD_KEY = "soft_delete";
 

Indentation +43 added lines, -43 removed lines

@@ -9,48 +9,48 @@
 
 trait SoftDelete
 {
-	protected $softDelete;
-
-	protected function initSoftDelete()
-	{
-		$this->softDelete = false;
-
-		$this->extendTableDefinition(TRAIT_SOFT_DELETE_FIELD_KEY, [
-			'value' => &$this->softDelete,
-			'validate' => null,
-			'default' => 0,
-			'type' => 'INT',
-			'length' => 1,
-			'properties' => ColumnProperty::NOT_NULL
-		]);
-
-		$this->registerSearchHook(TRAIT_SOFT_DELETE_FIELD_KEY, 'softDeleteSearchHook');
-	}
-
-	protected function softDeleteSearchHook(Query $query)
-	{
-		$query->where(TRAIT_SOFT_DELETE_FIELD_KEY, '=', 0);
-	}
-
-	public function getSoftDeleteFieldName()
-	{
-		return TRAIT_SOFT_DELETE_FIELD_KEY;
-	}
+    protected $softDelete;
+
+    protected function initSoftDelete()
+    {
+        $this->softDelete = false;
+
+        $this->extendTableDefinition(TRAIT_SOFT_DELETE_FIELD_KEY, [
+            'value' => &$this->softDelete,
+            'validate' => null,
+            'default' => 0,
+            'type' => 'INT',
+            'length' => 1,
+            'properties' => ColumnProperty::NOT_NULL
+        ]);
+
+        $this->registerSearchHook(TRAIT_SOFT_DELETE_FIELD_KEY, 'softDeleteSearchHook');
+    }
+
+    protected function softDeleteSearchHook(Query $query)
+    {
+        $query->where(TRAIT_SOFT_DELETE_FIELD_KEY, '=', 0);
+    }
+
+    public function getSoftDeleteFieldName()
+    {
+        return TRAIT_SOFT_DELETE_FIELD_KEY;
+    }
 	
-	public function softDelete()
-	{
-		$this->softDelete = true;
-		return $this;
-	}
-
-	public function softRestore()
-	{
-		$this->softDelete = false;
-		return $this;
-	}
-
-	public function getDeletionStatus() 
-	{
-		return $this->softDelete;
-	}
+    public function softDelete()
+    {
+        $this->softDelete = true;
+        return $this;
+    }
+
+    public function softRestore()
+    {
+        $this->softDelete = false;
+        return $this;
+    }
+
+    public function getDeletionStatus() 
+    {
+        return $this->softDelete;
+    }
 }
\ No newline at end of file

src/Traits/Password.php

Indentation +100 added lines, -100 removed lines

@@ -12,104 +12,104 @@
 
 trait Password
 {
-	/** @var string The password hash. */
-	protected $password;
-
-	/** @var string|null The password reset token. */
-	protected $passwordResetToken;
-
-	protected function initPassword()
-	{
-		$this->extendTableDefinition(TRAIT_PASSWORD_FIELD_PASSWORD, [
-			'value' => &$this->password,
-			'validate' => null,
-			'type' => 'VARCHAR',
-			'length' => 1024,
-			'properties' => ColumnProperty::NOT_NULL
-		]);
-
-		$this->extendTableDefinition(TRAIT_PASSWORD_FIELD_PASSWORD_RESET_TOKEN, [
-			'value' => &$this->passwordResetToken,
-			'validate' => null,
-			'default' => 0,
-			'type' => 'VARCHAR',
-			'length' => 1024
-		]);
-	}
-
-	/**
-	 * Returns true if the credentials are correct.
-	 *
-	 * @param string $password
-	 * @return boolean true if the credentials are correct
-	 */
-	public function isPassword($password)
-	{
-		if (!password_verify($password, $this->password)) {
-			return false;
-		}
-
-		if (password_needs_rehash($this->password, TRAIT_PASSWORD_ENCRYPTION, ['cost' => TRAIT_PASSWORD_STRENTH])) {
-			$this->setPassword($password)->sync();
-		}
-
-		return true;
-	}
-
-	/**
-	 * Set the password.
-	 *
-	 * @param string $password
-	 * @return $this
-	 * @throws \Exception
-	 */
-	public function setPassword($password)
-	{
-		if (strlen($password) < TRAIT_PASSWORD_MIN_LENGTH) {
-			throw new \Exception(sprintf('\'Password\' must be atleast %s characters long. %s characters provied.', self::PASSWORD_MIN_LENGTH, strlen($password)));
-		}
-
-		$passwordHash = \password_hash($password, TRAIT_PASSWORD_ENCRYPTION, ['cost' => TRAIT_PASSWORD_STRENTH]);
-
-		if ($passwordHash === false) {
-			throw new \Exception('\'Password\' hash failed.');
-		}
-
-		$this->password = $passwordHash;
-
-		return $this;
-	}
-
-	/**
-	 * @return string The Hash of the password
-	 */
-	public function getPasswordHash()
-	{
-		return $this->password;
-	}
-
-	/**
-	 * Returns the currently set password token for the entity, or null if not set
-	 * @return string|null The password reset token
-	 */
-	public function getPasswordResetToken()
-	{
-		return $this->passwordResetToken;
-	}
-
-	/**
-	 * Generates a new password reset token for the user
-	 */
-	public function generatePasswordResetToken()
-	{
-		$this->passwordResetToken = md5(uniqid(mt_rand(), true));
-	}
-
-	/**
-	 * Clears the current password reset token
-	 */
-	public function clearPasswordResetToken()
-	{
-		$this->passwordResetToken = null;
-	}
+    /** @var string The password hash. */
+    protected $password;
+
+    /** @var string|null The password reset token. */
+    protected $passwordResetToken;
+
+    protected function initPassword()
+    {
+        $this->extendTableDefinition(TRAIT_PASSWORD_FIELD_PASSWORD, [
+            'value' => &$this->password,
+            'validate' => null,
+            'type' => 'VARCHAR',
+            'length' => 1024,
+            'properties' => ColumnProperty::NOT_NULL
+        ]);
+
+        $this->extendTableDefinition(TRAIT_PASSWORD_FIELD_PASSWORD_RESET_TOKEN, [
+            'value' => &$this->passwordResetToken,
+            'validate' => null,
+            'default' => 0,
+            'type' => 'VARCHAR',
+            'length' => 1024
+        ]);
+    }
+
+    /**
+     * Returns true if the credentials are correct.
+     *
+     * @param string $password
+     * @return boolean true if the credentials are correct
+     */
+    public function isPassword($password)
+    {
+        if (!password_verify($password, $this->password)) {
+            return false;
+        }
+
+        if (password_needs_rehash($this->password, TRAIT_PASSWORD_ENCRYPTION, ['cost' => TRAIT_PASSWORD_STRENTH])) {
+            $this->setPassword($password)->sync();
+        }
+
+        return true;
+    }
+
+    /**
+     * Set the password.
+     *
+     * @param string $password
+     * @return $this
+     * @throws \Exception
+     */
+    public function setPassword($password)
+    {
+        if (strlen($password) < TRAIT_PASSWORD_MIN_LENGTH) {
+            throw new \Exception(sprintf('\'Password\' must be atleast %s characters long. %s characters provied.', self::PASSWORD_MIN_LENGTH, strlen($password)));
+        }
+
+        $passwordHash = \password_hash($password, TRAIT_PASSWORD_ENCRYPTION, ['cost' => TRAIT_PASSWORD_STRENTH]);
+
+        if ($passwordHash === false) {
+            throw new \Exception('\'Password\' hash failed.');
+        }
+
+        $this->password = $passwordHash;
+
+        return $this;
+    }
+
+    /**
+     * @return string The Hash of the password
+     */
+    public function getPasswordHash()
+    {
+        return $this->password;
+    }
+
+    /**
+     * Returns the currently set password token for the entity, or null if not set
+     * @return string|null The password reset token
+     */
+    public function getPasswordResetToken()
+    {
+        return $this->passwordResetToken;
+    }
+
+    /**
+     * Generates a new password reset token for the user
+     */
+    public function generatePasswordResetToken()
+    {
+        $this->passwordResetToken = md5(uniqid(mt_rand(), true));
+    }
+
+    /**
+     * Clears the current password reset token
+     */
+    public function clearPasswordResetToken()
+    {
+        $this->passwordResetToken = null;
+    }
 }
\ No newline at end of file

src/ColumnProperty.php

Indentation +6 added lines, -6 removed lines

@@ -5,10 +5,10 @@
 
 class ColumnProperty
 {
-	const NONE = 0;
-	const UNIQUE = 1;
-	const NOT_NULL = 2;
-	const IMMUTABLE = 4;
-	const AUTO_INCREMENT = 8;
-	const PRIMARY_KEY = 16;
+    const NONE = 0;
+    const UNIQUE = 1;
+    const NOT_NULL = 2;
+    const IMMUTABLE = 4;
+    const AUTO_INCREMENT = 8;
+    const PRIMARY_KEY = 16;
 }
\ No newline at end of file

test-bootstrap.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
 // Cleanup SQL
 $user_delete = "DROP USER IF EXISTS $dbuser@'localhost'; ";
 $database_delete = "DROP DATABASE IF EXISTS $dbname; ";
-$sql_cleanup = $user_delete . $database_delete;
+$sql_cleanup = $user_delete.$database_delete;
 
 // Setup SQL
 $db_create = "CREATE DATABASE $dbname; ";
@@ -17,5 +17,5 @@ 
 $user_alter = "ALTER USER 'phpunit'@'localhost' IDENTIFIED with mysql_native_password BY 'phpunit'; ";
 $user_grant = "GRANT ALL PRIVILEGES ON *.* TO '$dbuser'@'localhost';";
 
-$sql_setup = $sql_cleanup . $db_create . $user_create . $user_alter . $user_grant;
+$sql_setup = $sql_cleanup.$db_create.$user_create.$user_alter.$user_grant;
 exec("echo \"$sql_setup\" | mysql -u root -p");