miBadger / miBadger.ActiveRecord

src/ActiveRecordInterface.php

Indentation +66 added lines, -66 removed lines

@@ -19,79 +19,79 @@
 interface ActiveRecordInterface
 {
 
-	public function __construct(\PDO $pdo);
+    public function __construct(\PDO $pdo);
 	
-	/**
-	 * Returns the ID of the record.
-	 *
-	 * @return null|int The ID.
-	 */	
-	public function getId();
+    /**
+     * Returns the ID of the record.
+     *
+     * @return null|int The ID.
+     */	
+    public function getId();
 
-	/**
-	 * Returns this active record after creating an entry with the records attributes.
-	 *
-	 * @return $this
-	 * @throws ActiveRecordException on failure.
-	 */
-	public function create();
+    /**
+     * Returns this active record after creating an entry with the records attributes.
+     *
+     * @return $this
+     * @throws ActiveRecordException on failure.
+     */
+    public function create();
 
-	/**
-	 * Returns this active record after reading the attributes from the entry with the given identifier.
-	 *
-	 * @param mixed $id
-	 * @return $this
-	 * @throws ActiveRecordException on failure.
-	 */
-	public function read($id);
+    /**
+     * Returns this active record after reading the attributes from the entry with the given identifier.
+     *
+     * @param mixed $id
+     * @return $this
+     * @throws ActiveRecordException on failure.
+     */
+    public function read($id);
 
-	/**
-	 * Returns this active record after updating the attributes to the corresponding entry.
-	 *
-	 * @return $this
-	 * @throws ActiveRecordException on failure.
-	 */
-	public function update();
+    /**
+     * Returns this active record after updating the attributes to the corresponding entry.
+     *
+     * @return $this
+     * @throws ActiveRecordException on failure.
+     */
+    public function update();
 
-	/**
-	 * Returns this record after deleting the corresponding entry.
-	 *
-	 * @return $this
-	 * @throws ActiveRecordException on failure.
-	 */
-	public function delete();
+    /**
+     * Returns this record after deleting the corresponding entry.
+     *
+     * @return $this
+     * @throws ActiveRecordException on failure.
+     */
+    public function delete();
 
-	/**
-	 * Returns this record after synchronizing it with the corresponding entry.
-	 * A new entry is created if this active record does not have a corresponding entry.
-	 *
-	 * @return $this
-	 * @throws ActiveRecordException on failure.
-	 */
-	public function sync();
+    /**
+     * Returns this record after synchronizing it with the corresponding entry.
+     * A new entry is created if this active record does not have a corresponding entry.
+     *
+     * @return $this
+     * @throws ActiveRecordException on failure.
+     */
+    public function sync();
 
-	/**
-	 * Returns true if this active record has a corresponding entry.
-	 *
-	 * @return bool true if this active record has a corresponding entry.
-	 */
-	public function exists();
+    /**
+     * Returns true if this active record has a corresponding entry.
+     *
+     * @return bool true if this active record has a corresponding entry.
+     */
+    public function exists();
 
-	/**
-	 * Returns this record after filling it with the given attributes.
-	 *
-	 * @param array $attributes = []
-	 * @return $this
-	 * @throws ActiveRecordException on failure.
-	 */
-	public function fill(array $attributes);
+    /**
+     * Returns this record after filling it with the given attributes.
+     *
+     * @param array $attributes = []
+     * @return $this
+     * @throws ActiveRecordException on failure.
+     */
+    public function fill(array $attributes);
 
-	/**
-	 * Returns the records with the given where, order by, limit and offset clauses.
-	 *
-	 * @param array $excludedTraits
-	 * @return ActiveRecordQuery the query representing the current search.
-	 * @throws ActiveRecordException on failure.
-	 */
-	public function search(Array $excludedTraits);
+    /**
+     * Returns the records with the given where, order by, limit and offset clauses.
+     *
+     * @param array $excludedTraits
+     * @return ActiveRecordQuery the query representing the current search.
+     * @throws ActiveRecordException on failure.
+     */
+    public function search(Array $excludedTraits);
 }

src/AbstractActiveRecord.php

Indentation +620 added lines, -620 removed lines

@@ -18,626 +18,626 @@
  */
 abstract class AbstractActiveRecord implements ActiveRecordInterface
 {
-	const COLUMN_NAME_ID = 'id';
-	const COLUMN_TYPE_ID = 'INT UNSIGNED';
-
-	const CREATE = 'CREATE';
-	const READ = 'READ';
-	const UPDATE = 'UPDATE';
-	const DELETE = 'DELETE';
-	const SEARCH = 'SEARCH';
-
-	/** @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 */
-	protected $createHooks;
-
-	/** @var array A map of column name to functions that hook the read function */
-	protected $readHooks;
-
-	/** @var array A map of column name to functions that hook the update function */
-	protected $updateHooks;
-
-	/** @var array A map of column name to functions that hook the update function */
-	protected $deleteHooks;	
-
-	/** @var array A map of column name to functions that hook the search function */
-	protected $searchHooks;
-
-	/** @var array A list of table column definitions */
-	protected $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->createHooks = [];
-		$this->readHooks = [];
-		$this->updateHooks = [];
-		$this->deleteHooks = [];
-		$this->searchHooks = [];
-		$this->tableDefinition = $this->getTableDefinition();
-
-		// 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
-		];
-	}
-
-	private function checkHookConstraints($columnName, $hookMap)
-	{
-		// 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, $hookMap)) {
-			$message = "Hook is trying to register on an already registered column \"$columnName\", ";
-			$message .= "do you have conflicting traits?";
-			throw new ActiveRecordException($message, 0);
-		}
-	}
-
-	public function registerHookOnAction($actionName, $columnName, $fn)
-	{
-		if (is_string($fn) && is_callable([$this, $fn])) {
-			$fn = [$this, $fn];
-		}
-
-		if (!is_callable($fn)) { 
-			throw new ActiveRecordException("Provided hook on column \"$columnName\" is not callable", 0);
-		}
-
-		switch ($actionName) {
-			case self::CREATE:
-				$this->checkHookConstraints($columnName, $this->createHooks);
-				$this->createHooks[$columnName] = $fn;
-				break;
-			case self::READ:
-				$this->checkHookConstraints($columnName, $this->readHooks);
-				$this->readHooks[$columnName] = $fn;
-				break;
-			case self::UPDATE:
-				$this->checkHookConstraints($columnName, $this->updateHooks);
-				$this->updateHooks[$columnName] = $fn;
-				break;
-			case self::DELETE:
-				$this->checkHookConstraints($columnName, $this->deleteHooks);
-				$this->deleteHooks[$columnName] = $fn;
-				break;
-			case self::SEARCH:
-				$this->checkHookConstraints($columnName, $this->searchHooks);
-				$this->searchHooks[$columnName] = $fn;
-				break;
-			default:
-				throw new ActiveRecordException("Invalid action: Can not register hook on non-existing action");
-		}
-	}
-
-	/**
-	 * 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)
-	{
-		$this->registerHookOnAction(self::CREATE, $columnName, $fn);
-	}
-
-	/**
-	 * 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)
-	{
-		$this->registerHookOnAction(self::READ, $columnName, $fn);
-	}
-
-	/**
-	 * 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)
-	{
-		$this->registerHookOnAction(self::UPDATE, $columnName, $fn);
-	}
-
-	/**
-	 * 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)
-	{
-		$this->registerHookOnAction(self::DELETE, $columnName, $fn);
-	}
-
-	/**
-	 * 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)
-	{
-		$this->registerHookOnAction(self::SEARCH, $columnName, $fn);
-	}
-
-	/**
-	 * 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.
-	 */
-	protected function extendTableDefinition($columnName, $definition)
-	{
-		if ($this->tableDefinition === null) {
-			throw new ActiveRecordException("tableDefinition is null, has parent been initialized in constructor?");
-		}
-
-		// 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;
-	}
-
-	public function hasColumn(string $column) {
-		return array_key_exists($column, $this->tableDefinition);
-	}
-
-	public function hasRelation(string $column, ActiveRecordInterface $record) {
-		if (!$this->hasColumn($column)) {
-			throw new ActiveRecordException("Provided column \"$column\" does not exist in table definition", 0);
-		}
-
-		if (!isset($this->tableDefinition[$column]['relation'])) {
-			return false;
-		}
-
-		$relation = $this->tableDefinition[$column]['relation'];
-		if ($relation instanceof AbstractActiveRecord) {
-			// Injected object
-			return get_class($record) === get_class($relation);
-		} else {
-			// :: class definition
-			return get_class($record) === $relation;
-		}
-	}
-
-	public function hasProperty(string $column, $property) {
-		if (!$this->hasColumn($column)) {
-			throw new ActiveRecordException("Provided column \"$column\" does not exist in table definition", 0);
-		}
-
-		try {
-			$enumValue = ColumnProperty::valueOf($property);
-		} catch (\UnexpectedValueException $e) {
-			throw new ActiveRecordException("Provided property \"$property\" is not a valid property", 0, $e);
-		}
-
-		$properties = $this->tableDefinition[$column]['properties'] ?? null;
-
-		return $properties !== null && (($properties & $enumValue->getValue()) > 0);
-	}
-
-	public function getColumnType(string $column) {
-		if (!$this->hasColumn($column)) {
-			throw new ActiveRecordException("Provided column \"$column\" does not exist in table definition", 0);
-		}
-
-		return $this->tableDefinition[$column]['type'] ?? null;
-	}
-
-	public function getColumnLength(string $column) {
-		if (!$this->hasColumn($column)) {
-			throw new ActiveRecordException("Provided column \"$column\" does not exist in table definition", 0);
-		}
-
-		return $this->tableDefinition[$column]['length'] ?? null;
-	}
-
-	public function getDefault(string $column) {
-		if (!$this->hasColumn($column)) {
-			throw new ActiveRecordException("Provided column \"$column\" does not exist in table definition", 0);
-		}
-
-		return $this->tableDefinition[$column]['default'] ?? null;
-	}
-
-	public function validateColumn(string $column, $input) {
-		if (!$this->hasColumn($column)) {
-			throw new ActiveRecordException("Provided column \"$column\" does not exist in table definition", 0);
-		}
-
-		$fn = $this->tableDefinition[$column]['validate'] ?? null;
-
-		if ($fn === null) {
-			return [true, ''];
-		}
-
-		if (!is_callable($fn)) {
-			throw new ActiveRecordException("Provided validation function is not callable", 0);
-		}
-
-		return $fn($input);
-	}
-
-	/**
-	 * Useful for writing unit tests of models against ActiveRecord: 
-	 * overrides a relation column with a relation onto a mock object.
-	 * @param string $column the name of the column onto which to place the mock relation
-	 * @param object $mock the instance of a mock object to palce onto the model.
-	 */
-	public function injectInstanceOnRelation(string $column, $mock) {
-		if (!$this->hasColumn($column)) {
-			throw new ActiveRecordException("Provided column \"$column\" does not exist in table definition", 0);
-		}
-
-		$this->tableDefinition[$column]['relation'] = $mock;
-	}
-
-	/**
-	 * Creates the entity as a table in the database
-	 */
-	public function createTable()
-	{
-		$this->pdo->query(SchemaBuilder::buildCreateTableSQL($this->getTableName(), $this->tableDefinition));
-	}
-
-	/**
-	 * Iterates over the specified constraints in the table definition, 
-	 * 		and applies these to the database.
-	 */
-	public function createTableConstraints()
-	{
-		// Iterate over columns, check whether "relation" field exists, if so create constraint
-		foreach ($this->tableDefinition as $colName => $definition) {
-			if (!isset($definition['relation'])) {
-				continue;
-			}
-
-			$relation = $definition['relation'];
-			$properties = $definition['properties'] ?? 0;
+    const COLUMN_NAME_ID = 'id';
+    const COLUMN_TYPE_ID = 'INT UNSIGNED';
+
+    const CREATE = 'CREATE';
+    const READ = 'READ';
+    const UPDATE = 'UPDATE';
+    const DELETE = 'DELETE';
+    const SEARCH = 'SEARCH';
+
+    /** @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 */
+    protected $createHooks;
+
+    /** @var array A map of column name to functions that hook the read function */
+    protected $readHooks;
+
+    /** @var array A map of column name to functions that hook the update function */
+    protected $updateHooks;
+
+    /** @var array A map of column name to functions that hook the update function */
+    protected $deleteHooks;	
+
+    /** @var array A map of column name to functions that hook the search function */
+    protected $searchHooks;
+
+    /** @var array A list of table column definitions */
+    protected $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->createHooks = [];
+        $this->readHooks = [];
+        $this->updateHooks = [];
+        $this->deleteHooks = [];
+        $this->searchHooks = [];
+        $this->tableDefinition = $this->getTableDefinition();
+
+        // 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
+        ];
+    }
+
+    private function checkHookConstraints($columnName, $hookMap)
+    {
+        // 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, $hookMap)) {
+            $message = "Hook is trying to register on an already registered column \"$columnName\", ";
+            $message .= "do you have conflicting traits?";
+            throw new ActiveRecordException($message, 0);
+        }
+    }
+
+    public function registerHookOnAction($actionName, $columnName, $fn)
+    {
+        if (is_string($fn) && is_callable([$this, $fn])) {
+            $fn = [$this, $fn];
+        }
+
+        if (!is_callable($fn)) { 
+            throw new ActiveRecordException("Provided hook on column \"$columnName\" is not callable", 0);
+        }
+
+        switch ($actionName) {
+            case self::CREATE:
+                $this->checkHookConstraints($columnName, $this->createHooks);
+                $this->createHooks[$columnName] = $fn;
+                break;
+            case self::READ:
+                $this->checkHookConstraints($columnName, $this->readHooks);
+                $this->readHooks[$columnName] = $fn;
+                break;
+            case self::UPDATE:
+                $this->checkHookConstraints($columnName, $this->updateHooks);
+                $this->updateHooks[$columnName] = $fn;
+                break;
+            case self::DELETE:
+                $this->checkHookConstraints($columnName, $this->deleteHooks);
+                $this->deleteHooks[$columnName] = $fn;
+                break;
+            case self::SEARCH:
+                $this->checkHookConstraints($columnName, $this->searchHooks);
+                $this->searchHooks[$columnName] = $fn;
+                break;
+            default:
+                throw new ActiveRecordException("Invalid action: Can not register hook on non-existing action");
+        }
+    }
+
+    /**
+     * 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)
+    {
+        $this->registerHookOnAction(self::CREATE, $columnName, $fn);
+    }
+
+    /**
+     * 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)
+    {
+        $this->registerHookOnAction(self::READ, $columnName, $fn);
+    }
+
+    /**
+     * 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)
+    {
+        $this->registerHookOnAction(self::UPDATE, $columnName, $fn);
+    }
+
+    /**
+     * 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)
+    {
+        $this->registerHookOnAction(self::DELETE, $columnName, $fn);
+    }
+
+    /**
+     * 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)
+    {
+        $this->registerHookOnAction(self::SEARCH, $columnName, $fn);
+    }
+
+    /**
+     * 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.
+     */
+    protected function extendTableDefinition($columnName, $definition)
+    {
+        if ($this->tableDefinition === null) {
+            throw new ActiveRecordException("tableDefinition is null, has parent been initialized in constructor?");
+        }
+
+        // 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;
+    }
+
+    public function hasColumn(string $column) {
+        return array_key_exists($column, $this->tableDefinition);
+    }
+
+    public function hasRelation(string $column, ActiveRecordInterface $record) {
+        if (!$this->hasColumn($column)) {
+            throw new ActiveRecordException("Provided column \"$column\" does not exist in table definition", 0);
+        }
+
+        if (!isset($this->tableDefinition[$column]['relation'])) {
+            return false;
+        }
+
+        $relation = $this->tableDefinition[$column]['relation'];
+        if ($relation instanceof AbstractActiveRecord) {
+            // Injected object
+            return get_class($record) === get_class($relation);
+        } else {
+            // :: class definition
+            return get_class($record) === $relation;
+        }
+    }
+
+    public function hasProperty(string $column, $property) {
+        if (!$this->hasColumn($column)) {
+            throw new ActiveRecordException("Provided column \"$column\" does not exist in table definition", 0);
+        }
+
+        try {
+            $enumValue = ColumnProperty::valueOf($property);
+        } catch (\UnexpectedValueException $e) {
+            throw new ActiveRecordException("Provided property \"$property\" is not a valid property", 0, $e);
+        }
+
+        $properties = $this->tableDefinition[$column]['properties'] ?? null;
+
+        return $properties !== null && (($properties & $enumValue->getValue()) > 0);
+    }
+
+    public function getColumnType(string $column) {
+        if (!$this->hasColumn($column)) {
+            throw new ActiveRecordException("Provided column \"$column\" does not exist in table definition", 0);
+        }
+
+        return $this->tableDefinition[$column]['type'] ?? null;
+    }
+
+    public function getColumnLength(string $column) {
+        if (!$this->hasColumn($column)) {
+            throw new ActiveRecordException("Provided column \"$column\" does not exist in table definition", 0);
+        }
+
+        return $this->tableDefinition[$column]['length'] ?? null;
+    }
+
+    public function getDefault(string $column) {
+        if (!$this->hasColumn($column)) {
+            throw new ActiveRecordException("Provided column \"$column\" does not exist in table definition", 0);
+        }
+
+        return $this->tableDefinition[$column]['default'] ?? null;
+    }
+
+    public function validateColumn(string $column, $input) {
+        if (!$this->hasColumn($column)) {
+            throw new ActiveRecordException("Provided column \"$column\" does not exist in table definition", 0);
+        }
+
+        $fn = $this->tableDefinition[$column]['validate'] ?? null;
+
+        if ($fn === null) {
+            return [true, ''];
+        }
+
+        if (!is_callable($fn)) {
+            throw new ActiveRecordException("Provided validation function is not callable", 0);
+        }
+
+        return $fn($input);
+    }
+
+    /**
+     * Useful for writing unit tests of models against ActiveRecord: 
+     * overrides a relation column with a relation onto a mock object.
+     * @param string $column the name of the column onto which to place the mock relation
+     * @param object $mock the instance of a mock object to palce onto the model.
+     */
+    public function injectInstanceOnRelation(string $column, $mock) {
+        if (!$this->hasColumn($column)) {
+            throw new ActiveRecordException("Provided column \"$column\" does not exist in table definition", 0);
+        }
+
+        $this->tableDefinition[$column]['relation'] = $mock;
+    }
+
+    /**
+     * Creates the entity as a table in the database
+     */
+    public function createTable()
+    {
+        $this->pdo->query(SchemaBuilder::buildCreateTableSQL($this->getTableName(), $this->tableDefinition));
+    }
+
+    /**
+     * Iterates over the specified constraints in the table definition, 
+     * 		and applies these to the database.
+     */
+    public function createTableConstraints()
+    {
+        // Iterate over columns, check whether "relation" field exists, if so create constraint
+        foreach ($this->tableDefinition as $colName => $definition) {
+            if (!isset($definition['relation'])) {
+                continue;
+            }
+
+            $relation = $definition['relation'];
+            $properties = $definition['properties'] ?? 0;
 			
-			if (is_string($relation) 
-				&& class_exists($relation) 
-				&& new $relation($this->pdo) instanceof AbstractActiveRecord) {
-				// ::class relation in tableDefinition
-				$target = new $definition['relation']($this->pdo);
-			}
-			else if ($relation instanceof AbstractActiveRecord) {
-				throw new ActiveRecordException(sprintf(
-					"Relation constraint on column \"%s\" of table \"%s\" can not be built from relation instance, use %s::class in table definition instead",
-					$colName,
-					$this->getTableName(),
-					get_class($relation)
-				));
-			}
-			else {
-				// Invalid class
-				throw new ActiveRecordException(sprintf(
-					"Relation constraint on column \"%s\" of table \"%s\" does not contain a valid ActiveRecord instance", 
-					$colName,
-					$this->getTableName()));
-			}
-
-			// Add new relation constraint on database
-			if ($properties & ColumnProperty::NOT_NULL) {
-				$constraintSql = SchemaBuilder::buildConstraintOnDeleteCascade($target->getTableName(), 'id', $this->getTableName(), $colName);
-			} else {
-				$constraintSql = SchemaBuilder::buildConstraintOnDeleteSetNull($target->getTableName(), 'id', $this->getTableName(), $colName);
-			}
-			$this->pdo->query($constraintSql);
-		}
-	}
-
-	/**
-	 * Returns the name -> variable mapping for the table definition.
-	 * @return Array The mapping
-	 */
-	protected 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;
-	}
-
-	protected function insertDefaults()
-	{
-		// Insert default values for not-null fields
-		foreach ($this->tableDefinition as $colName => $colDef) {
-			if ($colDef['value'] === null
-				&& ($colDef['properties'] ?? 0) & ColumnProperty::NOT_NULL
-				&& isset($colDef['default'])) {
-				$this->tableDefinition[$colName]['value'] = $colDef['default'];
-			}
-		}		
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function create()
-	{
-		foreach ($this->createHooks as $colName => $fn) {
-			$fn();
-		}
-
-		$this->insertDefaults();
-
-		try {
-			(new Query($this->getPdo(), $this->getTableName()))
-				->insert($this->getActiveRecordColumns())
-				->execute();
-
-			$this->setId(intval($this->getPdo()->lastInsertId()));
-		} catch (\PDOException $e) {
-			throw new ActiveRecordException($e->getMessage(), ActiveRecordException::DB_ERROR, $e);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function read($id)
-	{
-		$whereConditions = [
-			Query::Equal('id', $id)
-		];
-		foreach ($this->readHooks as $colName => $fn) {
-			$cond = $fn();
-			if ($cond !== null) {
-				$whereConditions[] = $cond;
-			}
-		}
-
-		try {
-			$row = (new Query($this->getPdo(), $this->getTableName()))
-				->select()
-				->where(Query::AndArray($whereConditions))
-				->execute()
-				->fetch();
+            if (is_string($relation) 
+                && class_exists($relation) 
+                && new $relation($this->pdo) instanceof AbstractActiveRecord) {
+                // ::class relation in tableDefinition
+                $target = new $definition['relation']($this->pdo);
+            }
+            else if ($relation instanceof AbstractActiveRecord) {
+                throw new ActiveRecordException(sprintf(
+                    "Relation constraint on column \"%s\" of table \"%s\" can not be built from relation instance, use %s::class in table definition instead",
+                    $colName,
+                    $this->getTableName(),
+                    get_class($relation)
+                ));
+            }
+            else {
+                // Invalid class
+                throw new ActiveRecordException(sprintf(
+                    "Relation constraint on column \"%s\" of table \"%s\" does not contain a valid ActiveRecord instance", 
+                    $colName,
+                    $this->getTableName()));
+            }
+
+            // Add new relation constraint on database
+            if ($properties & ColumnProperty::NOT_NULL) {
+                $constraintSql = SchemaBuilder::buildConstraintOnDeleteCascade($target->getTableName(), 'id', $this->getTableName(), $colName);
+            } else {
+                $constraintSql = SchemaBuilder::buildConstraintOnDeleteSetNull($target->getTableName(), 'id', $this->getTableName(), $colName);
+            }
+            $this->pdo->query($constraintSql);
+        }
+    }
+
+    /**
+     * Returns the name -> variable mapping for the table definition.
+     * @return Array The mapping
+     */
+    protected 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;
+    }
+
+    protected function insertDefaults()
+    {
+        // Insert default values for not-null fields
+        foreach ($this->tableDefinition as $colName => $colDef) {
+            if ($colDef['value'] === null
+                && ($colDef['properties'] ?? 0) & ColumnProperty::NOT_NULL
+                && isset($colDef['default'])) {
+                $this->tableDefinition[$colName]['value'] = $colDef['default'];
+            }
+        }		
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create()
+    {
+        foreach ($this->createHooks as $colName => $fn) {
+            $fn();
+        }
+
+        $this->insertDefaults();
+
+        try {
+            (new Query($this->getPdo(), $this->getTableName()))
+                ->insert($this->getActiveRecordColumns())
+                ->execute();
+
+            $this->setId(intval($this->getPdo()->lastInsertId()));
+        } catch (\PDOException $e) {
+            throw new ActiveRecordException($e->getMessage(), ActiveRecordException::DB_ERROR, $e);
+        }
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function read($id)
+    {
+        $whereConditions = [
+            Query::Equal('id', $id)
+        ];
+        foreach ($this->readHooks as $colName => $fn) {
+            $cond = $fn();
+            if ($cond !== null) {
+                $whereConditions[] = $cond;
+            }
+        }
+
+        try {
+            $row = (new Query($this->getPdo(), $this->getTableName()))
+                ->select()
+                ->where(Query::AndArray($whereConditions))
+                ->execute()
+                ->fetch();
 			
-			if ($row === false) {
-				$msg = sprintf('Can not read the non-existent active record entry %d from the `%s` table.', $id, $this->getTableName());
-				throw new ActiveRecordException($msg, ActiveRecordException::NOT_FOUND);
-			}
-
-			$this->fill($row)->setId($id);
-		} catch (\PDOException $e) {
-			throw new ActiveRecordException($e->getMessage(), ActiveRecordException::DB_ERROR, $e);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function update()
-	{
-		foreach ($this->updateHooks as $colName => $fn) {
-			$fn();
-		}
-
-		try {
-			(new Query($this->getPdo(), $this->getTableName()))
-				->update($this->getActiveRecordColumns())
-				->where(Query::Equal('id', $this->getId()))
-				->execute();
-		} catch (\PDOException $e) {
-			throw new ActiveRecordException($e->getMessage(), ActiveRecordException::DB_ERROR, $e);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function delete()
-	{
-		foreach ($this->deleteHooks as $colName => $fn) {
-			$fn();
-		}
-
-		try {
-			(new Query($this->getPdo(), $this->getTableName()))
-				->delete()
-				->where(Query::Equal('id', $this->getId()))
-				->execute();
-
-			$this->setId(null);
-		} catch (\PDOException $e) {
-			throw new ActiveRecordException($e->getMessage(), ActiveRecordException::DB_ERROR, $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;
-	}
-
-	/**
-	 * Returns the serialized form of the specified columns
-	 * 
-	 * @return Array
-	 */
-	public function toArray(Array $fieldWhitelist)
-	{
-		$output = [];
-		foreach ($this->tableDefinition as $colName => $definition) {
-			if (in_array($colName, $fieldWhitelist)) {
-				$output[$colName] = $definition['value'];
-			}
-		}
-
-		return $output;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function search(array $ignoredTraits = [])
-	{
-		$clauses = [];
-		foreach ($this->searchHooks as $column => $fn) {
-			if (!in_array($column, $ignoredTraits)) {
-				$clauses[] = $fn();
-			}
-		}
-
-		return new ActiveRecordQuery($this, $clauses);
-	}
-
-	/**
-	 * 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;
-	}
-
-	public function getFinalTableDefinition()
-	{
-		return $this->tableDefinition;
-	}
-
-	public function newInstance()
-	{
-		return new static($this->pdo);
-	}
-
-	/**
-	 * Returns the active record table.
-	 *
-	 * @return string the active record table name.
-	 */
-	abstract public function getTableName(): string;
-
-	/**
-	 * Returns the active record columns.
-	 *
-	 * @return array the active record columns.
-	 */
-	abstract protected function getTableDefinition(): Array;
+            if ($row === false) {
+                $msg = sprintf('Can not read the non-existent active record entry %d from the `%s` table.', $id, $this->getTableName());
+                throw new ActiveRecordException($msg, ActiveRecordException::NOT_FOUND);
+            }
+
+            $this->fill($row)->setId($id);
+        } catch (\PDOException $e) {
+            throw new ActiveRecordException($e->getMessage(), ActiveRecordException::DB_ERROR, $e);
+        }
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function update()
+    {
+        foreach ($this->updateHooks as $colName => $fn) {
+            $fn();
+        }
+
+        try {
+            (new Query($this->getPdo(), $this->getTableName()))
+                ->update($this->getActiveRecordColumns())
+                ->where(Query::Equal('id', $this->getId()))
+                ->execute();
+        } catch (\PDOException $e) {
+            throw new ActiveRecordException($e->getMessage(), ActiveRecordException::DB_ERROR, $e);
+        }
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function delete()
+    {
+        foreach ($this->deleteHooks as $colName => $fn) {
+            $fn();
+        }
+
+        try {
+            (new Query($this->getPdo(), $this->getTableName()))
+                ->delete()
+                ->where(Query::Equal('id', $this->getId()))
+                ->execute();
+
+            $this->setId(null);
+        } catch (\PDOException $e) {
+            throw new ActiveRecordException($e->getMessage(), ActiveRecordException::DB_ERROR, $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;
+    }
+
+    /**
+     * Returns the serialized form of the specified columns
+     * 
+     * @return Array
+     */
+    public function toArray(Array $fieldWhitelist)
+    {
+        $output = [];
+        foreach ($this->tableDefinition as $colName => $definition) {
+            if (in_array($colName, $fieldWhitelist)) {
+                $output[$colName] = $definition['value'];
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function search(array $ignoredTraits = [])
+    {
+        $clauses = [];
+        foreach ($this->searchHooks as $column => $fn) {
+            if (!in_array($column, $ignoredTraits)) {
+                $clauses[] = $fn();
+            }
+        }
+
+        return new ActiveRecordQuery($this, $clauses);
+    }
+
+    /**
+     * 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;
+    }
+
+    public function getFinalTableDefinition()
+    {
+        return $this->tableDefinition;
+    }
+
+    public function newInstance()
+    {
+        return new static($this->pdo);
+    }
+
+    /**
+     * Returns the active record table.
+     *
+     * @return string the active record table name.
+     */
+    abstract public function getTableName(): string;
+
+    /**
+     * Returns the active record columns.
+     *
+     * @return array the active record columns.
+     */
+    abstract protected function getTableDefinition(): Array;
 }

Braces +2 added lines, -4 removed lines

@@ -341,16 +341,14 @@
 				&& new $relation($this->pdo) instanceof AbstractActiveRecord) {
 				// ::class relation in tableDefinition
 				$target = new $definition['relation']($this->pdo);
-			}
-			else if ($relation instanceof AbstractActiveRecord) {
+			} else if ($relation instanceof AbstractActiveRecord) {
 				throw new ActiveRecordException(sprintf(
 					"Relation constraint on column \"%s\" of table \"%s\" can not be built from relation instance, use %s::class in table definition instead",
 					$colName,
 					$this->getTableName(),
 					get_class($relation)
 				));
-			}
-			else {
+			} else {
 				// Invalid class
 				throw new ActiveRecordException(sprintf(
 					"Relation constraint on column \"%s\" of table \"%s\" does not contain a valid ActiveRecord instance", 

src/Traits/AutoApi.php

Indentation +415 added lines, -415 removed lines

@@ -9,436 +9,436 @@
 
 trait AutoApi
 {
-	/* =======================================================================
+    /* =======================================================================
 	 * ===================== Automatic API Support ===========================
 	 * ======================================================================= */
 
-	/** @var array A map of column name to functions that hook the insert function */
-	protected $createHooks;
+    /** @var array A map of column name to functions that hook the insert function */
+    protected $createHooks;
 
-	/** @var array A map of column name to functions that hook the read function */
-	protected $readHooks;
+    /** @var array A map of column name to functions that hook the read function */
+    protected $readHooks;
 
-	/** @var array A map of column name to functions that hook the update function */
-	protected $updateHooks;
+    /** @var array A map of column name to functions that hook the update function */
+    protected $updateHooks;
 
-	/** @var array A map of column name to functions that hook the update function */
-	protected $deleteHooks;	
+    /** @var array A map of column name to functions that hook the update function */
+    protected $deleteHooks;	
 
-	/** @var array A map of column name to functions that hook the search function */
-	protected $searchHooks;
+    /** @var array A map of column name to functions that hook the search function */
+    protected $searchHooks;
 
-	/** @var array A list of table column definitions */
-	protected $tableDefinition;
+    /** @var array A list of table column definitions */
+    protected $tableDefinition;
 
 
-	/**
-	 * @param Array $queryparams associative array of query params. Reserved options are
-	 *                             "search_order_by", "search_order_direction", "search_limit", "search_offset"
-	 *                             or column names corresponding to an instance of miBadger\Query\QueryExpression
-	 * @param Array $fieldWhitelist names of the columns that will appear in the output results
-	 * 
-	 * @return Array an associative array containing the query parameters, and a data field containing an array of search results (associative arrays indexed by the keys in $fieldWhitelist)
-	 */
-	public function apiSearch(Array $queryParams, Array $fieldWhitelist, ?QueryExpression $whereClause = null, int $maxResultLimit = 100): Array
-	{
-		$query = $this->search();
+    /**
+     * @param Array $queryparams associative array of query params. Reserved options are
+     *                             "search_order_by", "search_order_direction", "search_limit", "search_offset"
+     *                             or column names corresponding to an instance of miBadger\Query\QueryExpression
+     * @param Array $fieldWhitelist names of the columns that will appear in the output results
+     * 
+     * @return Array an associative array containing the query parameters, and a data field containing an array of search results (associative arrays indexed by the keys in $fieldWhitelist)
+     */
+    public function apiSearch(Array $queryParams, Array $fieldWhitelist, ?QueryExpression $whereClause = null, int $maxResultLimit = 100): Array
+    {
+        $query = $this->search();
 
-		// Build query
-		$orderColumn = $queryParams['search_order_by'] ?? null;
-		if (!in_array($orderColumn, $fieldWhitelist)) {
-			$orderColumn = null;
-		}
+        // Build query
+        $orderColumn = $queryParams['search_order_by'] ?? null;
+        if (!in_array($orderColumn, $fieldWhitelist)) {
+            $orderColumn = null;
+        }
 
-		$orderDirection = $queryParams['search_order_direction'] ?? null;
-		if ($orderColumn !== null) {
-			$query->orderBy($orderColumn, $orderDirection);
-		}
+        $orderDirection = $queryParams['search_order_direction'] ?? null;
+        if ($orderColumn !== null) {
+            $query->orderBy($orderColumn, $orderDirection);
+        }
 		
-		if ($whereClause !== null) {
-			$query->where($whereClause);
-		}
-
-		$limit = min((int) ($queryParams['search_limit'] ?? $maxResultLimit), $maxResultLimit);
-		$query->limit($limit);
-
-		$offset = $queryParams['search_offset'] ?? 0;
-		$query->offset($offset);
-
-		$numPages = $query->getNumberOfPages();
-		$currentPage = $query->getCurrentPage();
-
-		// Fetch results
-		$results = $query->fetchAll();
-		$resultsArray = [];
-		foreach ($results as $result) {
-			$resultsArray[] = $result->toArray($fieldWhitelist);
-		}
-
-		return [
-			'search_offset' => $offset,
-			'search_limit' => $limit,
-			'search_order_by' => $orderColumn,
-			'search_order_direction' => $orderDirection,
-			'search_pages' => $numPages,
-			'search_current' => $currentPage,
-			'data' => $resultsArray
-		];
-	}
-
-	/**
-	 * Performs a read call on the entity (modifying the current object) 
-	 * 	and returns a result array ($error, $data), with an optional error, and the results array (as filtered by the whitelist)
-	 * 	containing the loaded data.
-	 * 
-	 * @param string|int $id the id of the current entity
-	 * @param Array $fieldWhitelist an array of fields that are allowed to appear in the output
-	 * 
-	 * @param Array [$error, $result]
-	 * 				Where $error contains the error message (@TODO: & Error type?)
-	 * 				Where result is an associative array containing the data for this record, and the keys are a subset of $fieldWhitelist
-	 * 				
-	 */
-	public function apiRead($id, Array $fieldWhitelist = []): Array
-	{
-		try {
-			$this->read($id);	
-		} catch (ActiveRecordException $e) {
-			if ($e->getCode() === ActiveRecordException::NOT_FOUND) {
-				$err = [
-					'type' => 'invalid',
-					'message' => $e->getMessage()
-				];
-				return [$err, null];
-			}
-			throw $e;
-		}
-		return [null, $this->toArray($fieldWhitelist)];
-	}
-
-	/* =============================================================
+        if ($whereClause !== null) {
+            $query->where($whereClause);
+        }
+
+        $limit = min((int) ($queryParams['search_limit'] ?? $maxResultLimit), $maxResultLimit);
+        $query->limit($limit);
+
+        $offset = $queryParams['search_offset'] ?? 0;
+        $query->offset($offset);
+
+        $numPages = $query->getNumberOfPages();
+        $currentPage = $query->getCurrentPage();
+
+        // Fetch results
+        $results = $query->fetchAll();
+        $resultsArray = [];
+        foreach ($results as $result) {
+            $resultsArray[] = $result->toArray($fieldWhitelist);
+        }
+
+        return [
+            'search_offset' => $offset,
+            'search_limit' => $limit,
+            'search_order_by' => $orderColumn,
+            'search_order_direction' => $orderDirection,
+            'search_pages' => $numPages,
+            'search_current' => $currentPage,
+            'data' => $resultsArray
+        ];
+    }
+
+    /**
+     * Performs a read call on the entity (modifying the current object) 
+     * 	and returns a result array ($error, $data), with an optional error, and the results array (as filtered by the whitelist)
+     * 	containing the loaded data.
+     * 
+     * @param string|int $id the id of the current entity
+     * @param Array $fieldWhitelist an array of fields that are allowed to appear in the output
+     * 
+     * @param Array [$error, $result]
+     * 				Where $error contains the error message (@TODO: & Error type?)
+     * 				Where result is an associative array containing the data for this record, and the keys are a subset of $fieldWhitelist
+     * 				
+     */
+    public function apiRead($id, Array $fieldWhitelist = []): Array
+    {
+        try {
+            $this->read($id);	
+        } catch (ActiveRecordException $e) {
+            if ($e->getCode() === ActiveRecordException::NOT_FOUND) {
+                $err = [
+                    'type' => 'invalid',
+                    'message' => $e->getMessage()
+                ];
+                return [$err, null];
+            }
+            throw $e;
+        }
+        return [null, $this->toArray($fieldWhitelist)];
+    }
+
+    /* =============================================================
 	 * ===================== Constraint validation =================
 	 * ============================================================= */
 
-	/**
-	 * Copy all table variables between two instances
-	 */
-	public function syncInstanceFrom($from)
-	{
-		foreach ($this->tableDefinition as $colName => $definition) {
-			$this->tableDefinition[$colName]['value'] = $from->tableDefinition[$colName]['value'];
-		}
-	}
-
-	private function filterInputColumns($input, $whitelist)
-	{
-		$filteredInput = $input;
-		foreach ($input as $colName => $value) {
-			if (!in_array($colName, $whitelist)) {
-				unset($filteredInput[$colName]);
-			}
-		}
-		return $filteredInput;
-	}
-
-	private function validateExcessKeys($input)
-	{
-		$errors = [];
-		foreach ($input as $colName => $value) {
-			if (!array_key_exists($colName, $this->tableDefinition)) {
-				$errors[$colName] = [
-					'type' => 'unknown_field',
-					'message' => 'Unknown input field'
-				];
-				continue;
-			}
-		}
-		return $errors;
-	}
-
-	private function validateImmutableColumns($input)
-	{
-		$errors = [];
-		foreach ($this->tableDefinition as $colName => $definition) {
-			$property = $definition['properties'] ?? null;
-			if (array_key_exists($colName, $input)
-				&& $property & ColumnProperty::IMMUTABLE) {
-				$errors[$colName] = [
-					'type' => 'immutable',
-					'message' => 'Value cannot be changed'
-				];
-			}
-		}
-		return $errors;
-	}
-
-	/**
-	 * Checks whether input values are correct:
-	 * 1. Checks whether a value passes the validation function for that column
-	 * 2. Checks whether a value supplied to a relationship column is a valid value
-	 */
-	private function validateInputValues($input)
-	{
-		$errors = [];
-		foreach ($this->tableDefinition as $colName => $definition) {
-			// Validation check 1: If validate function is present
-			if (array_key_exists($colName, $input) 
-				&& is_callable($definition['validate'] ?? null)) {
-				$inputValue = $input[$colName];
-
-				// If validation function fails
-				[$status, $message] = $definition['validate']($inputValue);
-				if (!$status) {
-					$errors[$colName] = [
-						'type' => 'invalid',
-						'message' => $message
-					];
-				}	
-			}
-
-			// Validation check 2: If relation column, check whether entity exists
-			$properties = $definition['properties'] ?? null;
-			if (isset($definition['relation'])
-				&& ($properties & ColumnProperty::NOT_NULL)) {
+    /**
+     * Copy all table variables between two instances
+     */
+    public function syncInstanceFrom($from)
+    {
+        foreach ($this->tableDefinition as $colName => $definition) {
+            $this->tableDefinition[$colName]['value'] = $from->tableDefinition[$colName]['value'];
+        }
+    }
+
+    private function filterInputColumns($input, $whitelist)
+    {
+        $filteredInput = $input;
+        foreach ($input as $colName => $value) {
+            if (!in_array($colName, $whitelist)) {
+                unset($filteredInput[$colName]);
+            }
+        }
+        return $filteredInput;
+    }
+
+    private function validateExcessKeys($input)
+    {
+        $errors = [];
+        foreach ($input as $colName => $value) {
+            if (!array_key_exists($colName, $this->tableDefinition)) {
+                $errors[$colName] = [
+                    'type' => 'unknown_field',
+                    'message' => 'Unknown input field'
+                ];
+                continue;
+            }
+        }
+        return $errors;
+    }
+
+    private function validateImmutableColumns($input)
+    {
+        $errors = [];
+        foreach ($this->tableDefinition as $colName => $definition) {
+            $property = $definition['properties'] ?? null;
+            if (array_key_exists($colName, $input)
+                && $property & ColumnProperty::IMMUTABLE) {
+                $errors[$colName] = [
+                    'type' => 'immutable',
+                    'message' => 'Value cannot be changed'
+                ];
+            }
+        }
+        return $errors;
+    }
+
+    /**
+     * Checks whether input values are correct:
+     * 1. Checks whether a value passes the validation function for that column
+     * 2. Checks whether a value supplied to a relationship column is a valid value
+     */
+    private function validateInputValues($input)
+    {
+        $errors = [];
+        foreach ($this->tableDefinition as $colName => $definition) {
+            // Validation check 1: If validate function is present
+            if (array_key_exists($colName, $input) 
+                && is_callable($definition['validate'] ?? null)) {
+                $inputValue = $input[$colName];
+
+                // If validation function fails
+                [$status, $message] = $definition['validate']($inputValue);
+                if (!$status) {
+                    $errors[$colName] = [
+                        'type' => 'invalid',
+                        'message' => $message
+                    ];
+                }	
+            }
+
+            // Validation check 2: If relation column, check whether entity exists
+            $properties = $definition['properties'] ?? null;
+            if (isset($definition['relation'])
+                && ($properties & ColumnProperty::NOT_NULL)) {
 				
-				try {
-					if ($definition['relation'] instanceof AbstractActiveRecord) {
-						$instance = $definition['relation'];
-					} else {
-						$instance = new $definition['relation']($this->pdo);	
-					}
-					$instance->read($input[$colName] ?? $definition['value'] ?? null);
-				} catch (ActiveRecordException $e) {
-					$errors[$colName] = [
-						'type' => 'invalid',
-						'message' => 'Entry for this value does not exist'
-					];
-				}
-			}
-		}
-		return $errors;
-	}
-
-	/**
-	 * This function is only used for API Update calls (direct getter/setter functions are unconstrained)
-	 * Determines whether there are required columns for which no data is provided
-	 */
-	private function validateMissingKeys($input)
-	{
-		$errors = [];
-
-		foreach ($this->tableDefinition as $colName => $colDefinition) {
-			$default = $colDefinition['default'] ?? null;
-			$properties = $colDefinition['properties'] ?? null;
-			$value = $colDefinition['value'];
-
-			// If nullable and default not set => null
-			// If nullable and default null => default (null)
-			// If nullable and default set => default (value)
-
-			// if not nullable and default not set => error
-			// if not nullable and default null => error
-			// if not nullable and default st => default (value)
-			// => if not nullable and default null and value not set (or null) => error message in this method
-			if ($properties & ColumnProperty::NOT_NULL
-				&& $default === null
-				&& !($properties & ColumnProperty::AUTO_INCREMENT)
-				&& (!array_key_exists($colName, $input) 
-					|| $input[$colName] === null 
-					|| (is_string($input[$colName]) && $input[$colName] === '') )
-				&& ($value === null
-					|| (is_string($value) && $value === ''))) {
-				$errors[$colName] = [
-					'type' => 'missing',
-					'message' => sprintf("The required field \"%s\" is missing", $colName)
-				];
-			} 
-		}
-
-		return $errors;
-	}
-
-	/**
-	 * Copies the values for entries in the input with matching variable names in the record definition
-	 * @param Array $input The input data to be loaded into $this record
-	 */
-	private function loadData($input)
-	{
-		foreach ($this->tableDefinition as $colName => $definition) {
-			// Skip if this table column does not appear in the input
-			if (!array_key_exists($colName, $input)) {
-				continue;
-			}
-
-			// Use setter if known, otherwise set value directly
-			$fn = $definition['setter'] ?? null;
-			if (is_callable($fn)) {
-				$fn($input[$colName]);
-			} else {
-				$definition['value'] = $input[$colName];
-			}
-		}
-	}
-
-	/**
-	 * @param Array $input Associative array of input values
-	 * @param Array $fieldWhitelist array of column names that are allowed to be filled by the input array 
-	 * @return Array Array containing the set of optional errors (associative array) and an optional array representation (associative)
-	 * 					of the modified data.
-	 */
-	public function apiCreate(Array $input, Array $createWhitelist, Array $readWhitelist)
-	{
-		// Clone $this to new instance (for restoring if validation goes wrong)
-		$transaction = $this->newInstance();
-		$errors = [];
-
-		// Filter out all non-whitelisted input values
-		$input = $this->filterInputColumns($input, $createWhitelist);
-
-		// Validate excess keys
-		$errors += $transaction->validateExcessKeys($input);
-
-		// Validate input values (using validation function)
-		$errors += $transaction->validateInputValues($input);
-
-		// "Copy" data into transaction
-		$transaction->loadData($input);
-
-		// Run create hooks
-		foreach ($transaction->createHooks as $colName => $fn) {
-			$fn();
-		}
-
-		// Validate missing keys
-		$errors += $transaction->validateMissingKeys($input);
-
-		// If no errors, commit the pending data
-		if (empty($errors)) {
-			$this->syncInstanceFrom($transaction);
-
-			// Insert default values for not-null fields
-			$this->insertDefaults();
-
-			try {
-				(new Query($this->getPdo(), $this->getTableName()))
-					->insert($this->getActiveRecordColumns())
-					->execute();
-
-				$this->setId(intval($this->getPdo()->lastInsertId()));
-			} catch (\PDOException $e) {
-				// @TODO: Potentially filter and store mysql messages (where possible) in error messages
-				throw new ActiveRecordException($e->getMessage(), 0, $e);
-			}
-
-			return [null, $this->toArray($readWhitelist)];
-		} else {
-			return [$errors, null];
-		}
-	}
-
-	/**
-	 * @param Array $input Associative array of input values
-	 * @param Array $fieldWhitelist array of column names that are allowed to be filled by the input array 
-	 * @return Array Array containing the set of optional errors (associative array) and an optional array representation (associative)
-	 * 					of the modified data.
-	 */
-	public function apiUpdate(Array $input, Array $updateWhitelist, Array $readWhitelist)
-	{
-		$transaction = $this->newInstance();
-		$transaction->syncInstanceFrom($this);
-		$errors = [];
-
-		// Filter out all non-whitelisted input values
-		$input = $this->filterInputColumns($input, $updateWhitelist);
-
-		// Check for excess keys
-		$errors += $transaction->validateExcessKeys($input);
-
-		// Check for immutable keys
-		$errors += $transaction->validateImmutableColumns($input);
-
-		// Validate input values (using validation function)
-		$errors += $transaction->validateInputValues($input);
-
-		// "Copy" data into transaction
-		$transaction->loadData($input);
-
-		// Run create hooks
-		foreach ($transaction->updateHooks as $colName => $fn) {
-			$fn();
-		}
-
-		// Validate missing keys
-		$errors += $transaction->validateMissingKeys($input);
-
-		// Update database
-		if (empty($errors)) {
-			$this->syncInstanceFrom($transaction);
-
-			try {
-				(new Query($this->getPdo(), $this->getTableName()))
-					->update($this->getActiveRecordColumns())
-					->where(Query::Equal('id', $this->getId()))
-					->execute();
-			} catch (\PDOException $e) {
-				throw new ActiveRecordException($e->getMessage(), 0, $e);
-			}
-
-			return [null, $this->toArray($readWhitelist)];
-		} else {
-			return [$errors, null];
-		}
-	}
-
-	/**
-	 * Returns this active record after reading the attributes from the entry with the given identifier.
-	 *
-	 * @param mixed $id
-	 * @return $this
-	 * @throws ActiveRecordException on failure.
-	 */
-	abstract public function read($id);
-
-	/**
-	 * Returns the PDO.
-	 *
-	 * @return \PDO the PDO.
-	 */
-	abstract public function getPdo();
-
-	/**
-	 * Set the ID.
-	 *
-	 * @param int $id
-	 * @return $this
-	 */
-	abstract protected function setId($id);
-
-	/**
-	 * Returns the ID.
-	 *
-	 * @return null|int The ID.
-	 */
-	abstract protected function getId();
-
-
-	/**
-	 * Returns the serialized form of the specified columns
-	 * 
-	 * @return Array
-	 */
-	abstract public function toArray(Array $fieldWhitelist);
-
-	/**
-	 * Returns the active record table.
-	 *
-	 * @return string the active record table name.
-	 */
-	abstract public function getTableName();
-
-	/**
-	 * Returns the name -> variable mapping for the table definition.
-	 * @return Array The mapping
-	 */
-	abstract protected function getActiveRecordColumns();
+                try {
+                    if ($definition['relation'] instanceof AbstractActiveRecord) {
+                        $instance = $definition['relation'];
+                    } else {
+                        $instance = new $definition['relation']($this->pdo);	
+                    }
+                    $instance->read($input[$colName] ?? $definition['value'] ?? null);
+                } catch (ActiveRecordException $e) {
+                    $errors[$colName] = [
+                        'type' => 'invalid',
+                        'message' => 'Entry for this value does not exist'
+                    ];
+                }
+            }
+        }
+        return $errors;
+    }
+
+    /**
+     * This function is only used for API Update calls (direct getter/setter functions are unconstrained)
+     * Determines whether there are required columns for which no data is provided
+     */
+    private function validateMissingKeys($input)
+    {
+        $errors = [];
+
+        foreach ($this->tableDefinition as $colName => $colDefinition) {
+            $default = $colDefinition['default'] ?? null;
+            $properties = $colDefinition['properties'] ?? null;
+            $value = $colDefinition['value'];
+
+            // If nullable and default not set => null
+            // If nullable and default null => default (null)
+            // If nullable and default set => default (value)
+
+            // if not nullable and default not set => error
+            // if not nullable and default null => error
+            // if not nullable and default st => default (value)
+            // => if not nullable and default null and value not set (or null) => error message in this method
+            if ($properties & ColumnProperty::NOT_NULL
+                && $default === null
+                && !($properties & ColumnProperty::AUTO_INCREMENT)
+                && (!array_key_exists($colName, $input) 
+                    || $input[$colName] === null 
+                    || (is_string($input[$colName]) && $input[$colName] === '') )
+                && ($value === null
+                    || (is_string($value) && $value === ''))) {
+                $errors[$colName] = [
+                    'type' => 'missing',
+                    'message' => sprintf("The required field \"%s\" is missing", $colName)
+                ];
+            } 
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Copies the values for entries in the input with matching variable names in the record definition
+     * @param Array $input The input data to be loaded into $this record
+     */
+    private function loadData($input)
+    {
+        foreach ($this->tableDefinition as $colName => $definition) {
+            // Skip if this table column does not appear in the input
+            if (!array_key_exists($colName, $input)) {
+                continue;
+            }
+
+            // Use setter if known, otherwise set value directly
+            $fn = $definition['setter'] ?? null;
+            if (is_callable($fn)) {
+                $fn($input[$colName]);
+            } else {
+                $definition['value'] = $input[$colName];
+            }
+        }
+    }
+
+    /**
+     * @param Array $input Associative array of input values
+     * @param Array $fieldWhitelist array of column names that are allowed to be filled by the input array 
+     * @return Array Array containing the set of optional errors (associative array) and an optional array representation (associative)
+     * 					of the modified data.
+     */
+    public function apiCreate(Array $input, Array $createWhitelist, Array $readWhitelist)
+    {
+        // Clone $this to new instance (for restoring if validation goes wrong)
+        $transaction = $this->newInstance();
+        $errors = [];
+
+        // Filter out all non-whitelisted input values
+        $input = $this->filterInputColumns($input, $createWhitelist);
+
+        // Validate excess keys
+        $errors += $transaction->validateExcessKeys($input);
+
+        // Validate input values (using validation function)
+        $errors += $transaction->validateInputValues($input);
+
+        // "Copy" data into transaction
+        $transaction->loadData($input);
+
+        // Run create hooks
+        foreach ($transaction->createHooks as $colName => $fn) {
+            $fn();
+        }
+
+        // Validate missing keys
+        $errors += $transaction->validateMissingKeys($input);
+
+        // If no errors, commit the pending data
+        if (empty($errors)) {
+            $this->syncInstanceFrom($transaction);
+
+            // Insert default values for not-null fields
+            $this->insertDefaults();
+
+            try {
+                (new Query($this->getPdo(), $this->getTableName()))
+                    ->insert($this->getActiveRecordColumns())
+                    ->execute();
+
+                $this->setId(intval($this->getPdo()->lastInsertId()));
+            } catch (\PDOException $e) {
+                // @TODO: Potentially filter and store mysql messages (where possible) in error messages
+                throw new ActiveRecordException($e->getMessage(), 0, $e);
+            }
+
+            return [null, $this->toArray($readWhitelist)];
+        } else {
+            return [$errors, null];
+        }
+    }
+
+    /**
+     * @param Array $input Associative array of input values
+     * @param Array $fieldWhitelist array of column names that are allowed to be filled by the input array 
+     * @return Array Array containing the set of optional errors (associative array) and an optional array representation (associative)
+     * 					of the modified data.
+     */
+    public function apiUpdate(Array $input, Array $updateWhitelist, Array $readWhitelist)
+    {
+        $transaction = $this->newInstance();
+        $transaction->syncInstanceFrom($this);
+        $errors = [];
+
+        // Filter out all non-whitelisted input values
+        $input = $this->filterInputColumns($input, $updateWhitelist);
+
+        // Check for excess keys
+        $errors += $transaction->validateExcessKeys($input);
+
+        // Check for immutable keys
+        $errors += $transaction->validateImmutableColumns($input);
+
+        // Validate input values (using validation function)
+        $errors += $transaction->validateInputValues($input);
+
+        // "Copy" data into transaction
+        $transaction->loadData($input);
+
+        // Run create hooks
+        foreach ($transaction->updateHooks as $colName => $fn) {
+            $fn();
+        }
+
+        // Validate missing keys
+        $errors += $transaction->validateMissingKeys($input);
+
+        // Update database
+        if (empty($errors)) {
+            $this->syncInstanceFrom($transaction);
+
+            try {
+                (new Query($this->getPdo(), $this->getTableName()))
+                    ->update($this->getActiveRecordColumns())
+                    ->where(Query::Equal('id', $this->getId()))
+                    ->execute();
+            } catch (\PDOException $e) {
+                throw new ActiveRecordException($e->getMessage(), 0, $e);
+            }
+
+            return [null, $this->toArray($readWhitelist)];
+        } else {
+            return [$errors, null];
+        }
+    }
+
+    /**
+     * Returns this active record after reading the attributes from the entry with the given identifier.
+     *
+     * @param mixed $id
+     * @return $this
+     * @throws ActiveRecordException on failure.
+     */
+    abstract public function read($id);
+
+    /**
+     * Returns the PDO.
+     *
+     * @return \PDO the PDO.
+     */
+    abstract public function getPdo();
+
+    /**
+     * Set the ID.
+     *
+     * @param int $id
+     * @return $this
+     */
+    abstract protected function setId($id);
+
+    /**
+     * Returns the ID.
+     *
+     * @return null|int The ID.
+     */
+    abstract protected function getId();
+
+
+    /**
+     * Returns the serialized form of the specified columns
+     * 
+     * @return Array
+     */
+    abstract public function toArray(Array $fieldWhitelist);
+
+    /**
+     * Returns the active record table.
+     *
+     * @return string the active record table name.
+     */
+    abstract public function getTableName();
+
+    /**
+     * Returns the name -> variable mapping for the table definition.
+     * @return Array The mapping
+     */
+    abstract protected function getActiveRecordColumns();
 }