jacobemerick / web

controller/Error404Controller.class.inc.php

Indentation +31 added lines, -31 removed lines

@@ -25,37 +25,37 @@
 
 	private function get_sites()
 	{
-    return [
-      [
-        'url' => 'https://home.jacobemerick.com/',
-        'title' => "Jacob Emerick's Home",
-        'name' => 'Home'
-      ],
-      [
-        'url' => 'https://blog.jacobemerick.com/',
-        'title' => "Jacob Emerick's Blog",
-        'name' => 'Blog'
-      ],
-      [
-        'url' => 'https://lifestream.jacobemerick.com/',
-        'title' => "Jacob Emerick's Lifestream",
-        'name' => 'Lifestream'
-      ],
-      [
-        'url' => 'https://map.jacobemerick.com/',
-        'title' => "Jacob Emerick's Hiking Map",
-        'name' => 'Map'
-      ],
-      [
-        'url' => 'https://portfolio.jacobemerick.com/',
-        'title' => "Jacob Emerick's Portfolio",
-        'name' => 'Portfolio',
-      ],
-      [
-        'url' => 'https://www.waterfallsofthekeweenaw.com/',
-        'title' => 'Waterfalls of the Keweenaw',
-        'name' => 'Waterfalls'
-      ]
+	return [
+	  [
+		'url' => 'https://home.jacobemerick.com/',
+		'title' => "Jacob Emerick's Home",
+		'name' => 'Home'
+	  ],
+	  [
+		'url' => 'https://blog.jacobemerick.com/',
+		'title' => "Jacob Emerick's Blog",
+		'name' => 'Blog'
+	  ],
+	  [
+		'url' => 'https://lifestream.jacobemerick.com/',
+		'title' => "Jacob Emerick's Lifestream",
+		'name' => 'Lifestream'
+	  ],
+	  [
+		'url' => 'https://map.jacobemerick.com/',
+		'title' => "Jacob Emerick's Hiking Map",
+		'name' => 'Map'
+	  ],
+	  [
+		'url' => 'https://portfolio.jacobemerick.com/',
+		'title' => "Jacob Emerick's Portfolio",
+		'name' => 'Portfolio',
+	  ],
+	  [
+		'url' => 'https://www.waterfallsofthekeweenaw.com/',
+		'title' => 'Waterfalls of the Keweenaw',
+		'name' => 'Waterfalls'
+	  ]
   ];
 	}
 

controller/waterfalls/LogController.class.inc.php

Indentation +196 added lines, -196 removed lines

@@ -1,210 +1,210 @@
 <?
 
 Loader::load('collector', array(
-    'image/AlbumCollector',
-    'waterfall/LogCollector'));
+	'image/AlbumCollector',
+	'waterfall/LogCollector'));
 Loader::load('controller', 'waterfalls/DefaultPageController');
 
 final class LogController extends DefaultPageController
 {
 
-    private static $AUTHOR = 'Jacob Emerick';
-    private static $AUTHOR_URL = 'https://home.jacobemerick.com/';
-    private static $JOURNAL_DIRECTORY = 'journal';
-
-    private static $FULL_IMAGE_LINK = '/photo/%s/%s-size-standard.jpg';
-    private static $THUMB_IMAGE_NODE = '<img src="/photo/%s/%s-size-thumb.jpg" alt="%s" height="%s" width="%s" />';
-    private static $MEDIUM_IMAGE_NODE = '<img src="/photo/%s/%s-size-small.jpg" alt="%s" height="375" width="500" />';
-
-    private $log;
-
-    public function __construct()
-    {
-        parent::__construct();
-        
-        $log_path = URLDecode::getPiece(2);
-        
-        $this->log = LogCollector::getByAlias($log_path);
-        if(!$this->log)
-            $this->eject();
-
-        $this->parent_navigation_item = 'journal';
-        
-        $this->handle_comment_submit(
-            self::$WATERFALL_SITE_ID,
-            $this->log->alias,
-            Loader::getRootUrl('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/',
-            $this->log->title);
-        
-        $this->add_waterfall_js();
-    }
-
-    protected function set_head_data()
-    {
-        parent::set_head_data();
-        
-        $this->set_title("{$this->log->title} | " . self::$WEBSITE_TITLE);
-        $this->set_description($this->log->introduction);
-        
-        $keyword_array = array();
-        $tag_result = LogCollector::getTagListForLog($this->log->id);
-        foreach($tag_result as $tag)
-        {
-            $keyword_array[] = $tag->name;
-        }
-        
-        $this->set_keywords($keyword_array);
-    }
-
-    protected function set_body_data($page_type = 'normal')
-    {
-        parent::set_body_data($page_type);
-        
-        $this->set_body('view', 'Log');
-
-        $body_data = $this->get_formatted_log();
-        $body_data['comment_array'] = $this->get_comment_array(self::$WATERFALL_SITE_ID, $this->log->alias);
-        $body_data['sidebar'] = $this->get_sidebar();
-        $body_data['series'] = $this->get_series();
-        $body_data['album'] = $this->get_album();
-        
-        $this->set_body('data', $body_data);
-    }
-
-    private function get_formatted_log()
-    {
-        $formatted_log = array();
-        
-        $formatted_log['introduction'] = $this->get_log_introduction($this->log);
-        $formatted_log['title'] = $this->log->title;
-        $formatted_log['url'] = Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/';
-
-        $formatted_log['body'] = $this->get_formatted_log_body();
-        
-        return $formatted_log;
-    }
-
-    private function get_log_introduction($log)
-    {
-        return array(
-            'title' => $log->title,
-            'url' => Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $log->alias . '/',
-            'date' => $this->get_parsed_date($log->date),
-            'publish_date' => $this->get_parsed_date($log->publish_date),
-            'introduction' => $log->introduction,
-            'image' => sprintf(
-                self::$MEDIUM_IMAGE_NODE,
-                $log->image_category,
-                $log->image_name,
-                $log->image_description),
-            'author' => self::$AUTHOR,
-            'author_url' => self::$AUTHOR_URL,
-        );
-    }
-
-    // @todo - link things up
-    private function get_formatted_log_body()
-    {
-        $body = $this->log->body;
-        
-        $body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
-        $body = Content::instance('FixInternalLink', $body)->activate();
-        
-        return $body;
-    }
-
-    private function get_series()
-    {
-        $series = array(
-            'previous' => array(),
-            'next' => array());
-        
-        $previous_log = LogCollector::getPreviousLog($this->log->id);
-        if($previous_log != false)
-        {
-            $series['previous'] = (object) array(
-                'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $previous_log->alias . '/',
-                'title' => $previous_log->title,
-                'date' => $previous_log->date);
-        }
-        
-        $next_log = LogCollector::getNextLog($this->log->id);
-        if($next_log != false)
-        {
-            $series['next'] = (object) array(
-                'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $next_log->alias . '/',
-                'title' => $next_log->title,
-                'date' => $next_log->date);
-        }
-        
-        return $series;
-    }
-
-    private function get_sidebar()
-    {
-        $sidebar = array();
-        
-        $sidebar['companion_list'] = array();
-        $companions = LogCollector::getCompanionListForLog($this->log->id);
-        foreach($companions as $companion)
-        {
-            $sidebar['companion_list'][] = (object) array(
-                'title' => $companion->name,
-                'path' => "/companion/{$companion->alias}/");
-        }
-        
-        $sidebar['tag_list'] = array();
-        $tags = LogCollector::getTagListForLog($this->log->id);
-        foreach($tags as $tag)
-        {
-            $sidebar['tag_list'][] = (object) array(
-                'title' => $tag->name,
-                'path' => "/journal/tag/{$tag->alias}/");
-        }
-        
-        $sidebar['waterfall_list'] = array();
-        $waterfalls = LogCollector::getWaterfallListForLog($this->log->id);
-        foreach($waterfalls as $waterfall)
-        {
-            $sidebar['waterfall_list'][] = (object) array(
-                'title' => $waterfall->name,
-                'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/");
-        }
-        
-        return $sidebar;
-    }
-
-    private function get_album()
-    {
-        $album = array();
-        
-        if($this->log->album == 0)
-            return $album;
-        
-        $photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);
-        foreach($photo_list as $photo)
-        {
-            $photo_array = array();
-            $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
-            $photo_array['description'] = $photo->description;
+	private static $AUTHOR = 'Jacob Emerick';
+	private static $AUTHOR_URL = 'https://home.jacobemerick.com/';
+	private static $JOURNAL_DIRECTORY = 'journal';
+
+	private static $FULL_IMAGE_LINK = '/photo/%s/%s-size-standard.jpg';
+	private static $THUMB_IMAGE_NODE = '<img src="/photo/%s/%s-size-thumb.jpg" alt="%s" height="%s" width="%s" />';
+	private static $MEDIUM_IMAGE_NODE = '<img src="/photo/%s/%s-size-small.jpg" alt="%s" height="375" width="500" />';
+
+	private $log;
+
+	public function __construct()
+	{
+		parent::__construct();
+        
+		$log_path = URLDecode::getPiece(2);
+        
+		$this->log = LogCollector::getByAlias($log_path);
+		if(!$this->log)
+			$this->eject();
+
+		$this->parent_navigation_item = 'journal';
+        
+		$this->handle_comment_submit(
+			self::$WATERFALL_SITE_ID,
+			$this->log->alias,
+			Loader::getRootUrl('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/',
+			$this->log->title);
+        
+		$this->add_waterfall_js();
+	}
+
+	protected function set_head_data()
+	{
+		parent::set_head_data();
+        
+		$this->set_title("{$this->log->title} | " . self::$WEBSITE_TITLE);
+		$this->set_description($this->log->introduction);
+        
+		$keyword_array = array();
+		$tag_result = LogCollector::getTagListForLog($this->log->id);
+		foreach($tag_result as $tag)
+		{
+			$keyword_array[] = $tag->name;
+		}
+        
+		$this->set_keywords($keyword_array);
+	}
+
+	protected function set_body_data($page_type = 'normal')
+	{
+		parent::set_body_data($page_type);
+        
+		$this->set_body('view', 'Log');
+
+		$body_data = $this->get_formatted_log();
+		$body_data['comment_array'] = $this->get_comment_array(self::$WATERFALL_SITE_ID, $this->log->alias);
+		$body_data['sidebar'] = $this->get_sidebar();
+		$body_data['series'] = $this->get_series();
+		$body_data['album'] = $this->get_album();
+        
+		$this->set_body('data', $body_data);
+	}
+
+	private function get_formatted_log()
+	{
+		$formatted_log = array();
+        
+		$formatted_log['introduction'] = $this->get_log_introduction($this->log);
+		$formatted_log['title'] = $this->log->title;
+		$formatted_log['url'] = Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/';
+
+		$formatted_log['body'] = $this->get_formatted_log_body();
+        
+		return $formatted_log;
+	}
+
+	private function get_log_introduction($log)
+	{
+		return array(
+			'title' => $log->title,
+			'url' => Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $log->alias . '/',
+			'date' => $this->get_parsed_date($log->date),
+			'publish_date' => $this->get_parsed_date($log->publish_date),
+			'introduction' => $log->introduction,
+			'image' => sprintf(
+				self::$MEDIUM_IMAGE_NODE,
+				$log->image_category,
+				$log->image_name,
+				$log->image_description),
+			'author' => self::$AUTHOR,
+			'author_url' => self::$AUTHOR_URL,
+		);
+	}
+
+	// @todo - link things up
+	private function get_formatted_log_body()
+	{
+		$body = $this->log->body;
+        
+		$body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
+		$body = Content::instance('FixInternalLink', $body)->activate();
+        
+		return $body;
+	}
+
+	private function get_series()
+	{
+		$series = array(
+			'previous' => array(),
+			'next' => array());
+        
+		$previous_log = LogCollector::getPreviousLog($this->log->id);
+		if($previous_log != false)
+		{
+			$series['previous'] = (object) array(
+				'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $previous_log->alias . '/',
+				'title' => $previous_log->title,
+				'date' => $previous_log->date);
+		}
+        
+		$next_log = LogCollector::getNextLog($this->log->id);
+		if($next_log != false)
+		{
+			$series['next'] = (object) array(
+				'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $next_log->alias . '/',
+				'title' => $next_log->title,
+				'date' => $next_log->date);
+		}
+        
+		return $series;
+	}
+
+	private function get_sidebar()
+	{
+		$sidebar = array();
+        
+		$sidebar['companion_list'] = array();
+		$companions = LogCollector::getCompanionListForLog($this->log->id);
+		foreach($companions as $companion)
+		{
+			$sidebar['companion_list'][] = (object) array(
+				'title' => $companion->name,
+				'path' => "/companion/{$companion->alias}/");
+		}
+        
+		$sidebar['tag_list'] = array();
+		$tags = LogCollector::getTagListForLog($this->log->id);
+		foreach($tags as $tag)
+		{
+			$sidebar['tag_list'][] = (object) array(
+				'title' => $tag->name,
+				'path' => "/journal/tag/{$tag->alias}/");
+		}
+        
+		$sidebar['waterfall_list'] = array();
+		$waterfalls = LogCollector::getWaterfallListForLog($this->log->id);
+		foreach($waterfalls as $waterfall)
+		{
+			$sidebar['waterfall_list'][] = (object) array(
+				'title' => $waterfall->name,
+				'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/");
+		}
+        
+		return $sidebar;
+	}
+
+	private function get_album()
+	{
+		$album = array();
+        
+		if($this->log->album == 0)
+			return $album;
+        
+		$photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);
+		foreach($photo_list as $photo)
+		{
+			$photo_array = array();
+			$photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
+			$photo_array['description'] = $photo->description;
             
-            if($photo->height < $photo->width)
-                list($height, $width) = array(75, 100);
-            else
-                list($height, $width) = array(100, 75);
+			if($photo->height < $photo->width)
+				list($height, $width) = array(75, 100);
+			else
+				list($height, $width) = array(100, 75);
             
-            $photo_array['image_node'] = sprintf(
-                self::$THUMB_IMAGE_NODE,
-                $photo->category,
-                $photo->name,
-                $photo->description,
-                $height,
-                $width);
+			$photo_array['image_node'] = sprintf(
+				self::$THUMB_IMAGE_NODE,
+				$photo->category,
+				$photo->name,
+				$photo->description,
+				$height,
+				$width);
             
-            $album[] = (object) $photo_array;
-        }
+			$album[] = (object) $photo_array;
+		}
         
-        return $album;
-    }
+		return $album;
+	}
 
 }

controller/waterfalls/WaterfallController.class.inc.php

Indentation +193 added lines, -193 removed lines

@@ -1,231 +1,231 @@
 <?
 
 Loader::load('collector', array(
-    'image/AlbumCollector',
-    'waterfall/WatercourseCollector',
-    'waterfall/WaterfallCollector',
-    'waterfall/LogCollector'));
+	'image/AlbumCollector',
+	'waterfall/WatercourseCollector',
+	'waterfall/WaterfallCollector',
+	'waterfall/LogCollector'));
 Loader::load('controller', 'waterfalls/DefaultPageController');
 
 final class WaterfallController extends DefaultPageController
 {
 
-    private static $STANDARD_IMAGE_NODE = '<img src="/photo/%s/%s-size-standard.jpg" alt="%s" height="600" width="800" />';
-
-    private static $FULL_IMAGE_LINK = '/photo/%s/%s-size-standard.jpg';
-    private static $THUMB_IMAGE_NODE = '<img src="/photo/%s/%s-size-thumb.jpg" alt="%s" height="%s" width="%s" />';
-    private static $MEDIUM_IMAGE_NODE = '<img src="/photo/%s/%s-size-medium.jpg" alt="%s" height="375" width="500" />';
-
-    private $waterfall;
-
-    public function __construct()
-    {
-        parent::__construct();
-
-        $path_watercourse = URLDecode::getPiece(1);
-        $path_fall = URLDecode::getPiece(2);
-
-        $this->waterfall = WaterfallCollector::getByAlias($path_watercourse, $path_fall);
-        if (!$this->waterfall) {
-              $this->eject();
-        }
-        
-        $this->handle_comment_submit(
-            self::$WATERFALL_SITE_ID,
-            "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}",
-            Loader::getRootUrl('waterfalls') . "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}/",
-            $this->waterfall->name);
-        
-        $this->add_waterfall_js();
-    }
-
-    protected function set_head_data()
-    {
-        parent::set_head_data();
-
-        $this->set_title("{$this->waterfall->name} on {$this->waterfall->watercourse} | " . self::$WEBSITE_TITLE);
-        $this->set_description($this->waterfall->description);
-        $this->set_keywords((array) $this->waterfall->name);
-    }
-
-    protected function set_body_data($page_type = 'normal')
-    {
-        parent::set_body_data($page_type);
-
-        $body_data = $this->format_waterfall_data($this->waterfall);
-        $body_data['comment_array'] = $this->get_comment_array(self::$WATERFALL_SITE_ID, "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}");
-
-        $this->set_body('data', $body_data);
-
-        $this->set_body('view', 'Fall');
-    }
-
-    private function format_waterfall_data($waterfall)
-    {
-        $waterfall_data = array();
-        $waterfall_data['introduction'] = $this->get_waterfall_introduction($waterfall);
-        $waterfall_data['name'] = $waterfall->name;
-        $waterfall_data['watercourse'] = $waterfall->watercourse;
-        $waterfall_data['path'] = "/{$waterfall->watercourse_alias}/{$waterfall->alias}/";
-        $waterfall_data['tagline'] = $waterfall->introduction;
-        $waterfall_data['main_photo'] = sprintf(self::$STANDARD_IMAGE_NODE, $waterfall->photo_category, $waterfall->photo, $waterfall->photo_description);
-        $waterfall_data['album'] = $this->get_album();
-        $waterfall_data['body'] = $this->format_waterfall_content($waterfall->body);
-        $waterfall_data['directions'] = $this->format_waterfall_content($waterfall->directions);
-        $waterfall_data['sidebar'] = $this->get_sidebar($waterfall);
-
-        return $waterfall_data;
-    }
-
-    private function get_waterfall_introduction($waterfall)
-    {
-        return array(
-            'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/",
-            'name' => $waterfall->name,
-            'watercourse' => $waterfall->watercourse,
-            'tagline' => $waterfall->introduction,
-        );
-    }
-
-    private function get_main_watercourse($alias)
-    {
-        $watercourse = WatercourseCollector::getByAlias($alias);
-        if ($watercourse->parent != 0) {
-            $watercourse = WatercourseCollector::getById($watercourse->parent);
-        }
-        
-        return (object) array(
-            'name' => $watercourse->name,
-            'title' => $watercourse->name,
-            'alias' => $watercourse->alias,
-        );
-    }
-
-    private function format_waterfall_content($content)
-    {
-        $content = Content::instance('FixInternalLink', $content)->activate();
-        
-        return $content;
-    }
-
-    private function get_album()
-    {
-        $album = array();
-        
-        if($this->waterfall->album == 0)
-            return $album;
-        
-        $photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album);
-        foreach($photo_list as $photo)
-        {
-            $photo_array = array();
-            $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
-            $photo_array['description'] = $photo->description;
+	private static $STANDARD_IMAGE_NODE = '<img src="/photo/%s/%s-size-standard.jpg" alt="%s" height="600" width="800" />';
+
+	private static $FULL_IMAGE_LINK = '/photo/%s/%s-size-standard.jpg';
+	private static $THUMB_IMAGE_NODE = '<img src="/photo/%s/%s-size-thumb.jpg" alt="%s" height="%s" width="%s" />';
+	private static $MEDIUM_IMAGE_NODE = '<img src="/photo/%s/%s-size-medium.jpg" alt="%s" height="375" width="500" />';
+
+	private $waterfall;
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$path_watercourse = URLDecode::getPiece(1);
+		$path_fall = URLDecode::getPiece(2);
+
+		$this->waterfall = WaterfallCollector::getByAlias($path_watercourse, $path_fall);
+		if (!$this->waterfall) {
+			  $this->eject();
+		}
+        
+		$this->handle_comment_submit(
+			self::$WATERFALL_SITE_ID,
+			"{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}",
+			Loader::getRootUrl('waterfalls') . "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}/",
+			$this->waterfall->name);
+        
+		$this->add_waterfall_js();
+	}
+
+	protected function set_head_data()
+	{
+		parent::set_head_data();
+
+		$this->set_title("{$this->waterfall->name} on {$this->waterfall->watercourse} | " . self::$WEBSITE_TITLE);
+		$this->set_description($this->waterfall->description);
+		$this->set_keywords((array) $this->waterfall->name);
+	}
+
+	protected function set_body_data($page_type = 'normal')
+	{
+		parent::set_body_data($page_type);
+
+		$body_data = $this->format_waterfall_data($this->waterfall);
+		$body_data['comment_array'] = $this->get_comment_array(self::$WATERFALL_SITE_ID, "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}");
+
+		$this->set_body('data', $body_data);
+
+		$this->set_body('view', 'Fall');
+	}
+
+	private function format_waterfall_data($waterfall)
+	{
+		$waterfall_data = array();
+		$waterfall_data['introduction'] = $this->get_waterfall_introduction($waterfall);
+		$waterfall_data['name'] = $waterfall->name;
+		$waterfall_data['watercourse'] = $waterfall->watercourse;
+		$waterfall_data['path'] = "/{$waterfall->watercourse_alias}/{$waterfall->alias}/";
+		$waterfall_data['tagline'] = $waterfall->introduction;
+		$waterfall_data['main_photo'] = sprintf(self::$STANDARD_IMAGE_NODE, $waterfall->photo_category, $waterfall->photo, $waterfall->photo_description);
+		$waterfall_data['album'] = $this->get_album();
+		$waterfall_data['body'] = $this->format_waterfall_content($waterfall->body);
+		$waterfall_data['directions'] = $this->format_waterfall_content($waterfall->directions);
+		$waterfall_data['sidebar'] = $this->get_sidebar($waterfall);
+
+		return $waterfall_data;
+	}
+
+	private function get_waterfall_introduction($waterfall)
+	{
+		return array(
+			'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/",
+			'name' => $waterfall->name,
+			'watercourse' => $waterfall->watercourse,
+			'tagline' => $waterfall->introduction,
+		);
+	}
+
+	private function get_main_watercourse($alias)
+	{
+		$watercourse = WatercourseCollector::getByAlias($alias);
+		if ($watercourse->parent != 0) {
+			$watercourse = WatercourseCollector::getById($watercourse->parent);
+		}
+        
+		return (object) array(
+			'name' => $watercourse->name,
+			'title' => $watercourse->name,
+			'alias' => $watercourse->alias,
+		);
+	}
+
+	private function format_waterfall_content($content)
+	{
+		$content = Content::instance('FixInternalLink', $content)->activate();
+        
+		return $content;
+	}
+
+	private function get_album()
+	{
+		$album = array();
+        
+		if($this->waterfall->album == 0)
+			return $album;
+        
+		$photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album);
+		foreach($photo_list as $photo)
+		{
+			$photo_array = array();
+			$photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
+			$photo_array['description'] = $photo->description;
             
-            if($photo->height < $photo->width)
-                list($height, $width) = array(75, 100);
-            else
-                list($height, $width) = array(100, 75);
+			if($photo->height < $photo->width)
+				list($height, $width) = array(75, 100);
+			else
+				list($height, $width) = array(100, 75);
             
-            $photo_array['image_node'] = sprintf(
-                self::$THUMB_IMAGE_NODE,
-                $photo->category,
-                $photo->name,
-                $photo->description,
-                $height,
-                $width);
+			$photo_array['image_node'] = sprintf(
+				self::$THUMB_IMAGE_NODE,
+				$photo->category,
+				$photo->name,
+				$photo->description,
+				$height,
+				$width);
             
-            $album[] = (object) $photo_array;
-        }
+			$album[] = (object) $photo_array;
+		}
         
-        return $album;
-    }
+		return $album;
+	}
 
 	private function get_sidebar($waterfall)
 	{
 		$sidebar_data = array();
 		$sidebar_data['name'] = $waterfall->name;
 		$sidebar_data['watercourse'] = $waterfall->watercourse;
-        $sidebar_data['main_watercourse'] = $this->get_main_watercourse($waterfall->watercourse_alias);
+		$sidebar_data['main_watercourse'] = $this->get_main_watercourse($waterfall->watercourse_alias);
 		$sidebar_data['rating_display'] = ($waterfall->rating / 2) . '/5';
-        $sidebar_data['rating'] = $waterfall->rating;
+		$sidebar_data['rating'] = $waterfall->rating;
 		$sidebar_data['height'] = Content::instance('ImperialUnit', $waterfall->height)->activate('inches');
 		$sidebar_data['width'] = Content::instance('ImperialUnit', $waterfall->width)->activate('inches');
 		$sidebar_data['drop_height'] = Content::instance('ImperialUnit', $waterfall->drop_height)->activate('inches');
 		$sidebar_data['drop_count'] = $waterfall->drop_count;
 		
-        $sidebar_data['county'] = (object) array (
-            'name' => $waterfall->county,
-            'alias' => $waterfall->county_alias,
-            'title' => $waterfall->county_title,
-        );
+		$sidebar_data['county'] = (object) array (
+			'name' => $waterfall->county,
+			'alias' => $waterfall->county_alias,
+			'title' => $waterfall->county_title,
+		);
         
 		$sidebar_data['nearest_town'] = $waterfall->nearest_town;
 		$sidebar_data['latitude'] = round($waterfall->latitude, 5);
 		$sidebar_data['longitude'] = round($waterfall->longitude, 5);
 		$sidebar_data['elevation'] = Content::instance('ImperialUnit', $waterfall->elevation)->activate('feet');
         
-        $sidebar_data['map'] = $this->get_map_piece($waterfall);
+		$sidebar_data['map'] = $this->get_map_piece($waterfall);
         
-        $sidebar_data['journal_list'] = $this->get_journal_list($waterfall->id);
+		$sidebar_data['journal_list'] = $this->get_journal_list($waterfall->id);
         
-        $sidebar_data['nearby_list'] = $this->get_nearby_list($waterfall->id);
+		$sidebar_data['nearby_list'] = $this->get_nearby_list($waterfall->id);
 		
 		return $sidebar_data;
 	}
 
-    private function get_journal_list($waterfall)
-    {
-        $list = array();
-        $log_result = LogCollector::getLogListForWaterfall($waterfall);
-        foreach ($log_result as $log_row) {
-            $list[] = (object) array(
-                'date' => date('F j, Y', strtotime($log_row->date)),
-                'title' => $log_row->title,
-                'url' => "/journal/{$log_row->alias}/",
-            );
-        }
-        
-        return $list;
-    }
-
-    private function get_map_piece($waterfall)
-    {
-        $map_holder = array();
-        
-        $url = 'https://maps.googleapis.com/maps/api/staticmap';
-        $url .= "?center={$waterfall->latitude},{$waterfall->longitude}";
-        $url .= "&zoom=8";
-        $url .= "&maptype=terrain";
-        $url .= "&size=230x200";
-        $url .= "&markers=color:red|size:small|{$waterfall->latitude},{$waterfall->longitude}";
-        $url .= "&sensor=false";
-        $url .= "&key=AIzaSyA3eWALjUTSIa44KsbOUYRpG0oMd3aNo00";
-        
-        $image = "<img src=\"{$url}\" height=\"200\" width=\"230\" alt=\"{$waterfall->name} Location\" />";
-        $map_holder['image'] = $image;
-        
-        $map_holder['uri'] = '/map/';
-        $map_holder['title'] = "View {$waterfall->name} on a larger map";
-        
-        return (object) $map_holder;
-    }
-
-    private function get_nearby_list($waterfall)
-    {
-        $nearby_list = array();
-        
-        $result = WaterfallCollector::getNearbyList($waterfall);
-        foreach ($result as $row) {
-            $nearby_list[] = (object) array(
-                'url' => "/{$row->watercourse_alias}/{$row->alias}/",
-                'anchor' => $row->name,
-                'title' => "{$row->name} of {$row->watercourse}",
-                'distance' => Content::instance('ImperialUnit', $row->distance)->activate(false),
-            );
-        }
-        
-        return $nearby_list;
-    }
+	private function get_journal_list($waterfall)
+	{
+		$list = array();
+		$log_result = LogCollector::getLogListForWaterfall($waterfall);
+		foreach ($log_result as $log_row) {
+			$list[] = (object) array(
+				'date' => date('F j, Y', strtotime($log_row->date)),
+				'title' => $log_row->title,
+				'url' => "/journal/{$log_row->alias}/",
+			);
+		}
+        
+		return $list;
+	}
+
+	private function get_map_piece($waterfall)
+	{
+		$map_holder = array();
+        
+		$url = 'https://maps.googleapis.com/maps/api/staticmap';
+		$url .= "?center={$waterfall->latitude},{$waterfall->longitude}";
+		$url .= "&zoom=8";
+		$url .= "&maptype=terrain";
+		$url .= "&size=230x200";
+		$url .= "&markers=color:red|size:small|{$waterfall->latitude},{$waterfall->longitude}";
+		$url .= "&sensor=false";
+		$url .= "&key=AIzaSyA3eWALjUTSIa44KsbOUYRpG0oMd3aNo00";
+        
+		$image = "<img src=\"{$url}\" height=\"200\" width=\"230\" alt=\"{$waterfall->name} Location\" />";
+		$map_holder['image'] = $image;
+        
+		$map_holder['uri'] = '/map/';
+		$map_holder['title'] = "View {$waterfall->name} on a larger map";
+        
+		return (object) $map_holder;
+	}
+
+	private function get_nearby_list($waterfall)
+	{
+		$nearby_list = array();
+        
+		$result = WaterfallCollector::getNearbyList($waterfall);
+		foreach ($result as $row) {
+			$nearby_list[] = (object) array(
+				'url' => "/{$row->watercourse_alias}/{$row->alias}/",
+				'anchor' => $row->name,
+				'title' => "{$row->name} of {$row->watercourse}",
+				'distance' => Content::instance('ImperialUnit', $row->distance)->activate(false),
+			);
+		}
+        
+		return $nearby_list;
+	}
 
 }

utility/Loader.class.inc.php

Indentation +12 added lines, -12 removed lines

@@ -173,17 +173,17 @@
 		return self::instance()->is_live;
 	}
 
-    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) {
-                return "{$protocol}://www.waterfallsofthekeweenaw.com/";
-            } else {
-                return $protocol . '://' . (self::instance()->is_live ? '' : 'dev.') . $site . '.jacobemerick.com/';
-            }
-        }
-        return '/';
-    }
+	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) {
+				return "{$protocol}://www.waterfallsofthekeweenaw.com/";
+			} else {
+				return $protocol . '://' . (self::instance()->is_live ? '' : 'dev.') . $site . '.jacobemerick.com/';
+			}
+		}
+		return '/';
+	}
 
 }

utility/URLDecode.class.inc.php

Indentation +10 added lines, -10 removed lines

@@ -24,21 +24,21 @@
 		
 		self::$array['host'] = $host;
 		
-    if (
-      $host == 'www.waterfallsofthekeweenaw.com' ||
-      $host == 'waterfallsofthekeweenaw.com'
-    ) {
+	if (
+	  $host == 'www.waterfallsofthekeweenaw.com' ||
+	  $host == 'waterfallsofthekeweenaw.com'
+	) {
 			self::$array['site'] = 'waterfalls';
 		} else {
 			self::$array['site'] = substr($host, 0, strpos($host, '.'));
 		}
 
-    $base = '';
-    $base .= (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
-    $base .= '://';
-    $base .= (!Loader::isLive()) ? 'dev' : '';
-    $base .= $host;
-    $base .= '/';
+	$base = '';
+	$base .= (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
+	$base .= '://';
+	$base .= (!Loader::isLive()) ? 'dev' : '';
+	$base .= $host;
+	$base .= '/';
 
 		self::$array['base'] = $base;
 		self::$array['uri'] = '/' . implode('/', $uri_array);

router/Router.class.inc.php

Indentation +7 added lines, -7 removed lines

@@ -75,19 +75,19 @@ 
 		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
 			$redirect_uri .= '/';
 		
-        if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
-            $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
-            $redirect_uri = $protocol . '://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
-        }
+		if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
+			$protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
+			$redirect_uri = $protocol . '://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
+		}
         
 		if($redirect_uri == URLDecode::getURI())
 			return;
 		
 		$controller_check = $redirect_uri;
 		if(substr($redirect_uri, 0, 4) == 'http') {
-      $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
+	  $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
 			$controller_check = preg_replace('@^' . $protocol . '://([a-z\.]+)@', '', $redirect_uri);
-    }
+	}
 		
 		$controller = $this->get_controller($controller_check);
 		if($controller == '/Error404Controller')
@@ -138,7 +138,7 @@ 
 	{
 		return (
 			URLDecode::getExtension() != 'json' &&
-            strstr(URLDecode::getURI(), '#') === false);
+			strstr(URLDecode::getURI(), '#') === false);
 	}
 
 }

src/Domain/Stream/Activity/MysqlActivityRepository.php

Indentation +75 added lines, -75 removed lines

@@ -7,108 +7,108 @@
 class MysqlActivityRepository implements ActivityRepositoryInterface
 {
 
-    /** @var  ConnectionLocator */
-    protected $connections;
+	/** @var  ConnectionLocator */
+	protected $connections;
 
-    /**
-     * @param ConnectonLocator $connections
-     */
-    public function __construct(ConnectionLocator $connections)
-    {
-        $this->connections = $connections;
-    }
+	/**
+	 * @param ConnectonLocator $connections
+	 */
+	public function __construct(ConnectionLocator $connections)
+	{
+		$this->connections = $connections;
+	}
 
-    /**
-     * @param integer $id
-     *
-     * @return array|false
-     */
-    public function getActivityById($id)
-    {
-        $query = "
+	/**
+	 * @param integer $id
+	 *
+	 * @return array|false
+	 */
+	public function getActivityById($id)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`activity`
             WHERE `id` = :id
             LIMIT 1";
-        $bindings = [
-            'id' => $id,
-        ];
+		$bindings = [
+			'id' => $id,
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchOne($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchOne($query, $bindings);
+	}
 
-    /**
-     * @param integer $limit
-     * @param integer $offset
-     *
-     * @return array|false
-     */
-    public function getActivities($limit = null, $offset = 0)
-    {
-        $query = "
+	/**
+	 * @param integer $limit
+	 * @param integer $offset
+	 *
+	 * @return array|false
+	 */
+	public function getActivities($limit = null, $offset = 0)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`activity`
             ORDER BY `datetime` DESC";
-        if (!is_null($limit)) {
-            $query .= "
+		if (!is_null($limit)) {
+			$query .= "
             LIMIT {$offset}, {$limit}";
-        }
+		}
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query);
+	}
 
-    public function getActivitiesCount()
-    {
-        $query = "
+	public function getActivitiesCount()
+	{
+		$query = "
             SELECT COUNT(1) AS `count`
             FROM `jpemeric_stream`.`activity`";
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchValue($query);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchValue($query);
+	}
 
-    public function getActivitiesByType($type, $limit = null, $offset = 0)
-    {
-        $query = "
+	public function getActivitiesByType($type, $limit = null, $offset = 0)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`activity`
             WHERE `type` = :type
             ORDER BY `datetime` DESC";
-        if (!is_null($limit)) {
-            $query .= "
+		if (!is_null($limit)) {
+			$query .= "
             LIMIT {$offset}, {$limit}";
-        }
-        $bindings = [
-            'type' => $type,
-        ];
+		}
+		$bindings = [
+			'type' => $type,
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query, $bindings);
+	}
 
-    public function getActivitiesByTypeCount($type)
-    {
-        $query = "
+	public function getActivitiesByTypeCount($type)
+	{
+		$query = "
             SELECT COUNT(1) AS `count`
             FROM `jpemeric_stream`.`activity`
             WHERE `type` = :type";
-        $bindings = [
-            'type' => $type,
-        ];
+		$bindings = [
+			'type' => $type,
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchValue($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchValue($query, $bindings);
+	}
 }

src/Domain/Stream/Changelog/MysqlChangelogRepository.php

Indentation +26 added lines, -26 removed lines

@@ -7,37 +7,37 @@
 class MysqlChangelogRepository implements ChangelogRepositoryInterface
 {
 
-    /** @var  ConnectionLocator */
-    protected $connections;
+	/** @var  ConnectionLocator */
+	protected $connections;
 
-    /**
-     * @param ConnectonLocator $connections
-     */
-    public function __construct(ConnectionLocator $connections)
-    {
-        $this->connections = $connections;
-    }
+	/**
+	 * @param ConnectonLocator $connections
+	 */
+	public function __construct(ConnectionLocator $connections)
+	{
+		$this->connections = $connections;
+	}
 
-    /**
-     * @param integer $limit
-     * @param integer $offset
-     *
-     * @return array|false
-     */
-    public function getChanges($limit = null, $offset = 0)
-    {
-        $query = "
+	/**
+	 * @param integer $limit
+	 * @param integer $offset
+	 *
+	 * @return array|false
+	 */
+	public function getChanges($limit = null, $offset = 0)
+	{
+		$query = "
             SELECT `message`, `message_short`, `datetime`, `commit_link`
             FROM `jpemeric_stream`.`changelog`
             ORDER BY `datetime` DESC";
-        if (!is_null($limit)) {
-            $query .= "
+		if (!is_null($limit)) {
+			$query .= "
             LIMIT {$offset}, {$limit}";
-        }
+		}
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query);
+	}
 }

tests/unit/Domain/Blog/Series/MysqlSeriesRepositoryTest.php

Indentation +352 added lines, -352 removed lines

@@ -9,14 +9,14 @@ 
 class MysqlSeriesRepositoryTest extends PHPUnit_Framework_TestCase
 {
 
-    protected static $connection;
+	protected static $connection;
 
-    public static function setUpBeforeClass()
-    {
-        $extendedPdo = new ExtendedPdo('sqlite::memory:');
-        $extendedPdo->exec("ATTACH DATABASE `jpemeric_blog.db` AS `jpemeric_blog`");
+	public static function setUpBeforeClass()
+	{
+		$extendedPdo = new ExtendedPdo('sqlite::memory:');
+		$extendedPdo->exec("ATTACH DATABASE `jpemeric_blog.db` AS `jpemeric_blog`");
 
-        $extendedPdo->exec("
+		$extendedPdo->exec("
             CREATE TABLE IF NOT EXISTS `jpemeric_blog`.`post` (
                 `id` integer PRIMARY KEY AUTOINCREMENT,
                 `title` varchar(60) NOT NULL,
@@ -26,380 +26,380 @@ 
                 `body` text,
                 `display` integer(1) NOT NULL
             )"
-        );
-        $extendedPdo->exec("
+		);
+		$extendedPdo->exec("
             CREATE TABLE IF NOT EXISTS `jpemeric_blog`.`series` (
                 `id` integer PRIMARY KEY AUTOINCREMENT,
                 `title` text NOT NULL,
                 `description` text NOT NULL
             )"
-        );
-        $extendedPdo->exec("
+		);
+		$extendedPdo->exec("
             CREATE TABLE IF NOT EXISTS `jpemeric_blog`.`series_post` (
                 `series` integer NOT NULL,
                 `post` integer NOT NULL,
                 `order` integer(1) NOT NULL
             )"
-        );
-
-        self::$connection = new ConnectionLocator(function () use ($extendedPdo) {
-            return $extendedPdo;
-        });
-    }
-
-    public function testIsInstanceOfSeriesRepository()
-    {
-        $repository = new MysqlSeriesRepository(self::$connection);
-
-        $this->assertInstanceOf(
-            'Jacobemerick\Web\Domain\Blog\Series\MysqlSeriesRepository',
-            $repository
-        );
-    }
-
-    public function testImplementsSeriesInterface()
-    {
-        $repository = new MysqlSeriesRepository(self::$connection);
-
-        $this->assertInstanceOf(
-            'Jacobemerick\Web\Domain\Blog\Series\SeriesRepositoryInterface',
-            $repository
-        );
-    }
-
-    public function testConstructSetsConnections()
-    {
-        $respository = new MysqlSeriesRepository(self::$connection);
-
-        $this->assertAttributeSame(
-            self::$connection,
-            'connections',
-            $respository
-        );
-    }
-
-    public function testGetSeriesForPost()
-    {
-        $testPostData = [
-            [
-                'id' => rand(1, 100),
-                'title' => 'test one',
-                'category' => 'test category',
-                'path' => 'test-one',
-                'display' => 1,
-            ],
-            [
-                'id' => rand(101, 200),
-                'title' => 'test two',
-                'category' => 'test category',
-                'path' => 'test-two',
-                'display' => 1,
-            ],
-        ];
-
-        $testSeriesData = [
-            [
-                'id' => rand(1, 100),
-                'title' => 'test one',
-                'description' => 'test description',
-            ],
-        ];
-
-        $testSeriesPostData = [];
-        foreach ($testPostData as $testPostDataRow) {
-            array_push($testSeriesPostData, [
-                'series' => reset($testSeriesData)['id'],
-                'post' => $testPostDataRow['id'],
-            ]);
-        }
-
-        array_walk($testPostData, [$this, 'insertPostData']);
-        array_walk($testSeriesData, [$this, 'insertSeriesData']);
-        array_walk($testSeriesPostData, [$this, 'insertSeriesPostData']);
-
-        $repository = new MysqlSeriesRepository(self::$connection);
-        $data = $repository->getSeriesForPost(reset($testPostData)['id']);
-
-        $this->assertNotFalse($data);
-        $this->assertInternalType('array', $data);
-        foreach ($testPostData as $key => $testPostRow) {
-            $this->assertInternalType('array', $data[$key]);
-            $this->assertArrayHasKey('series_title', $data[$key]);
-            $this->assertEquals(reset($testSeriesData)['title'], $data[$key]['series_title']);
-            $this->assertArrayHasKey('series_description', $data[$key]);
-            $this->assertEquals(reset($testSeriesData)['description'], $data[$key]['series_description']);
-            $this->assertArrayHasKey('post', $data[$key]);
-            $this->assertEquals($testPostRow['id'], $data[$key]['post']);
-            $this->assertArrayHasKey('title', $data[$key]);
-            $this->assertEquals($testPostRow['title'], $data[$key]['title']);
-            $this->assertArrayHasKey('category', $data[$key]);
-            $this->assertEquals($testPostRow['category'], $data[$key]['category']);
-            $this->assertArrayHasKey('path', $data[$key]);
-            $this->assertEquals($testPostRow['path'], $data[$key]['path']);
-        }
-    }
-
-    public function testGetSeriesForPostOrder()
-    {
-        $testPostData = [
-            [
-                'id' => rand(1, 100),
-                'display' => 1,
-            ],
-            [
-                'id' => rand(101, 200),
-                'display' => 1,
-            ],
-            [
-                'id' => rand(201, 300),
-                'display' => 1,
-            ],
-        ];
-
-        $testSeriesData = [
-            [
-                'id' => rand(1, 100),
-            ],
-        ];
-
-        $order = [1, 2, 3];
-        shuffle($order);
-        $testSeriesPostData = [];
-        foreach ($testPostData as $key => $testPostDataRow) {
-            array_push($testSeriesPostData, [
-                'series' => reset($testSeriesData)['id'],
-                'post' => $testPostDataRow['id'],
-                'order' => $order[$key],
-            ]);
-        }
-
-        array_walk($testPostData, [$this, 'insertPostData']);
-        array_walk($testSeriesData, [$this, 'insertSeriesData']);
-        array_walk($testSeriesPostData, [$this, 'insertSeriesPostData']);
-
-        $repository = new MysqlSeriesRepository(self::$connection);
-        $data = $repository->getSeriesForPost(reset($testPostData)['id']);
-
-        usort($testPostData, function ($rowA, $rowB) use ($testSeriesPostData) {
-            $seriesA = array_filter($testSeriesPostData, function ($row) use ($rowA) {
-                return ($rowA['id'] == $row['post']);
-            });
-            $seriesB = array_filter($testSeriesPostData, function ($row) use ($rowB) {
-                return ($rowB['id'] == $row['post']);
-            });
-
-            return (reset($seriesA)['order'] > reset($seriesB)['order']);
-        });
-
-        $this->assertNotFalse($data);
-        $this->assertInternalType('array', $data);
-        foreach ($testPostData as $key => $testPostRow) {
-            $this->assertInternalType('array', $data[$key]);
-            $this->assertArrayHasKey('post', $data[$key]);
-            $this->assertEquals($testPostRow['id'], $data[$key]['post']);
-        }
-    }
+		);
+
+		self::$connection = new ConnectionLocator(function () use ($extendedPdo) {
+			return $extendedPdo;
+		});
+	}
+
+	public function testIsInstanceOfSeriesRepository()
+	{
+		$repository = new MysqlSeriesRepository(self::$connection);
+
+		$this->assertInstanceOf(
+			'Jacobemerick\Web\Domain\Blog\Series\MysqlSeriesRepository',
+			$repository
+		);
+	}
+
+	public function testImplementsSeriesInterface()
+	{
+		$repository = new MysqlSeriesRepository(self::$connection);
+
+		$this->assertInstanceOf(
+			'Jacobemerick\Web\Domain\Blog\Series\SeriesRepositoryInterface',
+			$repository
+		);
+	}
+
+	public function testConstructSetsConnections()
+	{
+		$respository = new MysqlSeriesRepository(self::$connection);
+
+		$this->assertAttributeSame(
+			self::$connection,
+			'connections',
+			$respository
+		);
+	}
+
+	public function testGetSeriesForPost()
+	{
+		$testPostData = [
+			[
+				'id' => rand(1, 100),
+				'title' => 'test one',
+				'category' => 'test category',
+				'path' => 'test-one',
+				'display' => 1,
+			],
+			[
+				'id' => rand(101, 200),
+				'title' => 'test two',
+				'category' => 'test category',
+				'path' => 'test-two',
+				'display' => 1,
+			],
+		];
+
+		$testSeriesData = [
+			[
+				'id' => rand(1, 100),
+				'title' => 'test one',
+				'description' => 'test description',
+			],
+		];
+
+		$testSeriesPostData = [];
+		foreach ($testPostData as $testPostDataRow) {
+			array_push($testSeriesPostData, [
+				'series' => reset($testSeriesData)['id'],
+				'post' => $testPostDataRow['id'],
+			]);
+		}
+
+		array_walk($testPostData, [$this, 'insertPostData']);
+		array_walk($testSeriesData, [$this, 'insertSeriesData']);
+		array_walk($testSeriesPostData, [$this, 'insertSeriesPostData']);
+
+		$repository = new MysqlSeriesRepository(self::$connection);
+		$data = $repository->getSeriesForPost(reset($testPostData)['id']);
+
+		$this->assertNotFalse($data);
+		$this->assertInternalType('array', $data);
+		foreach ($testPostData as $key => $testPostRow) {
+			$this->assertInternalType('array', $data[$key]);
+			$this->assertArrayHasKey('series_title', $data[$key]);
+			$this->assertEquals(reset($testSeriesData)['title'], $data[$key]['series_title']);
+			$this->assertArrayHasKey('series_description', $data[$key]);
+			$this->assertEquals(reset($testSeriesData)['description'], $data[$key]['series_description']);
+			$this->assertArrayHasKey('post', $data[$key]);
+			$this->assertEquals($testPostRow['id'], $data[$key]['post']);
+			$this->assertArrayHasKey('title', $data[$key]);
+			$this->assertEquals($testPostRow['title'], $data[$key]['title']);
+			$this->assertArrayHasKey('category', $data[$key]);
+			$this->assertEquals($testPostRow['category'], $data[$key]['category']);
+			$this->assertArrayHasKey('path', $data[$key]);
+			$this->assertEquals($testPostRow['path'], $data[$key]['path']);
+		}
+	}
+
+	public function testGetSeriesForPostOrder()
+	{
+		$testPostData = [
+			[
+				'id' => rand(1, 100),
+				'display' => 1,
+			],
+			[
+				'id' => rand(101, 200),
+				'display' => 1,
+			],
+			[
+				'id' => rand(201, 300),
+				'display' => 1,
+			],
+		];
+
+		$testSeriesData = [
+			[
+				'id' => rand(1, 100),
+			],
+		];
+
+		$order = [1, 2, 3];
+		shuffle($order);
+		$testSeriesPostData = [];
+		foreach ($testPostData as $key => $testPostDataRow) {
+			array_push($testSeriesPostData, [
+				'series' => reset($testSeriesData)['id'],
+				'post' => $testPostDataRow['id'],
+				'order' => $order[$key],
+			]);
+		}
+
+		array_walk($testPostData, [$this, 'insertPostData']);
+		array_walk($testSeriesData, [$this, 'insertSeriesData']);
+		array_walk($testSeriesPostData, [$this, 'insertSeriesPostData']);
+
+		$repository = new MysqlSeriesRepository(self::$connection);
+		$data = $repository->getSeriesForPost(reset($testPostData)['id']);
+
+		usort($testPostData, function ($rowA, $rowB) use ($testSeriesPostData) {
+			$seriesA = array_filter($testSeriesPostData, function ($row) use ($rowA) {
+				return ($rowA['id'] == $row['post']);
+			});
+			$seriesB = array_filter($testSeriesPostData, function ($row) use ($rowB) {
+				return ($rowB['id'] == $row['post']);
+			});
+
+			return (reset($seriesA)['order'] > reset($seriesB)['order']);
+		});
+
+		$this->assertNotFalse($data);
+		$this->assertInternalType('array', $data);
+		foreach ($testPostData as $key => $testPostRow) {
+			$this->assertInternalType('array', $data[$key]);
+			$this->assertArrayHasKey('post', $data[$key]);
+			$this->assertEquals($testPostRow['id'], $data[$key]['post']);
+		}
+	}
  
-    public function testGetSeriesForPostSeriesFilter()
-    {
-        $testPostAData = [
-            [
-                'id' => rand(1, 100),
-                'display' => 1,
-            ],
-            [
-                'id' => rand(101, 200),
-                'display' => 1,
-            ],
-        ];
-
-        $testPostBData = [
-            [
-                'id' => rand(501, 600),
-                'display' => 1,
-            ],
-            [
-                'id' => rand(601, 700),
-                'display' => 1,
-            ],
-        ];
-
-        $testSeriesData = [
-            [
-                'id' => rand(1, 100),
-            ],
-            [
-                'id' => rand(101, 200),
-            ],
-        ];
-
-        $testSeriesPostData = [];
-        foreach ($testPostAData as $testPostDataRow) {
-            array_push($testSeriesPostData, [
-                'series' => $testSeriesData[0]['id'],
-                'post' => $testPostDataRow['id'],
-            ]);
-        }
-        foreach ($testPostBData as $testPostDataRow) {
-            array_push($testSeriesPostData, [
-                'series' => $testSeriesData[1]['id'],
-                'post' => $testPostDataRow['id'],
-            ]);
-        }
-
-        $testPostData = array_merge($testPostAData, $testPostBData);
-        array_walk($testPostData, [$this, 'insertPostData']);
-        array_walk($testSeriesData, [$this, 'insertSeriesData']);
-        array_walk($testSeriesPostData, [$this, 'insertSeriesPostData']);
-
-        $repository = new MysqlSeriesRepository(self::$connection);
-        $data = $repository->getSeriesForPost(reset($testPostAData)['id']);
-
-        $this->assertNotFalse($data);
-        $this->assertInternalType('array', $data);
-
-        $testPosts = array_column($testPostAData, 'id');
-        $dataPosts = array_column($data, 'post');
-
-        $this->assertEmpty(array_merge(
-            array_diff($testPosts, $dataPosts),
-            array_diff($dataPosts, $testPosts)
-        ));
-    }
+	public function testGetSeriesForPostSeriesFilter()
+	{
+		$testPostAData = [
+			[
+				'id' => rand(1, 100),
+				'display' => 1,
+			],
+			[
+				'id' => rand(101, 200),
+				'display' => 1,
+			],
+		];
+
+		$testPostBData = [
+			[
+				'id' => rand(501, 600),
+				'display' => 1,
+			],
+			[
+				'id' => rand(601, 700),
+				'display' => 1,
+			],
+		];
+
+		$testSeriesData = [
+			[
+				'id' => rand(1, 100),
+			],
+			[
+				'id' => rand(101, 200),
+			],
+		];
+
+		$testSeriesPostData = [];
+		foreach ($testPostAData as $testPostDataRow) {
+			array_push($testSeriesPostData, [
+				'series' => $testSeriesData[0]['id'],
+				'post' => $testPostDataRow['id'],
+			]);
+		}
+		foreach ($testPostBData as $testPostDataRow) {
+			array_push($testSeriesPostData, [
+				'series' => $testSeriesData[1]['id'],
+				'post' => $testPostDataRow['id'],
+			]);
+		}
+
+		$testPostData = array_merge($testPostAData, $testPostBData);
+		array_walk($testPostData, [$this, 'insertPostData']);
+		array_walk($testSeriesData, [$this, 'insertSeriesData']);
+		array_walk($testSeriesPostData, [$this, 'insertSeriesPostData']);
+
+		$repository = new MysqlSeriesRepository(self::$connection);
+		$data = $repository->getSeriesForPost(reset($testPostAData)['id']);
+
+		$this->assertNotFalse($data);
+		$this->assertInternalType('array', $data);
+
+		$testPosts = array_column($testPostAData, 'id');
+		$dataPosts = array_column($data, 'post');
+
+		$this->assertEmpty(array_merge(
+			array_diff($testPosts, $dataPosts),
+			array_diff($dataPosts, $testPosts)
+		));
+	}
  
-    public function testGetSeriesForPostInactive()
-    {
-        $testPostData = [
-            [
-                'id' => rand(1, 100),
-                'display' => 1,
-            ],
-            [
-                'id' => rand(101, 200),
-                'display' => 0,
-            ],
-            [
-                'id' => rand(201, 300),
-                'display' => 0,
-            ],
-        ];
-
-        $testSeriesData = [
-            [
-                'id' => rand(1, 100),
-            ],
-        ];
-
-        $testSeriesPostData = [];
-        foreach ($testPostData as $testPostDataRow) {
-            array_push($testSeriesPostData, [
-                'series' => reset($testSeriesData)['id'],
-                'post' => $testPostDataRow['id'],
-            ]);
-        }
-
-        array_walk($testPostData, [$this, 'insertPostData']);
-        array_walk($testSeriesData, [$this, 'insertSeriesData']);
-        array_walk($testSeriesPostData, [$this, 'insertSeriesPostData']);
-
-        $repository = new MysqlSeriesRepository(self::$connection);
-        $data = $repository->getSeriesForPost(reset($testPostData)['id']);
-
-        $this->assertNotFalse($data);
-        $this->assertInternalType('array', $data);
-
-        $testPostData = array_filter($testPostData, function ($row) {
-            return ($row['display'] == 1);
-        });
-        $testPosts = array_column($testPostData, 'id');
-        $dataPosts = array_column($data, 'post');
-
-        $this->assertEmpty(array_merge(
-            array_diff($testPosts, $dataPosts),
-            array_diff($dataPosts, $testPosts)
-        ));
-    }
-
-    public function testGetSeriesForPostFailure()
-    {
-        $repository = new MysqlSeriesRepository(self::$connection);
-        $data = $repository->getSeriesForPost(rand(1, 100));
-
-        $this->assertEmpty($data);
-        $this->assertInternalType('array', $data);
-    }
-
-    protected function insertPostData(array $data)
-    {
-        $defaultData = [
-            'id' => null,
-            'title' => '',
-            'path' => '',
-            'category' => '',
-            'date' => '',
-            'body' => '',
-            'display' => 0,
-        ];
-
-        $data = array_merge($defaultData, $data);
-
-        return self::$connection->getDefault()->perform("
+	public function testGetSeriesForPostInactive()
+	{
+		$testPostData = [
+			[
+				'id' => rand(1, 100),
+				'display' => 1,
+			],
+			[
+				'id' => rand(101, 200),
+				'display' => 0,
+			],
+			[
+				'id' => rand(201, 300),
+				'display' => 0,
+			],
+		];
+
+		$testSeriesData = [
+			[
+				'id' => rand(1, 100),
+			],
+		];
+
+		$testSeriesPostData = [];
+		foreach ($testPostData as $testPostDataRow) {
+			array_push($testSeriesPostData, [
+				'series' => reset($testSeriesData)['id'],
+				'post' => $testPostDataRow['id'],
+			]);
+		}
+
+		array_walk($testPostData, [$this, 'insertPostData']);
+		array_walk($testSeriesData, [$this, 'insertSeriesData']);
+		array_walk($testSeriesPostData, [$this, 'insertSeriesPostData']);
+
+		$repository = new MysqlSeriesRepository(self::$connection);
+		$data = $repository->getSeriesForPost(reset($testPostData)['id']);
+
+		$this->assertNotFalse($data);
+		$this->assertInternalType('array', $data);
+
+		$testPostData = array_filter($testPostData, function ($row) {
+			return ($row['display'] == 1);
+		});
+		$testPosts = array_column($testPostData, 'id');
+		$dataPosts = array_column($data, 'post');
+
+		$this->assertEmpty(array_merge(
+			array_diff($testPosts, $dataPosts),
+			array_diff($dataPosts, $testPosts)
+		));
+	}
+
+	public function testGetSeriesForPostFailure()
+	{
+		$repository = new MysqlSeriesRepository(self::$connection);
+		$data = $repository->getSeriesForPost(rand(1, 100));
+
+		$this->assertEmpty($data);
+		$this->assertInternalType('array', $data);
+	}
+
+	protected function insertPostData(array $data)
+	{
+		$defaultData = [
+			'id' => null,
+			'title' => '',
+			'path' => '',
+			'category' => '',
+			'date' => '',
+			'body' => '',
+			'display' => 0,
+		];
+
+		$data = array_merge($defaultData, $data);
+
+		return self::$connection->getDefault()->perform("
             INSERT INTO `jpemeric_blog`.`post`
                 (id, title, path, category, date, body, display)
             VALUES
                 (:id, :title, :path, :category, :date, :body, :display)",
-            $data
-        );
-    }
+			$data
+		);
+	}
 
-    protected function insertSeriesData(array $data)
-    {
-        $defaultData = [
-            'id' => null,
-            'title' => '',
-            'description' => '',
-        ];
+	protected function insertSeriesData(array $data)
+	{
+		$defaultData = [
+			'id' => null,
+			'title' => '',
+			'description' => '',
+		];
 
-        $data = array_merge($defaultData, $data);
+		$data = array_merge($defaultData, $data);
 
-        return self::$connection->getDefault()->perform("
+		return self::$connection->getDefault()->perform("
             INSERT INTO `jpemeric_blog`.`series`
                 (id, title, description)
             VALUES
                 (:id, :title, :description)",
-            $data
-        );
-    }
+			$data
+		);
+	}
 
-    protected function insertSeriesPostData(array $data)
-    {
-        $defaultData = [
-            'series' => '',
-            'post' => '',
-            'order' => 0,
-        ];
+	protected function insertSeriesPostData(array $data)
+	{
+		$defaultData = [
+			'series' => '',
+			'post' => '',
+			'order' => 0,
+		];
 
-        $data = array_merge($defaultData, $data);
+		$data = array_merge($defaultData, $data);
 
-        return self::$connection->getDefault()->perform("
+		return self::$connection->getDefault()->perform("
             INSERT INTO `jpemeric_blog`.`series_post`
                 (series, post, `order`)
             VALUES
                 (:series, :post, :order)",
-            $data
-        );
-    }
-
-    protected function tearDown()
-    {
-        self::$connection->getDefault()->perform("DELETE FROM `jpemeric_blog`.`post`");
-        self::$connection->getDefault()->perform("DELETE FROM `jpemeric_blog`.`series`");
-        self::$connection->getDefault()->perform("DELETE FROM `jpemeric_blog`.`series_post`");
-    }
-
-    public static function tearDownAfterClass()
-    {
-        self::$connection->getDefault()->disconnect();
-        unlink('jpemeric_blog.db');
-    }
+			$data
+		);
+	}
+
+	protected function tearDown()
+	{
+		self::$connection->getDefault()->perform("DELETE FROM `jpemeric_blog`.`post`");
+		self::$connection->getDefault()->perform("DELETE FROM `jpemeric_blog`.`series`");
+		self::$connection->getDefault()->perform("DELETE FROM `jpemeric_blog`.`series_post`");
+	}
+
+	public static function tearDownAfterClass()
+	{
+		self::$connection->getDefault()->disconnect();
+		unlink('jpemeric_blog.db');
+	}
 }