jacobemerick / web

public/portfolio/index.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 $namespace = 'portfolio';
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__.'/../../bootstrap.php';
 
 // route
 Loader::loadInstance('router', 'Router');

utility/URLDecode.class.inc.php

Spacing +9 added lines, -9 removed lines

@@ -15,11 +15,11 @@ 
 	static private function form_url_array($host, $uri)
 	{
 		$uri = substr($uri, 1);
-		if(strpos($uri, '?'))
+		if (strpos($uri, '?'))
 			$uri = substr($uri, 0, strpos($uri, '?'));
 		$uri_array = explode('/', $uri);
 		
-		if(!Loader::isLive())
+		if (!Loader::isLive())
 			$host = substr($host, strpos($host, '.') + 1);
 		
 		self::$array['host'] = $host;
@@ -41,9 +41,9 @@ 
     $base .= '/';
 
 		self::$array['base'] = $base;
-		self::$array['uri'] = '/' . implode('/', $uri_array);
+		self::$array['uri'] = '/'.implode('/', $uri_array);
 		
-		if(end($uri_array) == '')
+		if (end($uri_array) == '')
 			$uri_array = array_slice($uri_array, 0, count($uri_array) - 1);
 		self::$array['pieces'] = (array) $uri_array;
 	}
@@ -71,21 +71,21 @@ 
 	static function getExtension()
 	{
 		$file = self::getPiece(-1);
-		if(substr($file, -1) == '/')
+		if (substr($file, -1) == '/')
 			return false;
-		return substr($file, strrpos($file, '.') + 1);;
+		return substr($file, strrpos($file, '.') + 1); ;
 	}
 
 	static function getPiece($piece = null)
 	{
-		if(!$piece)
+		if (!$piece)
 			return self::$array['pieces'];
 		
-		if($piece == -1)
+		if ($piece == -1)
 			return end(self::$array['pieces']);
 		
 		$piece = $piece - 1;
-		if(array_key_exists($piece, self::$array['pieces']))
+		if (array_key_exists($piece, self::$array['pieces']))
 			return self::$array['pieces'][$piece];
 		return;
 	}

Indentation +61 added lines, -61 removed lines

@@ -3,35 +3,35 @@ 
 class URLDecode
 {
 
-	private static $array = array();
+    private static $array = array();
 
-	static function init()
-	{
-		$host = $_SERVER['HTTP_HOST'];
-		$uri = $_SERVER['REQUEST_URI'];
-		self::form_url_array($host, $uri);
-	}
+    static function init()
+    {
+        $host = $_SERVER['HTTP_HOST'];
+        $uri = $_SERVER['REQUEST_URI'];
+        self::form_url_array($host, $uri);
+    }
 
-	static private function form_url_array($host, $uri)
-	{
-		$uri = substr($uri, 1);
-		if(strpos($uri, '?'))
-			$uri = substr($uri, 0, strpos($uri, '?'));
-		$uri_array = explode('/', $uri);
+    static private function form_url_array($host, $uri)
+    {
+        $uri = substr($uri, 1);
+        if(strpos($uri, '?'))
+            $uri = substr($uri, 0, strpos($uri, '?'));
+        $uri_array = explode('/', $uri);
 		
-		if(!Loader::isLive())
-			$host = substr($host, strpos($host, '.') + 1);
+        if(!Loader::isLive())
+            $host = substr($host, strpos($host, '.') + 1);
 		
-		self::$array['host'] = $host;
+        self::$array['host'] = $host;
 		
     if (
-      $host == 'www.waterfallsofthekeweenaw.com' ||
+        $host == 'www.waterfallsofthekeweenaw.com' ||
       $host == 'waterfallsofthekeweenaw.com'
     ) {
-			self::$array['site'] = 'waterfalls';
-		} else {
-			self::$array['site'] = substr($host, 0, strpos($host, '.'));
-		}
+            self::$array['site'] = 'waterfalls';
+        } else {
+            self::$array['site'] = substr($host, 0, strpos($host, '.'));
+        }
 
     $base = '';
     $base .= (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
@@ -40,55 +40,55 @@ 
     $base .= $host;
     $base .= '/';
 
-		self::$array['base'] = $base;
-		self::$array['uri'] = '/' . implode('/', $uri_array);
+        self::$array['base'] = $base;
+        self::$array['uri'] = '/' . implode('/', $uri_array);
 		
-		if(end($uri_array) == '')
-			$uri_array = array_slice($uri_array, 0, count($uri_array) - 1);
-		self::$array['pieces'] = (array) $uri_array;
-	}
+        if(end($uri_array) == '')
+            $uri_array = array_slice($uri_array, 0, count($uri_array) - 1);
+        self::$array['pieces'] = (array) $uri_array;
+    }
 
-	static function getSite()
-	{
-		return self::$array['site'];
-	}
+    static function getSite()
+    {
+        return self::$array['site'];
+    }
 
-	static function getHost()
-	{
-		return self::$array['host'];
-	}
+    static function getHost()
+    {
+        return self::$array['host'];
+    }
 
-	static function getBase()
-	{
-		return self::$array['base'];
-	}
+    static function getBase()
+    {
+        return self::$array['base'];
+    }
 
-	static function getURI()
-	{
-		return self::$array['uri'];
-	}
+    static function getURI()
+    {
+        return self::$array['uri'];
+    }
 
-	static function getExtension()
-	{
-		$file = self::getPiece(-1);
-		if(substr($file, -1) == '/')
-			return false;
-		return substr($file, strrpos($file, '.') + 1);;
-	}
+    static function getExtension()
+    {
+        $file = self::getPiece(-1);
+        if(substr($file, -1) == '/')
+            return false;
+        return substr($file, strrpos($file, '.') + 1);;
+    }
 
-	static function getPiece($piece = null)
-	{
-		if(!$piece)
-			return self::$array['pieces'];
+    static function getPiece($piece = null)
+    {
+        if(!$piece)
+            return self::$array['pieces'];
 		
-		if($piece == -1)
-			return end(self::$array['pieces']);
+        if($piece == -1)
+            return end(self::$array['pieces']);
 		
-		$piece = $piece - 1;
-		if(array_key_exists($piece, self::$array['pieces']))
-			return self::$array['pieces'][$piece];
-		return;
-	}
+        $piece = $piece - 1;
+        if(array_key_exists($piece, self::$array['pieces']))
+            return self::$array['pieces'][$piece];
+        return;
+    }
 
 }
 

Braces +39 added lines, -32 removed lines

@@ -1,26 +1,28 @@ 
 <?php
 
-class URLDecode
-{
+class URLDecode

+{

 
 	private static $array = array();
 
-	static function init()
-	{
+	static function init()

+	{

 		$host = $_SERVER['HTTP_HOST'];
 		$uri = $_SERVER['REQUEST_URI'];
 		self::form_url_array($host, $uri);
 	}
 
-	static private function form_url_array($host, $uri)
-	{
+	static private function form_url_array($host, $uri)

+	{

 		$uri = substr($uri, 1);
-		if(strpos($uri, '?'))
-			$uri = substr($uri, 0, strpos($uri, '?'));
+		if(strpos($uri, '?')) {

+					$uri = substr($uri, 0, strpos($uri, '?'));

+		}

 		$uri_array = explode('/', $uri);
 		
-		if(!Loader::isLive())
-			$host = substr($host, strpos($host, '.') + 1);
+		if(!Loader::isLive()) {

+					$host = substr($host, strpos($host, '.') + 1);

+		}

 		
 		self::$array['host'] = $host;
 		
@@ -43,50 +45,55 @@ 
 		self::$array['base'] = $base;
 		self::$array['uri'] = '/' . implode('/', $uri_array);
 		
-		if(end($uri_array) == '')
-			$uri_array = array_slice($uri_array, 0, count($uri_array) - 1);
+		if(end($uri_array) == '') {

+					$uri_array = array_slice($uri_array, 0, count($uri_array) - 1);

+		}

 		self::$array['pieces'] = (array) $uri_array;
 	}
 
-	static function getSite()
-	{
+	static function getSite()

+	{

 		return self::$array['site'];
 	}
 
-	static function getHost()
-	{
+	static function getHost()

+	{

 		return self::$array['host'];
 	}
 
-	static function getBase()
-	{
+	static function getBase()

+	{

 		return self::$array['base'];
 	}
 
-	static function getURI()
-	{
+	static function getURI()

+	{

 		return self::$array['uri'];
 	}
 
-	static function getExtension()
-	{
+	static function getExtension()

+	{

 		$file = self::getPiece(-1);
-		if(substr($file, -1) == '/')
-			return false;
+		if(substr($file, -1) == '/') {

+					return false;

+		}

 		return substr($file, strrpos($file, '.') + 1);;
 	}
 
-	static function getPiece($piece = null)
-	{
-		if(!$piece)
-			return self::$array['pieces'];
+	static function getPiece($piece = null)

+	{

+		if(!$piece) {

+					return self::$array['pieces'];

+		}

 		
-		if($piece == -1)
-			return end(self::$array['pieces']);
+		if($piece == -1) {

+					return end(self::$array['pieces']);

+		}

 		
 		$piece = $piece - 1;
-		if(array_key_exists($piece, self::$array['pieces']))
-			return self::$array['pieces'][$piece];
+		if(array_key_exists($piece, self::$array['pieces'])) {

+					return self::$array['pieces'][$piece];

+		}

 		return;
 	}
 

utility/Loader.class.inc.php

Spacing +9 added lines, -9 removed lines

@@ -17,14 +17,14 @@ 
 
 	public static function instance()
 	{
-		if(!isset(self::$instance))
+		if (!isset(self::$instance))
 			self::$instance = new Loader();
 		return self::$instance;
 	}
 
 	private function get_root()
 	{
-		if(!isset($this->root))
+		if (!isset($this->root))
 		{
 			$current_directory = dirname(__FILE__);
 			$current_directory = substr($current_directory, 0, -7);
@@ -52,7 +52,7 @@ 
 
 	private static function get_extension($type)
 	{
-		switch($type)
+		switch ($type)
 		{
 			case 'collector' :
 			case 'controller' :
@@ -104,15 +104,15 @@ 
 
 	public static function load($type, $files, $data = array())
 	{
-		foreach((array) $files as $file)
+		foreach ((array) $files as $file)
 		{
 			$file_path = self::instance()->get_path($type, $file);
-			if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
+			if (in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
 				continue;
 			
 			self::instance()->add_included_file($file_path);
 			
-			switch($type)
+			switch ($type)
 			{
 				case 'images' :
 				case 'scripts' :
@@ -142,7 +142,7 @@ 
 		
 		$reflectionObject = self::create_reflection_class($file);
 		
-		if(
+		if (
 			$reflectionObject->hasMethod('instance') &&
 			$reflectionObject->getMethod('instance')->isStatic())
 		{
@@ -157,7 +157,7 @@ 
 		
 		$reflectionObject = self::create_reflection_class($file);
 		
-		if($reflectionObject->hasMethod('__construct'))
+		if ($reflectionObject->hasMethod('__construct'))
 			return $reflectionObject->newInstanceArgs($data);
 		else
 			return $reflectionObject->newInstance();
@@ -180,7 +180,7 @@ 
             if ($site == 'waterfalls' && self::instance()->is_live) {
                 return "{$protocol}://www.waterfallsofthekeweenaw.com/";
             } else {
-                return $protocol . '://' . (self::instance()->is_live ? '' : 'dev.') . $site . '.jacobemerick.com/';
+                return $protocol.'://'.(self::instance()->is_live ? '' : 'dev.').$site.'.jacobemerick.com/';
             }
         }
         return '/';

Indentation +160 added lines, -160 removed lines

@@ -3,175 +3,175 @@
 final class Loader
 {
 
-	private $root;
-	private $is_live;
-	private $included_files = array();
-
-	private static $instance;
-
-	private function __construct()
-	{
-		$this->is_live = (isset($_SERVER['HTTP_HOST']) && substr($_SERVER['HTTP_HOST'], 0, 4) !== 'dev.');
-		return $this;
-	}
-
-	public static function instance()
-	{
-		if(!isset(self::$instance))
-			self::$instance = new Loader();
-		return self::$instance;
-	}
-
-	private function get_root()
-	{
-		if(!isset($this->root))
-		{
-			$current_directory = dirname(__FILE__);
-			$current_directory = substr($current_directory, 0, -7);
-			$this->root = $current_directory;
-		}
+    private $root;
+    private $is_live;
+    private $included_files = array();
+
+    private static $instance;
+
+    private function __construct()
+    {
+        $this->is_live = (isset($_SERVER['HTTP_HOST']) && substr($_SERVER['HTTP_HOST'], 0, 4) !== 'dev.');
+        return $this;
+    }
+
+    public static function instance()
+    {
+        if(!isset(self::$instance))
+            self::$instance = new Loader();
+        return self::$instance;
+    }
+
+    private function get_root()
+    {
+        if(!isset($this->root))
+        {
+            $current_directory = dirname(__FILE__);
+            $current_directory = substr($current_directory, 0, -7);
+            $this->root = $current_directory;
+        }
 		
-		return $this->root;
-	}
-
-	private function get_delimiter()
-	{
-		return (true || $this->is_live) ? '/' : '\\';
-	}
-
-	private function check_delimiters($path)
-	{
-		return (true || $this->is_live) ? $path : str_replace('/', '\\', $path);
-	}
-
-	private static function get_class_name($path)
-	{
-		$path_array = explode('/', $path);
-		return array_pop($path_array);
-	}
-
-	private static function get_extension($type)
-	{
-		switch($type)
-		{
-			case 'collector' :
-			case 'controller' :
-			case 'model' :
-			case 'module' :
-			case 'router' :
-			case 'utility' :
-				$extension = '.class.inc.php';
-			break;
-			case 'view' :
-				$extension = '.tpl.php';
-			break;
-		}
-		return $extension;
-	}
-
-	public static function getImagePath($type, $file)
-	{
-		$path = self::instance()->get_root();
-		$path .= 'public';
-		$path .= self::instance()->get_delimiter();
-		$path .= $type;
-		$path .= self::instance()->get_delimiter();
-		$path .= self::instance()->check_delimiters($file);
+        return $this->root;
+    }
+
+    private function get_delimiter()
+    {
+        return (true || $this->is_live) ? '/' : '\\';
+    }
+
+    private function check_delimiters($path)
+    {
+        return (true || $this->is_live) ? $path : str_replace('/', '\\', $path);
+    }
+
+    private static function get_class_name($path)
+    {
+        $path_array = explode('/', $path);
+        return array_pop($path_array);
+    }
+
+    private static function get_extension($type)
+    {
+        switch($type)
+        {
+            case 'collector' :
+            case 'controller' :
+            case 'model' :
+            case 'module' :
+            case 'router' :
+            case 'utility' :
+                $extension = '.class.inc.php';
+            break;
+            case 'view' :
+                $extension = '.tpl.php';
+            break;
+        }
+        return $extension;
+    }
+
+    public static function getImagePath($type, $file)
+    {
+        $path = self::instance()->get_root();
+        $path .= 'public';
+        $path .= self::instance()->get_delimiter();
+        $path .= $type;
+        $path .= self::instance()->get_delimiter();
+        $path .= self::instance()->check_delimiters($file);
 		
-		return $path;
-	}
-
-	private static function get_path($type, $file)
-	{
-		$path = self::instance()->get_root();
-		$path .= $type;
-		$path .= self::instance()->get_delimiter();
-		$path .= self::instance()->check_delimiters($file);
-		$path .= self::get_extension($type);
+        return $path;
+    }
+
+    private static function get_path($type, $file)
+    {
+        $path = self::instance()->get_root();
+        $path .= $type;
+        $path .= self::instance()->get_delimiter();
+        $path .= self::instance()->check_delimiters($file);
+        $path .= self::get_extension($type);
 		
-		return $path;
-	}
-
-	private function get_included_files()
-	{
-		return $this->included_files;
-	}
-
-	private function add_included_file($path)
-	{
-		$this->included_files[] = $path;
-	}
-
-	public static function load($type, $files, $data = array())
-	{
-		foreach((array) $files as $file)
-		{
-			$file_path = self::instance()->get_path($type, $file);
-			if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
-				continue;
+        return $path;
+    }
+
+    private function get_included_files()
+    {
+        return $this->included_files;
+    }
+
+    private function add_included_file($path)
+    {
+        $this->included_files[] = $path;
+    }
+
+    public static function load($type, $files, $data = array())
+    {
+        foreach((array) $files as $file)
+        {
+            $file_path = self::instance()->get_path($type, $file);
+            if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
+                continue;
 			
-			self::instance()->add_included_file($file_path);
+            self::instance()->add_included_file($file_path);
 			
-			switch($type)
-			{
-				case 'images' :
-				case 'scripts' :
-				case 'styles' :
-					echo file_get_contents($file_path);
-				break;
-				case 'view' :
-					extract($data);
-					include($file_path);
-				break;
-				default :
-					include_once($file_path);
-				break;
-			}
-		}
-	}
-
-	private static function create_reflection_class($file)
-	{
-		$class_name = self::instance()->get_class_name($file);
-		return new ReflectionClass($class_name);
-	}
-
-	public static function loadInstance($type, $file)
-	{
-		self::load($type, $file);
+            switch($type)
+            {
+                case 'images' :
+                case 'scripts' :
+                case 'styles' :
+                    echo file_get_contents($file_path);
+                break;
+                case 'view' :
+                    extract($data);
+                    include($file_path);
+                break;
+                default :
+                    include_once($file_path);
+                break;
+            }
+        }
+    }
+
+    private static function create_reflection_class($file)
+    {
+        $class_name = self::instance()->get_class_name($file);
+        return new ReflectionClass($class_name);
+    }
+
+    public static function loadInstance($type, $file)
+    {
+        self::load($type, $file);
 		
-		$reflectionObject = self::create_reflection_class($file);
+        $reflectionObject = self::create_reflection_class($file);
 		
-		if(
-			$reflectionObject->hasMethod('instance') &&
-			$reflectionObject->getMethod('instance')->isStatic())
-		{
-			return $reflectionObject->getMethod('instance')->invoke(null);
-		}
-		trigger_error("Requested class cannot be instance'd: {$type}, {$file}");
-	}
-
-	public static function loadNew($type, $file, $data = array())
-	{
-		self::load($type, $file);
+        if(
+            $reflectionObject->hasMethod('instance') &&
+            $reflectionObject->getMethod('instance')->isStatic())
+        {
+            return $reflectionObject->getMethod('instance')->invoke(null);
+        }
+        trigger_error("Requested class cannot be instance'd: {$type}, {$file}");
+    }
+
+    public static function loadNew($type, $file, $data = array())
+    {
+        self::load($type, $file);
 		
-		$reflectionObject = self::create_reflection_class($file);
+        $reflectionObject = self::create_reflection_class($file);
 		
-		if($reflectionObject->hasMethod('__construct'))
-			return $reflectionObject->newInstanceArgs($data);
-		else
-			return $reflectionObject->newInstance();
-	}
-
-	public static function getRoot()
-	{
-		return self::instance()->get_root();
-	}
-
-	public static function isLive()
-	{
-		return self::instance()->is_live;
-	}
+        if($reflectionObject->hasMethod('__construct'))
+            return $reflectionObject->newInstanceArgs($data);
+        else
+            return $reflectionObject->newInstance();
+    }
+
+    public static function getRoot()
+    {
+        return self::instance()->get_root();
+    }
+
+    public static function isLive()
+    {
+        return self::instance()->is_live;
+    }
 
     public static function getRootURL($site = '')
     {

Braces +49 added lines, -46 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-final class Loader
-{
+final class Loader

+{

 
 	private $root;
 	private $is_live;
@@ -9,21 +9,22 @@ 
 
 	private static $instance;
 
-	private function __construct()
-	{
+	private function __construct()

+	{

 		$this->is_live = (isset($_SERVER['HTTP_HOST']) && substr($_SERVER['HTTP_HOST'], 0, 4) !== 'dev.');
 		return $this;
 	}
 
-	public static function instance()
-	{
-		if(!isset(self::$instance))
-			self::$instance = new Loader();
+	public static function instance()

+	{

+		if(!isset(self::$instance)) {

+					self::$instance = new Loader();

+		}

 		return self::$instance;
 	}
 
-	private function get_root()
-	{
+	private function get_root()

+	{

 		if(!isset($this->root))
 		{
 			$current_directory = dirname(__FILE__);
@@ -34,24 +35,24 @@ 
 		return $this->root;
 	}
 
-	private function get_delimiter()
-	{
+	private function get_delimiter()

+	{

 		return (true || $this->is_live) ? '/' : '\\';
 	}
 
-	private function check_delimiters($path)
-	{
+	private function check_delimiters($path)

+	{

 		return (true || $this->is_live) ? $path : str_replace('/', '\\', $path);
 	}
 
-	private static function get_class_name($path)
-	{
+	private static function get_class_name($path)

+	{

 		$path_array = explode('/', $path);
 		return array_pop($path_array);
 	}
 
-	private static function get_extension($type)
-	{
+	private static function get_extension($type)

+	{

 		switch($type)
 		{
 			case 'collector' :
@@ -69,8 +70,8 @@ 
 		return $extension;
 	}
 
-	public static function getImagePath($type, $file)
-	{
+	public static function getImagePath($type, $file)

+	{

 		$path = self::instance()->get_root();
 		$path .= 'public';
 		$path .= self::instance()->get_delimiter();
@@ -81,8 +82,8 @@ 
 		return $path;
 	}
 
-	private static function get_path($type, $file)
-	{
+	private static function get_path($type, $file)

+	{

 		$path = self::instance()->get_root();
 		$path .= $type;
 		$path .= self::instance()->get_delimiter();
@@ -92,23 +93,24 @@ 
 		return $path;
 	}
 
-	private function get_included_files()
-	{
+	private function get_included_files()

+	{

 		return $this->included_files;
 	}
 
-	private function add_included_file($path)
-	{
+	private function add_included_file($path)

+	{

 		$this->included_files[] = $path;
 	}
 
-	public static function load($type, $files, $data = array())
-	{
+	public static function load($type, $files, $data = array())

+	{

 		foreach((array) $files as $file)
 		{
 			$file_path = self::instance()->get_path($type, $file);
-			if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
-				continue;
+			if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view') {

+							continue;

+			}

 			
 			self::instance()->add_included_file($file_path);
 			
@@ -130,14 +132,14 @@ 
 		}
 	}
 
-	private static function create_reflection_class($file)
-	{
+	private static function create_reflection_class($file)

+	{

 		$class_name = self::instance()->get_class_name($file);
 		return new ReflectionClass($class_name);
 	}
 
-	public static function loadInstance($type, $file)
-	{
+	public static function loadInstance($type, $file)

+	{

 		self::load($type, $file);
 		
 		$reflectionObject = self::create_reflection_class($file);
@@ -151,30 +153,31 @@ 
 		trigger_error("Requested class cannot be instance'd: {$type}, {$file}");
 	}
 
-	public static function loadNew($type, $file, $data = array())
-	{
+	public static function loadNew($type, $file, $data = array())

+	{

 		self::load($type, $file);
 		
 		$reflectionObject = self::create_reflection_class($file);
 		
-		if($reflectionObject->hasMethod('__construct'))
-			return $reflectionObject->newInstanceArgs($data);
-		else
-			return $reflectionObject->newInstance();
+		if($reflectionObject->hasMethod('__construct')) {

+					return $reflectionObject->newInstanceArgs($data);

+		} else {

+					return $reflectionObject->newInstance();

+		}

 	}
 
-	public static function getRoot()
-	{
+	public static function getRoot()

+	{

 		return self::instance()->get_root();
 	}
 
-	public static function isLive()
-	{
+	public static function isLive()

+	{

 		return self::instance()->is_live;
 	}
 
-    public static function getRootURL($site = '')
-    {
+    public static function getRootURL($site = '')

+    {

         if (strlen($site) > 0) {
             $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
             if ($site == 'waterfalls' && self::instance()->is_live) {

utility/Database.class.inc.php

Spacing +12 added lines, -12 removed lines

@@ -36,7 +36,7 @@ 
 		$mysqli = new mysqli($host, $username, $password);
 		
 		$has_connection_error = $mysqli->connect_error;
-		if(isset($has_connection_error))
+		if (isset($has_connection_error))
 			$this->has_connection_error = true;
 		
 		return $mysqli;
@@ -44,7 +44,7 @@ 
 
 	public static function instance()
 	{
-		if(!isset(self::$instance)) {
+		if (!isset(self::$instance)) {
             global $config;
             self::$instance = new Database(
                 $config->database->master,
@@ -63,23 +63,23 @@ 
 	public static function select($query)
 	{
 		$start = microtime(true);
-		if($result = self::instance()->read_connection->query($query))
+		if ($result = self::instance()->read_connection->query($query))
 		{
 			self::instance()->log_query($query, $start);
 			$array = array();
-			while($row = $result->fetch_object())
+			while ($row = $result->fetch_object())
 				$array[] = $row;
 			$result->close();
 			return $array;
 		}
-		trigger_error('Could not preform query - ' . $query . ' - ' . self::instance()->read_connection->error);
+		trigger_error('Could not preform query - '.$query.' - '.self::instance()->read_connection->error);
 		return false;
 	}
 
 	public static function selectRow($query)
 	{
 		$result = self::select($query);
-		if(is_array($result))
+		if (is_array($result))
 			return array_pop($result);
 		return false;
 	}
@@ -87,19 +87,19 @@ 
 	public static function execute($query)
 	{
 		$start = microtime(true);
-		if(self::instance()->write_connection->query($query))
+		if (self::instance()->write_connection->query($query))
 		{
 			self::instance()->log_query($query, $start);
 			return true;
 		}
-		trigger_error('Could not preform query - ' . $query . '-' . self::instance()->write_connection->error);
+		trigger_error('Could not preform query - '.$query.'-'.self::instance()->write_connection->error);
 		return false;
 	}
 
 	public static function lastInsertID()
 	{
 		$id = self::instance()->write_connection->insert_id;
-		if($id == 0)
+		if ($id == 0)
 			return false;
 		return $id;
 	}
@@ -119,7 +119,7 @@ 
 	private function gather_query_data()
 	{
 		$query_data = array();
-		foreach($this->query_log as $query)
+		foreach ($this->query_log as $query)
 		{
 			$query = self::explain($query);
 			$query_data[] = $query;
@@ -129,9 +129,9 @@ 
 
 	public static function explain($query)
 	{
-		$sql = 'EXPLAIN ' . $query['sql'];
+		$sql = 'EXPLAIN '.$query['sql'];
 		
-		if($result = self::instance()->read_connection->query($sql))
+		if ($result = self::instance()->read_connection->query($sql))
 		{
 			$row = $result->fetch_assoc();
 			$query['explain'] = $row;

Indentation +122 added lines, -122 removed lines

@@ -3,19 +3,19 @@ 
 final class Database
 {
 
-	private $read_connection;
-	private $write_connection;
-	private $query_log = array();
-	private $query_total = array(
-		'count' => 0,
-		'time' => 0);
+    private $read_connection;
+    private $write_connection;
+    private $query_log = array();
+    private $query_total = array(
+        'count' => 0,
+        'time' => 0);
 
-	private $has_connection_error = false;
+    private $has_connection_error = false;
 
-	private static $instance;
+    private static $instance;
 
-	private function __construct($write_params, $read_params)
-	{
+    private function __construct($write_params, $read_params)
+    {
         $this->write_connection = $this->connect(
             $write_params->host,
             $write_params->user,
@@ -28,23 +28,23 @@ 
             $read_params->password
         );
 
-		return $this;
-	}
+        return $this;
+    }
 
-	private function connect($host, $username, $password)
-	{
-		$mysqli = new mysqli($host, $username, $password);
+    private function connect($host, $username, $password)
+    {
+        $mysqli = new mysqli($host, $username, $password);
 		
-		$has_connection_error = $mysqli->connect_error;
-		if(isset($has_connection_error))
-			$this->has_connection_error = true;
+        $has_connection_error = $mysqli->connect_error;
+        if(isset($has_connection_error))
+            $this->has_connection_error = true;
 		
-		return $mysqli;
-	}
+        return $mysqli;
+    }
 
-	public static function instance()
-	{
-		if(!isset(self::$instance)) {
+    public static function instance()
+    {
+        if(!isset(self::$instance)) {
             global $config;
             self::$instance = new Database(
                 $config->database->master,
@@ -52,107 +52,107 @@ 
             );
         }
 
-		return self::$instance;
-	}
-
-	public static function escape($string)
-	{
-		return self::instance()->read_connection->real_escape_string($string);
-	}
-
-	public static function select($query)
-	{
-		$start = microtime(true);
-		if($result = self::instance()->read_connection->query($query))
-		{
-			self::instance()->log_query($query, $start);
-			$array = array();
-			while($row = $result->fetch_object())
-				$array[] = $row;
-			$result->close();
-			return $array;
-		}
-		trigger_error('Could not preform query - ' . $query . ' - ' . self::instance()->read_connection->error);
-		return false;
-	}
-
-	public static function selectRow($query)
-	{
-		$result = self::select($query);
-		if(is_array($result))
-			return array_pop($result);
-		return false;
-	}
-
-	public static function execute($query)
-	{
-		$start = microtime(true);
-		if(self::instance()->write_connection->query($query))
-		{
-			self::instance()->log_query($query, $start);
-			return true;
-		}
-		trigger_error('Could not preform query - ' . $query . '-' . self::instance()->write_connection->error);
-		return false;
-	}
-
-	public static function lastInsertID()
-	{
-		$id = self::instance()->write_connection->insert_id;
-		if($id == 0)
-			return false;
-		return $id;
-	}
-
-	private function log_query($query, $start)
-	{
-		$time = (microtime(true) - $start) * 1000;
-		$query = array(
-			'sql' => $query,
-			'time' => $time);
-		array_push($this->query_log, $query);
+        return self::$instance;
+    }
+
+    public static function escape($string)
+    {
+        return self::instance()->read_connection->real_escape_string($string);
+    }
+
+    public static function select($query)
+    {
+        $start = microtime(true);
+        if($result = self::instance()->read_connection->query($query))
+        {
+            self::instance()->log_query($query, $start);
+            $array = array();
+            while($row = $result->fetch_object())
+                $array[] = $row;
+            $result->close();
+            return $array;
+        }
+        trigger_error('Could not preform query - ' . $query . ' - ' . self::instance()->read_connection->error);
+        return false;
+    }
+
+    public static function selectRow($query)
+    {
+        $result = self::select($query);
+        if(is_array($result))
+            return array_pop($result);
+        return false;
+    }
+
+    public static function execute($query)
+    {
+        $start = microtime(true);
+        if(self::instance()->write_connection->query($query))
+        {
+            self::instance()->log_query($query, $start);
+            return true;
+        }
+        trigger_error('Could not preform query - ' . $query . '-' . self::instance()->write_connection->error);
+        return false;
+    }
+
+    public static function lastInsertID()
+    {
+        $id = self::instance()->write_connection->insert_id;
+        if($id == 0)
+            return false;
+        return $id;
+    }
+
+    private function log_query($query, $start)
+    {
+        $time = (microtime(true) - $start) * 1000;
+        $query = array(
+            'sql' => $query,
+            'time' => $time);
+        array_push($this->query_log, $query);
 		
-		$this->query_total['count']++;
-		$this->query_total['time'] += $time;
-	}
-
-	private function gather_query_data()
-	{
-		$query_data = array();
-		foreach($this->query_log as $query)
-		{
-			$query = self::explain($query);
-			$query_data[] = $query;
-		}
-		return $query_data;
-	}
-
-	public static function explain($query)
-	{
-		$sql = 'EXPLAIN ' . $query['sql'];
+        $this->query_total['count']++;
+        $this->query_total['time'] += $time;
+    }
+
+    private function gather_query_data()
+    {
+        $query_data = array();
+        foreach($this->query_log as $query)
+        {
+            $query = self::explain($query);
+            $query_data[] = $query;
+        }
+        return $query_data;
+    }
+
+    public static function explain($query)
+    {
+        $sql = 'EXPLAIN ' . $query['sql'];
 		
-		if($result = self::instance()->read_connection->query($sql))
-		{
-			$row = $result->fetch_assoc();
-			$query['explain'] = $row;
-		}
+        if($result = self::instance()->read_connection->query($sql))
+        {
+            $row = $result->fetch_assoc();
+            $query['explain'] = $row;
+        }
 		
-		return $query;
-	}
-
-	public static function getQueryLog()
-	{
-		return self::instance()->gather_query_data();
-	}
-
-	public static function getQueryTotals()
-	{
-		return self::instance()->query_total;
-	}
-
-	public static function isConnected()
-	{
-		return !self::instance()->has_connection_error;
-	}
+        return $query;
+    }
+
+    public static function getQueryLog()
+    {
+        return self::instance()->gather_query_data();
+    }
+
+    public static function getQueryTotals()
+    {
+        return self::instance()->query_total;
+    }
+
+    public static function isConnected()
+    {
+        return !self::instance()->has_connection_error;
+    }
 
 }

Braces +42 added lines, -38 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-final class Database
-{
+final class Database

+{

 
 	private $read_connection;
 	private $write_connection;
@@ -14,8 +14,8 @@ 
 
 	private static $instance;
 
-	private function __construct($write_params, $read_params)
-	{
+	private function __construct($write_params, $read_params)

+	{

         $this->write_connection = $this->connect(
             $write_params->host,
             $write_params->user,
@@ -31,19 +31,20 @@ 
 		return $this;
 	}
 
-	private function connect($host, $username, $password)
-	{
+	private function connect($host, $username, $password)

+	{

 		$mysqli = new mysqli($host, $username, $password);
 		
 		$has_connection_error = $mysqli->connect_error;
-		if(isset($has_connection_error))
-			$this->has_connection_error = true;
+		if(isset($has_connection_error)) {

+					$this->has_connection_error = true;

+		}

 		
 		return $mysqli;
 	}
 
-	public static function instance()
-	{
+	public static function instance()

+	{

 		if(!isset(self::$instance)) {
             global $config;
             self::$instance = new Database(
@@ -55,20 +56,21 @@ 
 		return self::$instance;
 	}
 
-	public static function escape($string)
-	{
+	public static function escape($string)

+	{

 		return self::instance()->read_connection->real_escape_string($string);
 	}
 
-	public static function select($query)
-	{
+	public static function select($query)

+	{

 		$start = microtime(true);
 		if($result = self::instance()->read_connection->query($query))
 		{
 			self::instance()->log_query($query, $start);
 			$array = array();
-			while($row = $result->fetch_object())
-				$array[] = $row;
+			while($row = $result->fetch_object()) {

+							$array[] = $row;

+			}

 			$result->close();
 			return $array;
 		}
@@ -76,16 +78,17 @@ 
 		return false;
 	}
 
-	public static function selectRow($query)
-	{
+	public static function selectRow($query)

+	{

 		$result = self::select($query);
-		if(is_array($result))
-			return array_pop($result);
+		if(is_array($result)) {

+					return array_pop($result);

+		}

 		return false;
 	}
 
-	public static function execute($query)
-	{
+	public static function execute($query)

+	{

 		$start = microtime(true);
 		if(self::instance()->write_connection->query($query))
 		{
@@ -96,16 +99,17 @@ 
 		return false;
 	}
 
-	public static function lastInsertID()
-	{
+	public static function lastInsertID()

+	{

 		$id = self::instance()->write_connection->insert_id;
-		if($id == 0)
-			return false;
+		if($id == 0) {

+					return false;

+		}

 		return $id;
 	}
 
-	private function log_query($query, $start)
-	{
+	private function log_query($query, $start)

+	{

 		$time = (microtime(true) - $start) * 1000;
 		$query = array(
 			'sql' => $query,
@@ -116,8 +120,8 @@ 
 		$this->query_total['time'] += $time;
 	}
 
-	private function gather_query_data()
-	{
+	private function gather_query_data()

+	{

 		$query_data = array();
 		foreach($this->query_log as $query)
 		{
@@ -127,8 +131,8 @@ 
 		return $query_data;
 	}
 
-	public static function explain($query)
-	{
+	public static function explain($query)

+	{

 		$sql = 'EXPLAIN ' . $query['sql'];
 		
 		if($result = self::instance()->read_connection->query($sql))
@@ -140,18 +144,18 @@ 
 		return $query;
 	}
 
-	public static function getQueryLog()
-	{
+	public static function getQueryLog()

+	{

 		return self::instance()->gather_query_data();
 	}
 
-	public static function getQueryTotals()
-	{
+	public static function getQueryTotals()

+	{

 		return self::instance()->query_total;
 	}
 
-	public static function isConnected()
-	{
+	public static function isConnected()

+	{

 		return !self::instance()->has_connection_error;
 	}
 

controller/home/HomeController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -48,11 +48,11 @@
     $recentPosts = $postRepository->getActivePosts(3);
 
 		$recent_post_array = array();
-		foreach($recentPosts as $postResult)
+		foreach ($recentPosts as $postResult)
 		{
 			$post = new stdclass();
 			$post->title = $postResult['title'];
-			$post->url = Loader::getRootUrl('blog') . "{$postResult['category']}/{$postResult['path']}/";
+			$post->url = Loader::getRootUrl('blog')."{$postResult['category']}/{$postResult['path']}/";
 			$post->category = ucwords(str_replace('-', ' ', $postResult['category']));
 			$post->thumb = Content::instance('FetchFirstPhoto', $postResult['body'])->activate();
 			$post->body = Content::instance('SmartTrim', $postResult['body'])->activate(($post->thumb !== '') ? self::$POST_LENGTH_SHORT : self::$POST_LENGTH_LONG);

Indentation +41 added lines, -41 removed lines

@@ -8,58 +8,58 @@
 final class HomeController extends DefaultPageController
 {
 
-	private static $TITLE = "Jacob Emerick's Home | Web Developer, Hiker, Innovator";
-	private static $DESCRIPTION = 'Home page for Jacob Emerick, with links to his blog, waterfall site, and other side projects';
+    private static $TITLE = "Jacob Emerick's Home | Web Developer, Hiker, Innovator";
+    private static $DESCRIPTION = 'Home page for Jacob Emerick, with links to his blog, waterfall site, and other side projects';
 
-	private static $KEYWORD_ARRAY = array(
-		'Jacob Emerick',
-		'jacobemerick',
-		'jpemeric',
-		'home',
-		'web developer',
-		'hiker',
-		'application programmer',
-		'innovator');
+    private static $KEYWORD_ARRAY = array(
+        'Jacob Emerick',
+        'jacobemerick',
+        'jpemeric',
+        'home',
+        'web developer',
+        'hiker',
+        'application programmer',
+        'innovator');
 
-	private static $POST_LENGTH_SHORT = 160;
-	private static $POST_LENGTH_LONG = 240;
+    private static $POST_LENGTH_SHORT = 160;
+    private static $POST_LENGTH_LONG = 240;
 
-	protected function set_head_data()
-	{
-		$this->set_title(self::$TITLE);
-		$this->set_description(self::$DESCRIPTION);
-		$this->set_keywords(self::$KEYWORD_ARRAY);
+    protected function set_head_data()
+    {
+        $this->set_title(self::$TITLE);
+        $this->set_description(self::$DESCRIPTION);
+        $this->set_keywords(self::$KEYWORD_ARRAY);
 		
-		parent::set_head_data();
-	}
+        parent::set_head_data();
+    }
 
-	protected function set_body_data()
-	{
-		$this->set_body('post_array', $this->get_recent_posts());
-		$this->set_body_view('Home');
+    protected function set_body_data()
+    {
+        $this->set_body('post_array', $this->get_recent_posts());
+        $this->set_body_view('Home');
 		
-		parent::set_body_data();
-	}
+        parent::set_body_data();
+    }
 
-	private function get_recent_posts()
-	{
+    private function get_recent_posts()
+    {
     global $container;
     $postRepository = new MysqlPostRepository($container['db_connection_locator']);
     $recentPosts = $postRepository->getActivePosts(3);
 
-		$recent_post_array = array();
-		foreach($recentPosts as $postResult)
-		{
-			$post = new stdclass();
-			$post->title = $postResult['title'];
-			$post->url = Loader::getRootUrl('blog') . "{$postResult['category']}/{$postResult['path']}/";
-			$post->category = ucwords(str_replace('-', ' ', $postResult['category']));
-			$post->thumb = Content::instance('FetchFirstPhoto', $postResult['body'])->activate();
-			$post->body = Content::instance('SmartTrim', $postResult['body'])->activate(($post->thumb !== '') ? self::$POST_LENGTH_SHORT : self::$POST_LENGTH_LONG);
+        $recent_post_array = array();
+        foreach($recentPosts as $postResult)
+        {
+            $post = new stdclass();
+            $post->title = $postResult['title'];
+            $post->url = Loader::getRootUrl('blog') . "{$postResult['category']}/{$postResult['path']}/";
+            $post->category = ucwords(str_replace('-', ' ', $postResult['category']));
+            $post->thumb = Content::instance('FetchFirstPhoto', $postResult['body'])->activate();
+            $post->body = Content::instance('SmartTrim', $postResult['body'])->activate(($post->thumb !== '') ? self::$POST_LENGTH_SHORT : self::$POST_LENGTH_LONG);
 						
-			$recent_post_array[] = $post;
-		}
-		return $recent_post_array;
-	}
+            $recent_post_array[] = $post;
+        }
+        return $recent_post_array;
+    }
 
 }

Braces +8 added lines, -8 removed lines

@@ -5,8 +5,8 @@ 
 Loader::load('controller', 'home/DefaultPageController');
 Loader::load('utility', 'Content');
 
-final class HomeController extends DefaultPageController
-{
+final class HomeController extends DefaultPageController

+{

 
 	private static $TITLE = "Jacob Emerick's Home | Web Developer, Hiker, Innovator";
 	private static $DESCRIPTION = 'Home page for Jacob Emerick, with links to his blog, waterfall site, and other side projects';
@@ -24,8 +24,8 @@ 
 	private static $POST_LENGTH_SHORT = 160;
 	private static $POST_LENGTH_LONG = 240;
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		$this->set_title(self::$TITLE);
 		$this->set_description(self::$DESCRIPTION);
 		$this->set_keywords(self::$KEYWORD_ARRAY);
@@ -33,16 +33,16 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body('post_array', $this->get_recent_posts());
 		$this->set_body_view('Home');
 		
 		parent::set_body_data();
 	}
 
-	private function get_recent_posts()
-	{
+	private function get_recent_posts()

+	{

     global $container;
     $postRepository = new MysqlPostRepository($container['db_connection_locator']);
     $recentPosts = $postRepository->getActivePosts(3);

controller/portfolio/ResumeController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
     {
         $this->set_body('body_view', 'Resume');
 
-        $resumePath = Loader::getRootURL('portfolio') . "/jsonresume/{$this->resume}";
+        $resumePath = Loader::getRootURL('portfolio')."/jsonresume/{$this->resume}";
         $resume = file_get_contents($resumePath);
         $resume = json_decode($resume, true);
         $this->set_body('body_data', $resume);

Braces +6 added lines, -6 removed lines

@@ -2,13 +2,13 @@ 
 
 Loader::load('controller', 'portfolio/DefaultPageController');
 
-class ResumeController extends DefaultPageController
-{
+class ResumeController extends DefaultPageController

+{

 
     protected $resume = 'resume-20160318.json';
 
-    protected function set_head_data()
-    {
+    protected function set_head_data()

+    {

         $this->set_title("Resume | Jacob Emerick's Portfolio");
         $this->set_description("Resume for Jacob Emerick, a software engineer extraordinaire");
         $this->set_keywords([
@@ -21,8 +21,8 @@ 
         ]);
     }
 
-    protected function set_body_data()
-    {
+    protected function set_body_data()

+    {

         $this->set_body('body_view', 'Resume');
 
         $resumePath = Loader::getRootURL('portfolio') . "/jsonresume/{$this->resume}";

controller/portfolio/ContactController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
 
         return [
             'success' =>
-                "Thank you for your message, {$_POST['name']}! " .
+                "Thank you for your message, {$_POST['name']}! ".
                 "I'll get back to you as soon as possible."
         ];
     }

Braces +8 added lines, -8 removed lines

@@ -2,11 +2,11 @@ 
 
 Loader::load('controller', 'portfolio/DefaultPageController');
 
-class ContactController extends DefaultPageController
-{
+class ContactController extends DefaultPageController

+{

 
-    protected function set_head_data()
-    {
+    protected function set_head_data()

+    {

         $this->set_title("Contact Page | Jacob Emerick's Portfolio");
         $this->set_description("Contact page for Jacob Emerick's Portfolio");
         $this->set_keywords([
@@ -19,8 +19,8 @@ 
         ]);
     }
 
-    protected function set_body_data()
-    {
+    protected function set_body_data()

+    {

         $this->set_body('body_view', 'Contact');
 
         $body_data = [];
@@ -33,8 +33,8 @@ 
         parent::set_body_data();
     }
 
-    private function process_form_data()
-    {
+    private function process_form_data()

+    {

         $errors = [];
 
         if (

controller/portfolio/DefaultPageController.class.inc.php

Spacing +4 added lines, -4 removed lines

@@ -33,15 +33,15 @@ 
             ],
             [
                 'name' => 'Projects',
-                'link' => Loader::getRootURL() . 'projects/',
+                'link' => Loader::getRootURL().'projects/',
             ],
             [
                 'name' => 'Résumé',
-                'link' => Loader::getRootURL() . 'resume/',
+                'link' => Loader::getRootURL().'resume/',
             ],
             [
                 'name' => 'Contact',
-                'link' => Loader::getRootURL() . 'contact/',
+                'link' => Loader::getRootURL().'contact/',
             ],
         ];
 
@@ -51,7 +51,7 @@ 
             $active_page = ucfirst(URLDecode::getPiece(1));
         }
 
-        return array_map(function ($row) use ($active_page) {
+        return array_map(function($row) use ($active_page) {
             $row = (object) $row;
             $row->active = ($row->name == $active_page);
             return $row;

Braces +8 added lines, -8 removed lines

@@ -2,19 +2,19 @@ 
 
 Loader::load('controller', '/PageController');
 
-abstract class DefaultPageController extends PageController
-{
+abstract class DefaultPageController extends PageController

+{

 
-    public function __construct()
-    {
+    public function __construct()

+    {

         parent::__construct();
 
         $this->add_css('reset');
         $this->add_css('portfolio', 4);
     }
 
-    protected function set_body_data()
-    {
+    protected function set_body_data()

+    {

         $this->set_body('header_data', [
             'menu' => $this->get_menu(),
             'home_link' => Loader::getRootURL(),
@@ -24,8 +24,8 @@ 
         $this->set_body_view('Page');
     }
 
-    protected function get_menu()
-    {
+    protected function get_menu()

+    {

         $menu = [
             [
                 'name' => 'About',

src/Domain/Comment/Comment/CommentRepositoryInterface.php

Braces +2 added lines, -2 removed lines

@@ -2,8 +2,8 @@
 
 namespace Jacobemerick\Web\Domain\Comment\Comment;
 
-interface CommentRepositoryInterface
-{
+interface CommentRepositoryInterface

+{

     public function createComment(array $comment);
     public function getComment($commentId);
     public function getComments($domain = null, $path = null, $page = null, $perPage = null, $order = null);