zortje / mvc

src/Model/Table/Exception/TableNameNotDefinedException.php

Indentation +11 added lines, -11 removed lines

@@ -12,16 +12,16 @@
 class TableNameNotDefinedException extends Exception
 {
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $template = 'Subclass %s does not have a table name defined';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $template = 'Subclass %s does not have a table name 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\Exception
  */
-class TableNameNotDefinedException extends Exception
-{
+class TableNameNotDefinedException extends Exception {
 
     /**
      * {@inheritdoc}
@@ -20,8 +19,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function __construct($message)
-    {
+    public function __construct($message) {
         parent::__construct($message);
     }
 }

src/Model/User.php

Braces +1 added lines, -2 removed lines

@@ -9,7 +9,6 @@
  *
  * @package Zortje\MVC\Model
  */
-class User extends Entity
-{
+class User extends Entity {
 
 }

src/Network/Request.php

Indentation +35 added lines, -35 removed lines

@@ -10,39 +10,39 @@
 class Request
 {
 
-    /**
-     * @var string Full URL
-     */
-    protected $url;
-
-    /**
-     * @var array POST data
-     */
-    protected $post;
-
-    /**
-     * Get request URL path
-     *
-     * @return string URL path
-     */
-    public function getPath()
-    {
-        $path = parse_url($this->url, PHP_URL_PATH);
-
-        if ($path === false) {
-            $path = '';
-        }
-
-        return $path;
-    }
-
-    /**
-     * @param string $url  URL of the request, trailing slash are removed automatically
-     * @param array  $post URL post fields
-     */
-    public function __construct($url, array $post)
-    {
-        $this->url  = rtrim($url, '/');
-        $this->post = $post;
-    }
+	/**
+	 * @var string Full URL
+	 */
+	protected $url;
+
+	/**
+	 * @var array POST data
+	 */
+	protected $post;
+
+	/**
+	 * Get request URL path
+	 *
+	 * @return string URL path
+	 */
+	public function getPath()
+	{
+		$path = parse_url($this->url, PHP_URL_PATH);
+
+		if ($path === false) {
+			$path = '';
+		}
+
+		return $path;
+	}
+
+	/**
+	 * @param string $url  URL of the request, trailing slash are removed automatically
+	 * @param array  $post URL post fields
+	 */
+	public function __construct($url, array $post)
+	{
+		$this->url  = rtrim($url, '/');
+		$this->post = $post;
+	}
 }

Braces +3 added lines, -6 removed lines

@@ -7,8 +7,7 @@ 
  *
  * @package Zortje\MVC\Network
  */
-class Request
-{
+class Request {
 
     /**
      * @var string Full URL
@@ -25,8 +24,7 @@ 
      *
      * @return string URL path
      */
-    public function getPath()
-    {
+    public function getPath() {
         $path = parse_url($this->url, PHP_URL_PATH);
 
         if ($path === false) {
@@ -40,8 +38,7 @@ 
      * @param string $url  URL of the request, trailing slash are removed automatically
      * @param array  $post URL post fields
      */
-    public function __construct($url, array $post)
-    {
+    public function __construct($url, array $post) {
         $this->url  = rtrim($url, '/');
         $this->post = $post;
     }

src/Network/Response.php

Indentation +27 added lines, -27 removed lines

@@ -10,34 +10,34 @@
 class Response
 {
 
-    /**
-     * @var array HTTP headers
-     */
-    protected $headers = [];
+	/**
+	 * @var array HTTP headers
+	 */
+	protected $headers = [];
 
-    /**
-     * @var string Output
-     */
-    protected $output;
+	/**
+	 * @var string Output
+	 */
+	protected $output;
 
-    /**
-     * @return array
-     */
-    public function output()
-    {
-        return [
-            'headers' => $this->headers,
-            'output'  => $this->output
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function output()
+	{
+		return [
+			'headers' => $this->headers,
+			'output'  => $this->output
+		];
+	}
 
-    /**
-     * @param array  $headers
-     * @param string $output
-     */
-    public function __construct($headers, $output)
-    {
-        $this->headers = $headers;
-        $this->output  = $output;
-    }
+	/**
+	 * @param array  $headers
+	 * @param string $output
+	 */
+	public function __construct($headers, $output)
+	{
+		$this->headers = $headers;
+		$this->output  = $output;
+	}
 }

Braces +3 added lines, -6 removed lines

@@ -7,8 +7,7 @@ 
  *
  * @package Zortje\MVC\Network
  */
-class Response
-{
+class Response {
 
     /**
      * @var array HTTP headers
@@ -23,8 +22,7 @@ 
     /**
      * @return array
      */
-    public function output()
-    {
+    public function output() {
         return [
             'headers' => $this->headers,
             'output'  => $this->output
@@ -35,8 +33,7 @@ 
      * @param array  $headers
      * @param string $output
      */
-    public function __construct($headers, $output)
-    {
+    public function __construct($headers, $output) {
         $this->headers = $headers;
         $this->output  = $output;
     }

src/Routing/Dispatcher.php

Indentation +174 added lines, -174 removed lines

@@ -23,179 +23,179 @@
 class Dispatcher
 {
 
-    /**
-     * @var Router
-     */
-    protected $router;
-
-    /**
-     * @var \PDO PDO
-     */
-    protected $pdo;
-
-    /**
-     * @var string App file path
-     */
-    protected $appPath;
-
-    /**
-     * @var null|User User
-     */
-    protected $user;
-
-    /**
-     * @var Logger
-     */
-    protected $logger;
-
-    /**
-     * Set logger to be used for any logging that could occure in the dispatching process
-     *
-     * @param Logger $logger
-     */
-    public function setLogger(Logger $logger)
-    {
-        $this->logger = $logger;
-    }
-
-    /**
-     * @param Request $request Request object
-     *
-     * @return Response Reponse object
-     *
-     * @throws \Exception If unexpected exception is thrown
-     */
-    public function dispatch(Request $request)
-    {
-        $controllerFactory = new ControllerFactory($this->pdo, $this->appPath, $this->user);
-
-        try {
-            list($controllerName, $action) = array_values($this->router->route($request->getPath()));
-
-            /**
-             * Validate and initialize controller
-             */
-            try {
-                $controller = $controllerFactory->create($controllerName);
-            } catch (\Exception $e) {
-                if ($e instanceof ControllerNonexistentException || $e instanceof ControllerInvalidSuperclassException) {
-                    /**
-                     * Log invalid superclass
-                     */
-                    if ($this->logger && $e instanceof ControllerInvalidSuperclassException) {
-                        $this->logger->addCritical('Controller must be an subclass of Zortje\MVC\Controller', [
-                            'path'       => $request->getPath(),
-                            'controller' => $controllerName
-                        ]);
-                    }
-
-                    /**
-                     * Log nonexistent
-                     */
-                    if ($this->logger && $e instanceof ControllerNonexistentException) {
-                        $this->logger->addCritical('Controller is nonexistent', [
-                            'path'       => $request->getPath(),
-                            'controller' => $controllerName
-                        ]);
-                    }
-
-                    $controller = $controllerFactory->create(NotFoundController::class);
-                    $action     = 'index';
-                } else {
-                    throw $e;
-                }
-            }
-        } catch (RouteNonexistentException $e) {
-            /**
-             * Log nonexistent route (404)
-             */
-            if ($this->logger) {
-                $this->logger->addWarning('Route not connected', [
-                    'path' => $request->getPath()
-                ]);
-            }
-
-            $controller = $controllerFactory->create(NotFoundController::class);
-            $action     = 'index';
-        }
-
-        /**
-         * Validate and set controller action
-         */
-        try {
-            $controller->setAction($action);
-        } catch (ControllerActionProtectedInsufficientAuthenticationException $e) {
-            /**
-             * Log unauthed protected controller action (403)
-             */
-            if ($this->logger) {
-                $this->logger->addWarning('Unauthenticated attempt to access protected action', [
-                    'path'       => $request->getPath(),
-                    'controller' => $controller->getShortName(),
-                    'action'     => $action
-                ]);
-            }
-
-            // @todo redirect to login page & and save what action was requested to redirect after successful login
-
-        } catch (ControllerActionPrivateInsufficientAuthenticationException $e) {
-            /**
-             * Log unauthed private controller action (403)
-             */
-            if ($this->logger) {
-                $this->logger->addWarning('Unauthenticated attempt to access private action', [
-                    'path'       => $request->getPath(),
-                    'controller' => $controller->getShortName(),
-                    'action'     => $action
-                ]);
-            }
-
-            $controller = $controllerFactory->create(NotFoundController::class);
-        } catch (ControllerActionNonexistentException $e) {
-            /**
-             * Log nonexistent controller action
-             */
-            if ($this->logger) {
-                $this->logger->addCritical('Controller action is nonexistent', [
-                    'path'       => $request->getPath(),
-                    'controller' => $controller->getShortName(),
-                    'action'     => $action
-                ]);
-            }
-
-            $controller = $controllerFactory->create(NotFoundController::class);
-        }
-
-        /**
-         * Create response from controller action headers and output
-         */
-        list($headers, $output) = array_values($controller->callAction());
-
-        /**
-         * Performance logging
-         */
-        if ($this->logger) {
-            $this->logger->addDebug(vsprintf('Dispatched request in %s ms',
-                number_format((microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']) * 1000, 2)), [
-                'path' => $request->getPath()
-            ]);
-        }
-
-        return new Response($headers, $output);
-    }
-
-    /**
-     * @param Router    $router
-     * @param \PDO      $pdo
-     * @param string    $appPath
-     * @param null|User $user
-     */
-    public function __construct(Router $router, \PDO $pdo, $appPath, User $user = null)
-    {
-        $this->router  = $router;
-        $this->pdo     = $pdo;
-        $this->appPath = $appPath;
-        $this->user    = $user;
-    }
+	/**
+	 * @var Router
+	 */
+	protected $router;
+
+	/**
+	 * @var \PDO PDO
+	 */
+	protected $pdo;
+
+	/**
+	 * @var string App file path
+	 */
+	protected $appPath;
+
+	/**
+	 * @var null|User User
+	 */
+	protected $user;
+
+	/**
+	 * @var Logger
+	 */
+	protected $logger;
+
+	/**
+	 * Set logger to be used for any logging that could occure in the dispatching process
+	 *
+	 * @param Logger $logger
+	 */
+	public function setLogger(Logger $logger)
+	{
+		$this->logger = $logger;
+	}
+
+	/**
+	 * @param Request $request Request object
+	 *
+	 * @return Response Reponse object
+	 *
+	 * @throws \Exception If unexpected exception is thrown
+	 */
+	public function dispatch(Request $request)
+	{
+		$controllerFactory = new ControllerFactory($this->pdo, $this->appPath, $this->user);
+
+		try {
+			list($controllerName, $action) = array_values($this->router->route($request->getPath()));
+
+			/**
+			 * Validate and initialize controller
+			 */
+			try {
+				$controller = $controllerFactory->create($controllerName);
+			} catch (\Exception $e) {
+				if ($e instanceof ControllerNonexistentException || $e instanceof ControllerInvalidSuperclassException) {
+					/**
+					 * Log invalid superclass
+					 */
+					if ($this->logger && $e instanceof ControllerInvalidSuperclassException) {
+						$this->logger->addCritical('Controller must be an subclass of Zortje\MVC\Controller', [
+							'path'       => $request->getPath(),
+							'controller' => $controllerName
+						]);
+					}
+
+					/**
+					 * Log nonexistent
+					 */
+					if ($this->logger && $e instanceof ControllerNonexistentException) {
+						$this->logger->addCritical('Controller is nonexistent', [
+							'path'       => $request->getPath(),
+							'controller' => $controllerName
+						]);
+					}
+
+					$controller = $controllerFactory->create(NotFoundController::class);
+					$action     = 'index';
+				} else {
+					throw $e;
+				}
+			}
+		} catch (RouteNonexistentException $e) {
+			/**
+			 * Log nonexistent route (404)
+			 */
+			if ($this->logger) {
+				$this->logger->addWarning('Route not connected', [
+					'path' => $request->getPath()
+				]);
+			}
+
+			$controller = $controllerFactory->create(NotFoundController::class);
+			$action     = 'index';
+		}
+
+		/**
+		 * Validate and set controller action
+		 */
+		try {
+			$controller->setAction($action);
+		} catch (ControllerActionProtectedInsufficientAuthenticationException $e) {
+			/**
+			 * Log unauthed protected controller action (403)
+			 */
+			if ($this->logger) {
+				$this->logger->addWarning('Unauthenticated attempt to access protected action', [
+					'path'       => $request->getPath(),
+					'controller' => $controller->getShortName(),
+					'action'     => $action
+				]);
+			}
+
+			// @todo redirect to login page & and save what action was requested to redirect after successful login
+
+		} catch (ControllerActionPrivateInsufficientAuthenticationException $e) {
+			/**
+			 * Log unauthed private controller action (403)
+			 */
+			if ($this->logger) {
+				$this->logger->addWarning('Unauthenticated attempt to access private action', [
+					'path'       => $request->getPath(),
+					'controller' => $controller->getShortName(),
+					'action'     => $action
+				]);
+			}
+
+			$controller = $controllerFactory->create(NotFoundController::class);
+		} catch (ControllerActionNonexistentException $e) {
+			/**
+			 * Log nonexistent controller action
+			 */
+			if ($this->logger) {
+				$this->logger->addCritical('Controller action is nonexistent', [
+					'path'       => $request->getPath(),
+					'controller' => $controller->getShortName(),
+					'action'     => $action
+				]);
+			}
+
+			$controller = $controllerFactory->create(NotFoundController::class);
+		}
+
+		/**
+		 * Create response from controller action headers and output
+		 */
+		list($headers, $output) = array_values($controller->callAction());
+
+		/**
+		 * Performance logging
+		 */
+		if ($this->logger) {
+			$this->logger->addDebug(vsprintf('Dispatched request in %s ms',
+				number_format((microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']) * 1000, 2)), [
+				'path' => $request->getPath()
+			]);
+		}
+
+		return new Response($headers, $output);
+	}
+
+	/**
+	 * @param Router    $router
+	 * @param \PDO      $pdo
+	 * @param string    $appPath
+	 * @param null|User $user
+	 */
+	public function __construct(Router $router, \PDO $pdo, $appPath, User $user = null)
+	{
+		$this->router  = $router;
+		$this->pdo     = $pdo;
+		$this->appPath = $appPath;
+		$this->user    = $user;
+	}
 
 }

Braces +4 added lines, -8 removed lines

@@ -20,8 +20,7 @@ 
  *
  * @package Zortje\MVC\Routing
  */
-class Dispatcher
-{
+class Dispatcher {
 
     /**
      * @var Router
@@ -53,8 +52,7 @@ 
      *
      * @param Logger $logger
      */
-    public function setLogger(Logger $logger)
-    {
+    public function setLogger(Logger $logger) {
         $this->logger = $logger;
     }
 
@@ -65,8 +63,7 @@ 
      *
      * @throws \Exception If unexpected exception is thrown
      */
-    public function dispatch(Request $request)
-    {
+    public function dispatch(Request $request) {
         $controllerFactory = new ControllerFactory($this->pdo, $this->appPath, $this->user);
 
         try {
@@ -190,8 +187,7 @@ 
      * @param string    $appPath
      * @param null|User $user
      */
-    public function __construct(Router $router, \PDO $pdo, $appPath, User $user = null)
-    {
+    public function __construct(Router $router, \PDO $pdo, $appPath, User $user = null) {
         $this->router  = $router;
         $this->pdo     = $pdo;
         $this->appPath = $appPath;

src/Routing/Exception/RouteAlreadyConnectedException.php

Indentation +11 added lines, -11 removed lines

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

src/Routing/Exception/RouteNonexistentException.php

Indentation +11 added lines, -11 removed lines

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

src/Routing/Router.php

Indentation +45 added lines, -45 removed lines

@@ -13,49 +13,49 @@
 class Router
 {
 
-    /**
-     * @var array Routes
-     */
-    protected $routes = [];
-
-    /**
-     * Connects a new route in the router
-     *
-     * @param string $route      Route
-     * @param string $controller Controller
-     * @param string $action     Action
-     *
-     * @throws RouteAlreadyConnectedException When route is already connected
-     */
-    public function connect($route, $controller, $action)
-    {
-        if (isset($this->routes[$route]) === true) {
-            throw new RouteAlreadyConnectedException([$route]);
-        }
-
-        $this->routes[$route] = [
-            'controller' => $controller,
-            'action'     => $action
-        ];
-    }
-
-    /**
-     * Route to get controller and action
-     *
-     * @param string $route Route
-     *
-     * @return array Controller and action
-     *
-     * @throws RouteNonexistentException When route is not connected
-     */
-    public function route($route)
-    {
-        if (isset($this->routes[$route]) === false) {
-            throw new RouteNonexistentException([$route]);
-        }
-
-        $result = $this->routes[$route];
-
-        return $result;
-    }
+	/**
+	 * @var array Routes
+	 */
+	protected $routes = [];
+
+	/**
+	 * Connects a new route in the router
+	 *
+	 * @param string $route      Route
+	 * @param string $controller Controller
+	 * @param string $action     Action
+	 *
+	 * @throws RouteAlreadyConnectedException When route is already connected
+	 */
+	public function connect($route, $controller, $action)
+	{
+		if (isset($this->routes[$route]) === true) {
+			throw new RouteAlreadyConnectedException([$route]);
+		}
+
+		$this->routes[$route] = [
+			'controller' => $controller,
+			'action'     => $action
+		];
+	}
+
+	/**
+	 * Route to get controller and action
+	 *
+	 * @param string $route Route
+	 *
+	 * @return array Controller and action
+	 *
+	 * @throws RouteNonexistentException When route is not connected
+	 */
+	public function route($route)
+	{
+		if (isset($this->routes[$route]) === false) {
+			throw new RouteNonexistentException([$route]);
+		}
+
+		$result = $this->routes[$route];
+
+		return $result;
+	}
 }

Braces +3 added lines, -6 removed lines

@@ -10,8 +10,7 @@ 
  *
  * @package Zortje\MVC\Routing
  */
-class Router
-{
+class Router {
 
     /**
      * @var array Routes
@@ -27,8 +26,7 @@ 
      *
      * @throws RouteAlreadyConnectedException When route is already connected
      */
-    public function connect($route, $controller, $action)
-    {
+    public function connect($route, $controller, $action) {
         if (isset($this->routes[$route]) === true) {
             throw new RouteAlreadyConnectedException([$route]);
         }
@@ -48,8 +46,7 @@ 
      *
      * @throws RouteNonexistentException When route is not connected
      */
-    public function route($route)
-    {
+    public function route($route) {
         if (isset($this->routes[$route]) === false) {
             throw new RouteNonexistentException([$route]);
         }