zortje / mvc

src/Controller/Controller.php

Indentation +279 added lines, -279 removed lines

@@ -16,283 +16,283 @@
 class Controller
 {
 
-    /**
-     * Controller action is publicly accessible
-     */
-    const ACTION_PUBLIC = 0;
-
-    /**
-     * Controller action requires authentication
-     * Will redirect to login page if not authenticated
-     */
-    const ACTION_PROTECTED = 1;
-
-    /**
-     * Controller action requires authentication
-     * Will result in an 404 if not authenticated
-     */
-    const ACTION_PRIVATE = 2;
-
-    /**
-     * @var array Controller action access rules
-     */
-    protected $access = [];
-
-    /**
-     * @var \PDO PDO
-     */
-    protected $pdo;
-
-    /**
-     * @var string App file path
-     */
-    protected $appPath;
-
-    /**
-     * @var null|User User
-     */
-    protected $user;
-
-    /**
-     * @var string Controller action
-     */
-    protected $action;
-
-    /**
-     * @var array View variables
-     */
-    protected $variables = [];
-
-    /**
-     * @var bool Should render view for controller action
-     */
-    protected $render = true;
-
-    /**
-     * @var string File path for layout template file
-     */
-    protected $layout;
-
-    /**
-     * @var string File path for view template file
-     */
-    protected $view;
-
-    /**
-     * @var array Headers for output
-     *
-     * @todo JSON content type
-     *
-     * Content-Type: application/javascript; charset=utf-8
-     */
-    protected $headers = [
-        'content-type' => 'Content-Type: text/html; charset=utf-8'
-    ];
-
-    /**
-     * @return string Controller name without namespace
-     */
-    public function getShortName()
-    {
-        return str_replace('Controller', null, (new \ReflectionClass($this))->getShortName());
-    }
-
-    /**
-     * @param string $action Controller action
-     *
-     * @throws ControllerActionNonexistentException
-     * @throws ControllerActionPrivateInsufficientAuthenticationException
-     * @throws ControllerActionProtectedInsufficientAuthenticationException
-     */
-    public function setAction($action)
-    {
-        /**
-         * Check if method exists and that access has been defined
-         */
-        if (!method_exists($this, $action) || !isset($this->access[$action])) {
-            throw new ControllerActionNonexistentException([get_class($this), $action]);
-        }
-
-        /**
-         * Check controller action access level if user is not authenticated
-         */
-        if (!$this->user) {
-            if ($this->access[$action] === self::ACTION_PRIVATE) {
-                throw new ControllerActionPrivateInsufficientAuthenticationException([get_class($this), $action]);
-            } elseif ($this->access[$action] === self::ACTION_PROTECTED) {
-                throw new ControllerActionProtectedInsufficientAuthenticationException([get_class($this), $action]);
-            }
-        }
-
-        /**
-         * Set controller action
-         */
-        $this->action = $action;
-    }
-
-    /**
-     * Call action
-     *
-     * @return array<string,array|string>|false Headers and output if render is enabled, otherwise FALSE
-     *
-     * @throws \LogicException If controller action is not set
-     */
-    public function callAction()
-    {
-        if (!isset($this->action)) {
-            throw new \LogicException('Controller action must be set before being called');
-        }
-
-        /**
-         * Before controller action hook
-         */
-        $this->beforeAction();
-
-        /**
-         * Call controller action
-         */
-        $action = $this->action;
-
-        $this->$action();
-
-        /**
-         * After controller action hook
-         */
-        $this->afterAction();
-
-        /**
-         * Render view
-         */
-        if ($this->render) {
-            $render = new HtmlRender($this->variables);
-
-            $output = $render->render(['_view' => $this->getViewTemplate(), '_layout' => $this->getLayoutTemplate()]);
-
-            return [
-                'headers' => $this->headers,
-                'output'  => $output
-            ];
-        }
-
-        return false;
-    }
-
-    /**
-     * Before controller action hook
-     *
-     * Called right before controller action is called
-     */
-    protected function beforeAction()
-    {
-        /**
-         * Set New Relic transaction name
-         */
-        if (extension_loaded('newrelic')) {
-            newrelic_name_transaction(sprintf('%s/%s', $this->getShortName(), $this->action));
-        }
-    }
-
-    /**
-     * After controller action hook
-     *
-     * Called right after controller action is called, but before rendering of the view
-     */
-    protected function afterAction()
-    {
-    }
-
-    /**
-     * Set view variable
-     *
-     * @param string $variable
-     * @param mixed  $value
-     */
-    protected function set($variable, $value)
-    {
-        $this->variables[$variable] = $value;
-    }
-
-    /**
-     * Get layout template
-     *
-     * @return string Layout template file path
-     */
-    protected function getLayoutTemplate()
-    {
-        $layout = $this->layout;
-
-        if (empty($layout)) {
-            $layout = 'View/Layout/default';
-        }
-
-        return "{$this->appPath}$layout.layout";
-    }
-
-    /**
-     * Get view template
-     *
-     * @return string View template file path
-     */
-    protected function getViewTemplate()
-    {
-        $view = $this->view;
-
-        if (empty($view)) {
-            $view = sprintf('View/%s/%s', $this->getShortName(), $this->action);
-        }
-
-        return "{$this->appPath}$view.view";
-    }
-
-    /**
-     * Set response code
-     *
-     * Supports 200 OK, 403 Forbidden, 404 Not Found & 500 Internal Server Error
-     *
-     * @param int $code HTTP response code
-     *
-     * @throws \InvalidArgumentException If unsupported code is provided
-     */
-    protected function setResponseCode($code)
-    {
-        switch ($code) {
-            case 200:
-                $text = 'OK';
-                break;
-
-            case 403:
-                $text = 'Forbidden';
-                break;
-
-            case 404:
-                $text = 'Not Found';
-                break;
-
-            case 500:
-                $text = 'Internal Server Error';
-                break;
-
-            default:
-                throw new \InvalidArgumentException("HTTP status '$code' is not implemented");
-                break;
-        }
-
-        /**
-         * Set header
-         */
-        // @todo test that running response code multiple times only results in one response code header
-        $this->headers['response_code'] = "HTTP/1.1 $code $text";
-    }
-
-    /**
-     * @param \PDO      $pdo
-     * @param string    $appPath
-     * @param null|User $user
-     */
-    public function __construct(\PDO $pdo, $appPath, User $user = null)
-    {
-        $this->pdo     = $pdo;
-        $this->appPath = $appPath;
-        $this->user    = $user;
-    }
+	/**
+	 * Controller action is publicly accessible
+	 */
+	const ACTION_PUBLIC = 0;
+
+	/**
+	 * Controller action requires authentication
+	 * Will redirect to login page if not authenticated
+	 */
+	const ACTION_PROTECTED = 1;
+
+	/**
+	 * Controller action requires authentication
+	 * Will result in an 404 if not authenticated
+	 */
+	const ACTION_PRIVATE = 2;
+
+	/**
+	 * @var array Controller action access rules
+	 */
+	protected $access = [];
+
+	/**
+	 * @var \PDO PDO
+	 */
+	protected $pdo;
+
+	/**
+	 * @var string App file path
+	 */
+	protected $appPath;
+
+	/**
+	 * @var null|User User
+	 */
+	protected $user;
+
+	/**
+	 * @var string Controller action
+	 */
+	protected $action;
+
+	/**
+	 * @var array View variables
+	 */
+	protected $variables = [];
+
+	/**
+	 * @var bool Should render view for controller action
+	 */
+	protected $render = true;
+
+	/**
+	 * @var string File path for layout template file
+	 */
+	protected $layout;
+
+	/**
+	 * @var string File path for view template file
+	 */
+	protected $view;
+
+	/**
+	 * @var array Headers for output
+	 *
+	 * @todo JSON content type
+	 *
+	 * Content-Type: application/javascript; charset=utf-8
+	 */
+	protected $headers = [
+		'content-type' => 'Content-Type: text/html; charset=utf-8'
+	];
+
+	/**
+	 * @return string Controller name without namespace
+	 */
+	public function getShortName()
+	{
+		return str_replace('Controller', null, (new \ReflectionClass($this))->getShortName());
+	}
+
+	/**
+	 * @param string $action Controller action
+	 *
+	 * @throws ControllerActionNonexistentException
+	 * @throws ControllerActionPrivateInsufficientAuthenticationException
+	 * @throws ControllerActionProtectedInsufficientAuthenticationException
+	 */
+	public function setAction($action)
+	{
+		/**
+		 * Check if method exists and that access has been defined
+		 */
+		if (!method_exists($this, $action) || !isset($this->access[$action])) {
+			throw new ControllerActionNonexistentException([get_class($this), $action]);
+		}
+
+		/**
+		 * Check controller action access level if user is not authenticated
+		 */
+		if (!$this->user) {
+			if ($this->access[$action] === self::ACTION_PRIVATE) {
+				throw new ControllerActionPrivateInsufficientAuthenticationException([get_class($this), $action]);
+			} elseif ($this->access[$action] === self::ACTION_PROTECTED) {
+				throw new ControllerActionProtectedInsufficientAuthenticationException([get_class($this), $action]);
+			}
+		}
+
+		/**
+		 * Set controller action
+		 */
+		$this->action = $action;
+	}
+
+	/**
+	 * Call action
+	 *
+	 * @return array<string,array|string>|false Headers and output if render is enabled, otherwise FALSE
+	 *
+	 * @throws \LogicException If controller action is not set
+	 */
+	public function callAction()
+	{
+		if (!isset($this->action)) {
+			throw new \LogicException('Controller action must be set before being called');
+		}
+
+		/**
+		 * Before controller action hook
+		 */
+		$this->beforeAction();
+
+		/**
+		 * Call controller action
+		 */
+		$action = $this->action;
+
+		$this->$action();
+
+		/**
+		 * After controller action hook
+		 */
+		$this->afterAction();
+
+		/**
+		 * Render view
+		 */
+		if ($this->render) {
+			$render = new HtmlRender($this->variables);
+
+			$output = $render->render(['_view' => $this->getViewTemplate(), '_layout' => $this->getLayoutTemplate()]);
+
+			return [
+				'headers' => $this->headers,
+				'output'  => $output
+			];
+		}
+
+		return false;
+	}
+
+	/**
+	 * Before controller action hook
+	 *
+	 * Called right before controller action is called
+	 */
+	protected function beforeAction()
+	{
+		/**
+		 * Set New Relic transaction name
+		 */
+		if (extension_loaded('newrelic')) {
+			newrelic_name_transaction(sprintf('%s/%s', $this->getShortName(), $this->action));
+		}
+	}
+
+	/**
+	 * After controller action hook
+	 *
+	 * Called right after controller action is called, but before rendering of the view
+	 */
+	protected function afterAction()
+	{
+	}
+
+	/**
+	 * Set view variable
+	 *
+	 * @param string $variable
+	 * @param mixed  $value
+	 */
+	protected function set($variable, $value)
+	{
+		$this->variables[$variable] = $value;
+	}
+
+	/**
+	 * Get layout template
+	 *
+	 * @return string Layout template file path
+	 */
+	protected function getLayoutTemplate()
+	{
+		$layout = $this->layout;
+
+		if (empty($layout)) {
+			$layout = 'View/Layout/default';
+		}
+
+		return "{$this->appPath}$layout.layout";
+	}
+
+	/**
+	 * Get view template
+	 *
+	 * @return string View template file path
+	 */
+	protected function getViewTemplate()
+	{
+		$view = $this->view;
+
+		if (empty($view)) {
+			$view = sprintf('View/%s/%s', $this->getShortName(), $this->action);
+		}
+
+		return "{$this->appPath}$view.view";
+	}
+
+	/**
+	 * Set response code
+	 *
+	 * Supports 200 OK, 403 Forbidden, 404 Not Found & 500 Internal Server Error
+	 *
+	 * @param int $code HTTP response code
+	 *
+	 * @throws \InvalidArgumentException If unsupported code is provided
+	 */
+	protected function setResponseCode($code)
+	{
+		switch ($code) {
+			case 200:
+				$text = 'OK';
+				break;
+
+			case 403:
+				$text = 'Forbidden';
+				break;
+
+			case 404:
+				$text = 'Not Found';
+				break;
+
+			case 500:
+				$text = 'Internal Server Error';
+				break;
+
+			default:
+				throw new \InvalidArgumentException("HTTP status '$code' is not implemented");
+				break;
+		}
+
+		/**
+		 * Set header
+		 */
+		// @todo test that running response code multiple times only results in one response code header
+		$this->headers['response_code'] = "HTTP/1.1 $code $text";
+	}
+
+	/**
+	 * @param \PDO      $pdo
+	 * @param string    $appPath
+	 * @param null|User $user
+	 */
+	public function __construct(\PDO $pdo, $appPath, User $user = null)
+	{
+		$this->pdo     = $pdo;
+		$this->appPath = $appPath;
+		$this->user    = $user;
+	}
 }

Braces +11 added lines, -22 removed lines

@@ -13,8 +13,7 @@ 
  *
  * @package Zortje\MVC\Controller
  */
-class Controller
-{
+class Controller {
 
     /**
      * Controller action is publicly accessible
@@ -92,8 +91,7 @@ 
     /**
      * @return string Controller name without namespace
      */
-    public function getShortName()
-    {
+    public function getShortName() {
         return str_replace('Controller', null, (new \ReflectionClass($this))->getShortName());
     }
 
@@ -104,8 +102,7 @@ 
      * @throws ControllerActionPrivateInsufficientAuthenticationException
      * @throws ControllerActionProtectedInsufficientAuthenticationException
      */
-    public function setAction($action)
-    {
+    public function setAction($action) {
         /**
          * Check if method exists and that access has been defined
          */
@@ -137,8 +134,7 @@ 
      *
      * @throws \LogicException If controller action is not set
      */
-    public function callAction()
-    {
+    public function callAction() {
         if (!isset($this->action)) {
             throw new \LogicException('Controller action must be set before being called');
         }
@@ -182,8 +178,7 @@ 
      *
      * Called right before controller action is called
      */
-    protected function beforeAction()
-    {
+    protected function beforeAction() {
         /**
          * Set New Relic transaction name
          */
@@ -197,8 +192,7 @@ 
      *
      * Called right after controller action is called, but before rendering of the view
      */
-    protected function afterAction()
-    {
+    protected function afterAction() {
     }
 
     /**
@@ -207,8 +201,7 @@ 
      * @param string $variable
      * @param mixed  $value
      */
-    protected function set($variable, $value)
-    {
+    protected function set($variable, $value) {
         $this->variables[$variable] = $value;
     }
 
@@ -217,8 +210,7 @@ 
      *
      * @return string Layout template file path
      */
-    protected function getLayoutTemplate()
-    {
+    protected function getLayoutTemplate() {
         $layout = $this->layout;
 
         if (empty($layout)) {
@@ -233,8 +225,7 @@ 
      *
      * @return string View template file path
      */
-    protected function getViewTemplate()
-    {
+    protected function getViewTemplate() {
         $view = $this->view;
 
         if (empty($view)) {
@@ -253,8 +244,7 @@ 
      *
      * @throws \InvalidArgumentException If unsupported code is provided
      */
-    protected function setResponseCode($code)
-    {
+    protected function setResponseCode($code) {
         switch ($code) {
             case 200:
                 $text = 'OK';
@@ -289,8 +279,7 @@ 
      * @param string    $appPath
      * @param null|User $user
      */
-    public function __construct(\PDO $pdo, $appPath, User $user = null)
-    {
+    public function __construct(\PDO $pdo, $appPath, User $user = null) {
         $this->pdo     = $pdo;
         $this->appPath = $appPath;
         $this->user    = $user;

src/Controller/ControllerFactory.php

Indentation +46 added lines, -46 removed lines

@@ -14,56 +14,56 @@
 class ControllerFactory
 {
 
-    /**
-     * @var \PDO PDO
-     */
-    protected $pdo;
+	/**
+	 * @var \PDO PDO
+	 */
+	protected $pdo;
 
-    /**
-     * @var string App file path
-     */
-    protected $appPath;
+	/**
+	 * @var string App file path
+	 */
+	protected $appPath;
 
-    /**
-     * @var null|User User
-     */
-    protected $user;
+	/**
+	 * @var null|User User
+	 */
+	protected $user;
 
-    /**
-     * Initialize controller
-     *
-     * @param string $controller Controller class name
-     *
-     * @return Controller Controller object
-     *
-     * @throws ControllerInvalidSuperclassException
-     * @throws ControllerNonexistentException
-     */
-    public function create($controller)
-    {
-        if (!class_exists($controller)) {
-            throw new ControllerNonexistentException([$controller]);
-        } elseif (!is_subclass_of($controller, Controller::class)) {
-            throw new ControllerInvalidSuperclassException([$controller]);
-        }
+	/**
+	 * Initialize controller
+	 *
+	 * @param string $controller Controller class name
+	 *
+	 * @return Controller Controller object
+	 *
+	 * @throws ControllerInvalidSuperclassException
+	 * @throws ControllerNonexistentException
+	 */
+	public function create($controller)
+	{
+		if (!class_exists($controller)) {
+			throw new ControllerNonexistentException([$controller]);
+		} elseif (!is_subclass_of($controller, Controller::class)) {
+			throw new ControllerInvalidSuperclassException([$controller]);
+		}
 
-        /**
-         * @var Controller $controller
-         */
-        $controller = new $controller($this->pdo, $this->appPath, $this->user);
+		/**
+		 * @var Controller $controller
+		 */
+		$controller = new $controller($this->pdo, $this->appPath, $this->user);
 
-        return $controller;
-    }
+		return $controller;
+	}
 
-    /**
-     * @param \PDO      $pdo
-     * @param string    $appPath
-     * @param null|User $user
-     */
-    public function __construct(\PDO $pdo, $appPath, User $user = null)
-    {
-        $this->pdo     = $pdo;
-        $this->appPath = $appPath;
-        $this->user    = $user;
-    }
+	/**
+	 * @param \PDO      $pdo
+	 * @param string    $appPath
+	 * @param null|User $user
+	 */
+	public function __construct(\PDO $pdo, $appPath, User $user = null)
+	{
+		$this->pdo     = $pdo;
+		$this->appPath = $appPath;
+		$this->user    = $user;
+	}
 }

Braces +3 added lines, -6 removed lines

@@ -11,8 +11,7 @@ 
  *
  * @package Zortje\MVC\Controller
  */
-class ControllerFactory
-{
+class ControllerFactory {
 
     /**
      * @var \PDO PDO
@@ -39,8 +38,7 @@ 
      * @throws ControllerInvalidSuperclassException
      * @throws ControllerNonexistentException
      */
-    public function create($controller)
-    {
+    public function create($controller) {
         if (!class_exists($controller)) {
             throw new ControllerNonexistentException([$controller]);
         } elseif (!is_subclass_of($controller, Controller::class)) {
@@ -60,8 +58,7 @@ 
      * @param string    $appPath
      * @param null|User $user
      */
-    public function __construct(\PDO $pdo, $appPath, User $user = null)
-    {
+    public function __construct(\PDO $pdo, $appPath, User $user = null) {
         $this->pdo     = $pdo;
         $this->appPath = $appPath;
         $this->user    = $user;

src/Controller/NotFoundController.php

Indentation +7 added lines, -7 removed lines

@@ -10,12 +10,12 @@
 class NotFoundController extends Controller
 {
 
-    protected $access = [
-        'index' => Controller::ACTION_PUBLIC
-    ];
+	protected $access = [
+		'index' => Controller::ACTION_PUBLIC
+	];
 
-    protected function index()
-    {
-        $this->setResponseCode(404);
-    }
+	protected function index()
+	{
+		$this->setResponseCode(404);
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -7,15 +7,13 @@
  *
  * @package Zortje\MVC\Controller
  */
-class NotFoundController extends Controller
-{
+class NotFoundController extends Controller {
 
     protected $access = [
         'index' => Controller::ACTION_PUBLIC
     ];
 
-    protected function index()
-    {
+    protected function index() {
         $this->setResponseCode(404);
     }
 }

src/Model/SQLCommand.php

Indentation +116 added lines, -116 removed lines

@@ -10,120 +10,120 @@
 class SQLCommand
 {
 
-    /**
-     * @var String Table name
-     */
-    private $tableName;
-
-    /**
-     * @var String[] Table columns
-     */
-    private $columns;
-
-    /**
-     * Create INSERT INTO command
-     *
-     * @return string INSERT INTO query
-     */
-    public function insertInto()
-    {
-        $tableColumnNames = $this->getColumnNames($this->columns);
-
-        $columns = $this->columns;
-        unset($columns['id']);
-
-        $tableColumnValues = $this->getColumnValues($columns);
-
-        return "INSERT INTO `$this->tableName` ($tableColumnNames) VALUES (NULL, $tableColumnValues);";
-    }
-
-    /**
-     * Create SELECT FROM command
-     *
-     * @return string SELECT FROM query
-     */
-    public function selectFrom()
-    {
-        $tableColumnNames = $this->getColumnNames($this->columns);
-
-        return "SELECT $tableColumnNames FROM `$this->tableName`;";
-    }
-
-    /**
-     * Create SELECT FROM command with WHERE
-     *
-     * @param string|string[] $keys WHERE keys
-     *
-     * @return string SELECT FROM query
-     */
-    public function selectFromWhere($keys)
-    {
-        $tableColumnNames = $this->getColumnNames($this->columns);
-
-        $where = $this->getWhereConditionFromKeys($keys);
-
-        return "SELECT $tableColumnNames FROM `$this->tableName` WHERE $where;";
-    }
-
-    /**
-     * Get columns names for SQL command
-     *
-     * @param String[] $columns
-     *
-     * @return string Column names for column list
-     */
-    protected function getColumnNames($columns)
-    {
-        $tableColumnNames = implode('`, `', array_keys($columns));
-
-        return "`{$tableColumnNames}`";
-    }
-
-    /**
-     * Get columns values for SQL command
-     *
-     * @param String[] $columns
-     *
-     * @return string Column names for column values
-     */
-    protected function getColumnValues($columns)
-    {
-        $tableColumnValues = implode(', :', array_keys($columns));
-
-        return ":{$tableColumnValues}";
-    }
-
-    /**
-     * Get WHERE condition for SQL command
-     *
-     * @param string|string[] $keys
-     *
-     * @return string
-     */
-    protected function getWhereConditionFromKeys($keys)
-    {
-        $where = [];
-
-        if (is_string($keys)) {
-            $keys = [$keys];
-        } elseif (!is_array($keys)) {
-            throw new \InvalidArgumentException('Keys must be a string or an array of strings');
-        }
-
-        foreach ($keys as $key) {
-            $where[] = "`$key` = :$key";
-        }
-
-        return implode(' AND ', $where);
-    }
-
-    /**
-     * @param String   $tableName
-     * @param String[] $columns
-     */
-    public function __construct($tableName, $columns)
-    {
-        $this->tableName = $tableName;
-        $this->columns   = $columns;
-    }
+	/**
+	 * @var String Table name
+	 */
+	private $tableName;
+
+	/**
+	 * @var String[] Table columns
+	 */
+	private $columns;
+
+	/**
+	 * Create INSERT INTO command
+	 *
+	 * @return string INSERT INTO query
+	 */
+	public function insertInto()
+	{
+		$tableColumnNames = $this->getColumnNames($this->columns);
+
+		$columns = $this->columns;
+		unset($columns['id']);
+
+		$tableColumnValues = $this->getColumnValues($columns);
+
+		return "INSERT INTO `$this->tableName` ($tableColumnNames) VALUES (NULL, $tableColumnValues);";
+	}
+
+	/**
+	 * Create SELECT FROM command
+	 *
+	 * @return string SELECT FROM query
+	 */
+	public function selectFrom()
+	{
+		$tableColumnNames = $this->getColumnNames($this->columns);
+
+		return "SELECT $tableColumnNames FROM `$this->tableName`;";
+	}
+
+	/**
+	 * Create SELECT FROM command with WHERE
+	 *
+	 * @param string|string[] $keys WHERE keys
+	 *
+	 * @return string SELECT FROM query
+	 */
+	public function selectFromWhere($keys)
+	{
+		$tableColumnNames = $this->getColumnNames($this->columns);
+
+		$where = $this->getWhereConditionFromKeys($keys);
+
+		return "SELECT $tableColumnNames FROM `$this->tableName` WHERE $where;";
+	}
+
+	/**
+	 * Get columns names for SQL command
+	 *
+	 * @param String[] $columns
+	 *
+	 * @return string Column names for column list
+	 */
+	protected function getColumnNames($columns)
+	{
+		$tableColumnNames = implode('`, `', array_keys($columns));
+
+		return "`{$tableColumnNames}`";
+	}
+
+	/**
+	 * Get columns values for SQL command
+	 *
+	 * @param String[] $columns
+	 *
+	 * @return string Column names for column values
+	 */
+	protected function getColumnValues($columns)
+	{
+		$tableColumnValues = implode(', :', array_keys($columns));
+
+		return ":{$tableColumnValues}";
+	}
+
+	/**
+	 * Get WHERE condition for SQL command
+	 *
+	 * @param string|string[] $keys
+	 *
+	 * @return string
+	 */
+	protected function getWhereConditionFromKeys($keys)
+	{
+		$where = [];
+
+		if (is_string($keys)) {
+			$keys = [$keys];
+		} elseif (!is_array($keys)) {
+			throw new \InvalidArgumentException('Keys must be a string or an array of strings');
+		}
+
+		foreach ($keys as $key) {
+			$where[] = "`$key` = :$key";
+		}
+
+		return implode(' AND ', $where);
+	}
+
+	/**
+	 * @param String   $tableName
+	 * @param String[] $columns
+	 */
+	public function __construct($tableName, $columns)
+	{
+		$this->tableName = $tableName;
+		$this->columns   = $columns;
+	}
 }

Braces +8 added lines, -16 removed lines

@@ -7,8 +7,7 @@ 
  *
  * @package Zortje\MVC\Model
  */
-class SQLCommand
-{
+class SQLCommand {
 
     /**
      * @var String Table name
@@ -25,8 +24,7 @@ 
      *
      * @return string INSERT INTO query
      */
-    public function insertInto()
-    {
+    public function insertInto() {
         $tableColumnNames = $this->getColumnNames($this->columns);
 
         $columns = $this->columns;
@@ -42,8 +40,7 @@ 
      *
      * @return string SELECT FROM query
      */
-    public function selectFrom()
-    {
+    public function selectFrom() {
         $tableColumnNames = $this->getColumnNames($this->columns);
 
         return "SELECT $tableColumnNames FROM `$this->tableName`;";
@@ -56,8 +53,7 @@ 
      *
      * @return string SELECT FROM query
      */
-    public function selectFromWhere($keys)
-    {
+    public function selectFromWhere($keys) {
         $tableColumnNames = $this->getColumnNames($this->columns);
 
         $where = $this->getWhereConditionFromKeys($keys);
@@ -72,8 +68,7 @@ 
      *
      * @return string Column names for column list
      */
-    protected function getColumnNames($columns)
-    {
+    protected function getColumnNames($columns) {
         $tableColumnNames = implode('`, `', array_keys($columns));
 
         return "`{$tableColumnNames}`";
@@ -86,8 +81,7 @@ 
      *
      * @return string Column names for column values
      */
-    protected function getColumnValues($columns)
-    {
+    protected function getColumnValues($columns) {
         $tableColumnValues = implode(', :', array_keys($columns));
 
         return ":{$tableColumnValues}";
@@ -100,8 +94,7 @@ 
      *
      * @return string
      */
-    protected function getWhereConditionFromKeys($keys)
-    {
+    protected function getWhereConditionFromKeys($keys) {
         $where = [];
 
         if (is_string($keys)) {
@@ -121,8 +114,7 @@ 
      * @param String   $tableName
      * @param String[] $columns
      */
-    public function __construct($tableName, $columns)
-    {
+    public function __construct($tableName, $columns) {
         $this->tableName = $tableName;
         $this->columns   = $columns;
     }

src/Model/Table/Entity/Entity.php

Indentation +161 added lines, -161 removed lines

@@ -13,165 +13,165 @@
 abstract class Entity
 {
 
-    /**
-     * @var array Columns
-     */
-    protected static $columns = [];
-
-    /**
-     * @var array Internal entity properties
-     */
-    protected $properties = [];
-
-    /**
-     * Get entity columns
-     *
-     * @return array Entity columns
-     */
-    public static function getColumns()
-    {
-        $columns = array_merge([
-            'id' => 'integer'
-        ], static::$columns);
-
-        $columns = array_merge($columns, [
-            'modified' => 'DateTime',
-            'created'  => 'DateTime'
-        ]);
-
-        return $columns;
-    }
-
-    /**
-     * Set entity property
-     *
-     * @param string                                          $key   Entity property name
-     * @param object|integer|double|string|array|boolean|null $value Entity property value
-     *
-     * @throws InvalidEntityPropertyException If entity does not have that property
-     * @throws InvalidValueTypeForEntityPropertyException If value is of the wrong type
-     */
-    public function set($key, $value)
-    {
-        if (!isset(self::getColumns()[$key])) {
-            throw new InvalidEntityPropertyException([get_class($this), $key]);
-        }
-
-        $this->properties[$key] = $this->validatePropertyForValue($key, $value);
-    }
-
-    /**
-     * Get entity property
-     *
-     * @param string $key Entity property
-     *
-     * @return object|integer|double|string|array|boolean|null Entity property value for given key
-     *
-     * @throws InvalidEntityPropertyException If entity does not have that property
-     */
-    public function get($key)
-    {
-        if (!isset(self::getColumns()[$key])) {
-            throw new InvalidEntityPropertyException([get_class($this), $key]);
-        }
-
-        return $this->properties[$key];
-    }
-
-    /**
-     * Return table structur for saving
-     * Example: `['table_field_name' => $this->fieldName]`
-     *
-     * @param bool $includeId Should the ID column be included
-     *
-     * @return array
-     */
-    public function toArray($includeId)
-    {
-        $array = [];
-
-        foreach (self::getColumns() as $column => $type) {
-            if ($column === 'id' && !$includeId) {
-                continue;
-            }
-
-            $property = new EntityProperty($type);
-
-            $value = $this->get($column);
-            $value = $property->formatValueForDatabase($value);
-
-            $array[":$column"] = $value;
-        }
-
-        return $array;
-    }
-
-    /**
-     * Validate property for given value
-     *
-     * @param string $key   Entity property name
-     * @param mixed  $value Entity property value
-     *
-     * @return object|integer|double|string|array|boolean|null Value
-     *
-     * @throws InvalidEntityPropertyException If entity does not have that property
-     * @throws InvalidValueTypeForEntityPropertyException If value is of the wrong type
-     */
-    protected function validatePropertyForValue($key, $value)
-    {
-        if (!isset(self::getColumns()[$key])) {
-            throw new InvalidEntityPropertyException([get_class($this), $key]);
-        }
-
-        /**
-         * Allow NULL
-         */
-        if (!is_null($value)) {
-            $valueType = gettype($value);
-
-            /**
-             * Get class if object
-             */
-            if ($valueType === 'object') {
-                $valueType = get_class($value);
-            }
-
-            /**
-             * Handle alias types
-             */
-            $columnType = self::getColumns()[$key];
-
-            switch ($columnType) {
-                case 'Date':
-                    $columnType = 'DateTime';
-                    break;
-            }
-
-            /**
-             * Validate type
-             */
-            if ($valueType !== $columnType) {
-                throw new InvalidValueTypeForEntityPropertyException([
-                    get_class($this),
-                    $key,
-                    $valueType,
-                    $columnType
-                ]);
-            }
-        }
-
-        return $value;
-    }
-
-    /**
-     * @param int       $id
-     * @param \DateTime $modified
-     * @param \DateTime $created
-     */
-    public function __construct($id, \DateTime $modified, \DateTime $created)
-    {
-        $this->set('id', $id);
-        $this->set('modified', $modified);
-        $this->set('created', $created);
-    }
+	/**
+	 * @var array Columns
+	 */
+	protected static $columns = [];
+
+	/**
+	 * @var array Internal entity properties
+	 */
+	protected $properties = [];
+
+	/**
+	 * Get entity columns
+	 *
+	 * @return array Entity columns
+	 */
+	public static function getColumns()
+	{
+		$columns = array_merge([
+			'id' => 'integer'
+		], static::$columns);
+
+		$columns = array_merge($columns, [
+			'modified' => 'DateTime',
+			'created'  => 'DateTime'
+		]);
+
+		return $columns;
+	}
+
+	/**
+	 * Set entity property
+	 *
+	 * @param string                                          $key   Entity property name
+	 * @param object|integer|double|string|array|boolean|null $value Entity property value
+	 *
+	 * @throws InvalidEntityPropertyException If entity does not have that property
+	 * @throws InvalidValueTypeForEntityPropertyException If value is of the wrong type
+	 */
+	public function set($key, $value)
+	{
+		if (!isset(self::getColumns()[$key])) {
+			throw new InvalidEntityPropertyException([get_class($this), $key]);
+		}
+
+		$this->properties[$key] = $this->validatePropertyForValue($key, $value);
+	}
+
+	/**
+	 * Get entity property
+	 *
+	 * @param string $key Entity property
+	 *
+	 * @return object|integer|double|string|array|boolean|null Entity property value for given key
+	 *
+	 * @throws InvalidEntityPropertyException If entity does not have that property
+	 */
+	public function get($key)
+	{
+		if (!isset(self::getColumns()[$key])) {
+			throw new InvalidEntityPropertyException([get_class($this), $key]);
+		}
+
+		return $this->properties[$key];
+	}
+
+	/**
+	 * Return table structur for saving
+	 * Example: `['table_field_name' => $this->fieldName]`
+	 *
+	 * @param bool $includeId Should the ID column be included
+	 *
+	 * @return array
+	 */
+	public function toArray($includeId)
+	{
+		$array = [];
+
+		foreach (self::getColumns() as $column => $type) {
+			if ($column === 'id' && !$includeId) {
+				continue;
+			}
+
+			$property = new EntityProperty($type);
+
+			$value = $this->get($column);
+			$value = $property->formatValueForDatabase($value);
+
+			$array[":$column"] = $value;
+		}
+
+		return $array;
+	}
+
+	/**
+	 * Validate property for given value
+	 *
+	 * @param string $key   Entity property name
+	 * @param mixed  $value Entity property value
+	 *
+	 * @return object|integer|double|string|array|boolean|null Value
+	 *
+	 * @throws InvalidEntityPropertyException If entity does not have that property
+	 * @throws InvalidValueTypeForEntityPropertyException If value is of the wrong type
+	 */
+	protected function validatePropertyForValue($key, $value)
+	{
+		if (!isset(self::getColumns()[$key])) {
+			throw new InvalidEntityPropertyException([get_class($this), $key]);
+		}
+
+		/**
+		 * Allow NULL
+		 */
+		if (!is_null($value)) {
+			$valueType = gettype($value);
+
+			/**
+			 * Get class if object
+			 */
+			if ($valueType === 'object') {
+				$valueType = get_class($value);
+			}
+
+			/**
+			 * Handle alias types
+			 */
+			$columnType = self::getColumns()[$key];
+
+			switch ($columnType) {
+				case 'Date':
+					$columnType = 'DateTime';
+					break;
+			}
+
+			/**
+			 * Validate type
+			 */
+			if ($valueType !== $columnType) {
+				throw new InvalidValueTypeForEntityPropertyException([
+					get_class($this),
+					$key,
+					$valueType,
+					$columnType
+				]);
+			}
+		}
+
+		return $value;
+	}
+
+	/**
+	 * @param int       $id
+	 * @param \DateTime $modified
+	 * @param \DateTime $created
+	 */
+	public function __construct($id, \DateTime $modified, \DateTime $created)
+	{
+		$this->set('id', $id);
+		$this->set('modified', $modified);
+		$this->set('created', $created);
+	}
 }

Braces +7 added lines, -14 removed lines

@@ -10,8 +10,7 @@ 
  *
  * @package Zortje\MVC\Model\Table\Entity
  */
-abstract class Entity
-{
+abstract class Entity {
 
     /**
      * @var array Columns
@@ -28,8 +27,7 @@ 
      *
      * @return array Entity columns
      */
-    public static function getColumns()
-    {
+    public static function getColumns() {
         $columns = array_merge([
             'id' => 'integer'
         ], static::$columns);
@@ -51,8 +49,7 @@ 
      * @throws InvalidEntityPropertyException If entity does not have that property
      * @throws InvalidValueTypeForEntityPropertyException If value is of the wrong type
      */
-    public function set($key, $value)
-    {
+    public function set($key, $value) {
         if (!isset(self::getColumns()[$key])) {
             throw new InvalidEntityPropertyException([get_class($this), $key]);
         }
@@ -69,8 +66,7 @@ 
      *
      * @throws InvalidEntityPropertyException If entity does not have that property
      */
-    public function get($key)
-    {
+    public function get($key) {
         if (!isset(self::getColumns()[$key])) {
             throw new InvalidEntityPropertyException([get_class($this), $key]);
         }
@@ -86,8 +82,7 @@ 
      *
      * @return array
      */
-    public function toArray($includeId)
-    {
+    public function toArray($includeId) {
         $array = [];
 
         foreach (self::getColumns() as $column => $type) {
@@ -117,8 +112,7 @@ 
      * @throws InvalidEntityPropertyException If entity does not have that property
      * @throws InvalidValueTypeForEntityPropertyException If value is of the wrong type
      */
-    protected function validatePropertyForValue($key, $value)
-    {
+    protected function validatePropertyForValue($key, $value) {
         if (!isset(self::getColumns()[$key])) {
             throw new InvalidEntityPropertyException([get_class($this), $key]);
         }
@@ -168,8 +162,7 @@ 
      * @param \DateTime $modified
      * @param \DateTime $created
      */
-    public function __construct($id, \DateTime $modified, \DateTime $created)
-    {
+    public function __construct($id, \DateTime $modified, \DateTime $created) {
         $this->set('id', $id);
         $this->set('modified', $modified);
         $this->set('created', $created);

src/Model/Table/Entity/EntityFactory.php

Indentation +45 added lines, -45 removed lines

@@ -10,49 +10,49 @@
 class EntityFactory
 {
 
-    /**
-     * @var String Entity class
-     */
-    protected $entityClass;
-
-    /**
-     * @param array $array
-     *
-     * @return object
-     */
-    public function createFromArray(array $array)
-    {
-        /**
-         * @var Entity $entity
-         */
-        $reflector = new \ReflectionClass($this->entityClass);
-
-        $entity = $reflector->newInstanceWithoutConstructor();
-
-        $columns = $entity::getColumns();
-        unset($columns['id'], $columns['modified'], $columns['created']);
-
-        $arguments = [];
-
-        foreach ($columns as $column => $type) {
-            $property = new EntityProperty($type);
-
-            $arguments[$column] = $property->formatValueForEntity($array[$column]);
-        }
-
-        $entity = $reflector->newInstanceArgs($arguments);
-        $entity->set('id', (int) $array['id']);
-        $entity->set('modified', new \DateTime($array['modified']));
-        $entity->set('created', new \DateTime($array['created']));
-
-        return $entity;
-    }
-
-    /**
-     * @param string $entityClass
-     */
-    public function __construct($entityClass)
-    {
-        $this->entityClass = $entityClass;
-    }
+	/**
+	 * @var String Entity class
+	 */
+	protected $entityClass;
+
+	/**
+	 * @param array $array
+	 *
+	 * @return object
+	 */
+	public function createFromArray(array $array)
+	{
+		/**
+		 * @var Entity $entity
+		 */
+		$reflector = new \ReflectionClass($this->entityClass);
+
+		$entity = $reflector->newInstanceWithoutConstructor();
+
+		$columns = $entity::getColumns();
+		unset($columns['id'], $columns['modified'], $columns['created']);
+
+		$arguments = [];
+
+		foreach ($columns as $column => $type) {
+			$property = new EntityProperty($type);
+
+			$arguments[$column] = $property->formatValueForEntity($array[$column]);
+		}
+
+		$entity = $reflector->newInstanceArgs($arguments);
+		$entity->set('id', (int) $array['id']);
+		$entity->set('modified', new \DateTime($array['modified']));
+		$entity->set('created', new \DateTime($array['created']));
+
+		return $entity;
+	}
+
+	/**
+	 * @param string $entityClass
+	 */
+	public function __construct($entityClass)
+	{
+		$this->entityClass = $entityClass;
+	}
 }

Braces +3 added lines, -6 removed lines

@@ -7,8 +7,7 @@ 
  *
  * @package Zortje\MVC\Model\Table\Entity
  */
-class EntityFactory
-{
+class EntityFactory {
 
     /**
      * @var String Entity class
@@ -20,8 +19,7 @@ 
      *
      * @return object
      */
-    public function createFromArray(array $array)
-    {
+    public function createFromArray(array $array) {
         /**
          * @var Entity $entity
          */
@@ -51,8 +49,7 @@ 
     /**
      * @param string $entityClass
      */
-    public function __construct($entityClass)
-    {
+    public function __construct($entityClass) {
         $this->entityClass = $entityClass;
     }
 }

src/Model/Table/Entity/EntityProperty.php

Indentation +62 added lines, -62 removed lines

@@ -10,75 +10,75 @@
 class EntityProperty
 {
 
-    /**
-     * @var string Entity property type
-     */
-    protected $type;
+	/**
+	 * @var string Entity property type
+	 */
+	protected $type;
 
-    /**
-     * Format value according to entity property type
-     *
-     * @param mixed $value Value
-     *
-     * @return mixed Value
-     */
-    public function formatValueForEntity($value)
-    {
-        switch ($this->type) {
-            case 'string':
-                $value = "$value";
-                break;
+	/**
+	 * Format value according to entity property type
+	 *
+	 * @param mixed $value Value
+	 *
+	 * @return mixed Value
+	 */
+	public function formatValueForEntity($value)
+	{
+		switch ($this->type) {
+			case 'string':
+				$value = "$value";
+				break;
 
-            case 'integer':
-                $value = (int) $value;
-                break;
+			case 'integer':
+				$value = (int) $value;
+				break;
 
-            case 'float':
-                $value = (float) $value;
-                break;
+			case 'float':
+				$value = (float) $value;
+				break;
 
-            case 'Date':
-            case 'DateTime':
-                $value = new \DateTime($value);
-                break;
-        }
+			case 'Date':
+			case 'DateTime':
+				$value = new \DateTime($value);
+				break;
+		}
 
-        return $value;
-    }
+		return $value;
+	}
 
-    /**
-     * Format value for insertion into the database
-     *
-     * @param mixed $value Value
-     *
-     * @return mixed Value
-     */
-    public function formatValueForDatabase($value)
-    {
-        switch ($this->type) {
-            case 'Date':
-                /**
-                 * @var \DateTime $value
-                 */
-                $value = $value->format('Y-m-d');
-                break;
+	/**
+	 * Format value for insertion into the database
+	 *
+	 * @param mixed $value Value
+	 *
+	 * @return mixed Value
+	 */
+	public function formatValueForDatabase($value)
+	{
+		switch ($this->type) {
+			case 'Date':
+				/**
+				 * @var \DateTime $value
+				 */
+				$value = $value->format('Y-m-d');
+				break;
 
-            case 'DateTime':
-                /**
-                 * @var \DateTime $value
-                 */
-                $value = $value->format('Y-m-d H:i:s');
-                break;
-        }
+			case 'DateTime':
+				/**
+				 * @var \DateTime $value
+				 */
+				$value = $value->format('Y-m-d H:i:s');
+				break;
+		}
 
-        return $value;
-    }
+		return $value;
+	}
 
-    /**
-     * @param string $type
-     */
-    public function __construct($type)
-    {
-        $this->type = $type;
-    }
+	/**
+	 * @param string $type
+	 */
+	public function __construct($type)
+	{
+		$this->type = $type;
+	}
 }

Braces +4 added lines, -8 removed lines

@@ -7,8 +7,7 @@ 
  *
  * @package Zortje\MVC\Model\Table\Entity
  */
-class EntityProperty
-{
+class EntityProperty {
 
     /**
      * @var string Entity property type
@@ -22,8 +21,7 @@ 
      *
      * @return mixed Value
      */
-    public function formatValueForEntity($value)
-    {
+    public function formatValueForEntity($value) {
         switch ($this->type) {
             case 'string':
                 $value = "$value";
@@ -53,8 +51,7 @@ 
      *
      * @return mixed Value
      */
-    public function formatValueForDatabase($value)
-    {
+    public function formatValueForDatabase($value) {
         switch ($this->type) {
             case 'Date':
                 /**
@@ -77,8 +74,7 @@ 
     /**
      * @param string $type
      */
-    public function __construct($type)
-    {
+    public function __construct($type) {
         $this->type = $type;
     }
 }

src/Model/Table/Entity/Exception/EntityClassNonexistentException.php

Indentation +11 added lines, -11 removed lines

@@ -12,16 +12,16 @@
 class EntityClassNonexistentException extends Exception
 {
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $template = 'Subclass %s defined entity class %s is nonexistent';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $template = 'Subclass %s defined entity class %s is nonexistent';
 
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($message)
-    {
-        parent::__construct($message);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function __construct($message)
+	{
+		parent::__construct($message);
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -9,8 +9,7 @@ 
  *
  * @package Zortje\MVC\Model\Table\Entity\Exception
  */
-class EntityClassNonexistentException extends Exception
-{
+class EntityClassNonexistentException extends Exception {
 
     /**
      * {@inheritdoc}
@@ -20,8 +19,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function __construct($message)
-    {
+    public function __construct($message) {
         parent::__construct($message);
     }
 }

src/Model/Table/Entity/Exception/EntityClassNotDefinedException.php

Indentation +11 added lines, -11 removed lines

@@ -12,16 +12,16 @@
 class EntityClassNotDefinedException extends Exception
 {
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $template = 'Subclass %s does not have a entity class defined';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $template = 'Subclass %s does not have a entity class defined';
 
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($message)
-    {
-        parent::__construct($message);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function __construct($message)
+	{
+		parent::__construct($message);
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -9,8 +9,7 @@ 
  *
  * @package Zortje\MVC\Model\Table\Entity\Exception
  */
-class EntityClassNotDefinedException extends Exception
-{
+class EntityClassNotDefinedException extends Exception {
 
     /**
      * {@inheritdoc}
@@ -20,8 +19,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function __construct($message)
-    {
+    public function __construct($message) {
         parent::__construct($message);
     }
 }