zortje / mvc

src/Common/Exception/Exception.php

Indentation +16 added lines, -16 removed lines

@@ -10,22 +10,22 @@
 class Exception extends \Exception
 {
 
-    /**
-     * @var string
-     */
-    protected $template = '';
+	/**
+	 * @var string
+	 */
+	protected $template = '';
 
-    /**
-     * @param string          $message
-     * @param int             $code
-     * @param null|\Exception $previous
-     */
-    public function __construct($message, $code = 0, \Exception $previous = null)
-    {
-        if (is_array($message)) {
-            $message = vsprintf($this->template, $message);
-        }
+	/**
+	 * @param string          $message
+	 * @param int             $code
+	 * @param null|\Exception $previous
+	 */
+	public function __construct($message, $code = 0, \Exception $previous = null)
+	{
+		if (is_array($message)) {
+			$message = vsprintf($this->template, $message);
+		}
 
-        parent::__construct($message, $code, $previous);
-    }
+		parent::__construct($message, $code, $previous);
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -7,8 +7,7 @@ 
  *
  * @package Zortje\MVC\Common\Exception
  */
-class Exception extends \Exception
-{
+class Exception extends \Exception {
 
     /**
      * @var string
@@ -20,8 +19,7 @@ 
      * @param int             $code
      * @param null|\Exception $previous
      */
-    public function __construct($message, $code = 0, \Exception $previous = null)
-    {
+    public function __construct($message, $code = 0, \Exception $previous = null) {
         if (is_array($message)) {
             $message = vsprintf($this->template, $message);
         }

src/Controller/Exception/ControllerActionNonexistentException.php

Indentation +11 added lines, -11 removed lines

@@ -12,17 +12,17 @@
 class ControllerActionNonexistentException extends Exception
 {
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $template = 'Controller %s action %s is nonexistent';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $template = 'Controller %s action %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\Controller\Exception
  */
-class ControllerActionNonexistentException extends Exception
-{
+class ControllerActionNonexistentException extends Exception {
 
     /**
      * {@inheritdoc}
@@ -20,8 +19,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function __construct($message)
-    {
+    public function __construct($message) {
         parent::__construct($message);
     }
 

src/Controller/Exception/ControllerActionPrivateInsufficientAuthenticationException.php

Indentation +11 added lines, -11 removed lines

@@ -12,17 +12,17 @@
 class ControllerActionPrivateInsufficientAuthenticationException extends Exception
 {
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $template = 'Controller %s private action %s requires authentication';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $template = 'Controller %s private action %s requires authentication';
 
-    /**
-     * {@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\Controller\Exception
  */
-class ControllerActionPrivateInsufficientAuthenticationException extends Exception
-{
+class ControllerActionPrivateInsufficientAuthenticationException extends Exception {
 
     /**
      * {@inheritdoc}
@@ -20,8 +19,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function __construct($message)
-    {
+    public function __construct($message) {
         parent::__construct($message);
     }
 

src/Controller/Exception/ControllerActionProtectedInsufficientAuthenticationException.php

Indentation +11 added lines, -11 removed lines

@@ -12,17 +12,17 @@
 class ControllerActionProtectedInsufficientAuthenticationException extends Exception
 {
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $template = 'Controller %s protected action %s requires authentication';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $template = 'Controller %s protected action %s requires authentication';
 
-    /**
-     * {@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\Controller\Exception
  */
-class ControllerActionProtectedInsufficientAuthenticationException extends Exception
-{
+class ControllerActionProtectedInsufficientAuthenticationException extends Exception {
 
     /**
      * {@inheritdoc}
@@ -20,8 +19,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function __construct($message)
-    {
+    public function __construct($message) {
         parent::__construct($message);
     }
 

src/Controller/Exception/ControllerInvalidSuperclassException.php

Indentation +11 added lines, -11 removed lines

@@ -12,17 +12,17 @@
 class ControllerInvalidSuperclassException extends Exception
 {
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $template = 'Controller %s is not a subclass of Controller';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $template = 'Controller %s is not a subclass of Controller';
 
-    /**
-     * {@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\Controller\Exception
  */
-class ControllerInvalidSuperclassException extends Exception
-{
+class ControllerInvalidSuperclassException extends Exception {
 
     /**
      * {@inheritdoc}
@@ -20,8 +19,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function __construct($message)
-    {
+    public function __construct($message) {
         parent::__construct($message);
     }
 

src/Controller/Exception/ControllerNonexistentException.php

Indentation +11 added lines, -11 removed lines

@@ -12,17 +12,17 @@
 class ControllerNonexistentException extends Exception
 {
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $template = 'Controller %s is nonexistent';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $template = 'Controller %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\Controller\Exception
  */
-class ControllerNonexistentException extends Exception
-{
+class ControllerNonexistentException extends Exception {
 
     /**
      * {@inheritdoc}
@@ -20,8 +19,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function __construct($message)
-    {
+    public function __construct($message) {
         parent::__construct($message);
     }
 

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);
     }
 }