jacobemerick / web

controller/blog/SearchController.class.inc.php

Spacing +11 added lines, -11 removed lines

@@ -44,7 +44,7 @@ 
 	{
 		parent::set_head_data();
 		
-		if($this->page == 1)
+		if ($this->page == 1)
 		{
 			$this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->query)));
 			$this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->query)));
@@ -62,10 +62,10 @@ 
 
 	protected function get_introduction()
 	{
-		if($this->total_pages > 1)
+		if ($this->total_pages > 1)
 			return array(
 				'title' => "Posts from search '{$this->query}', page {$this->page} of {$this->total_pages}.");
-		else if($this->total_pages == 1)
+		else if ($this->total_pages == 1)
 			return array(
 				'title' => "Posts from search '{$this->query}'.");
 		else
@@ -76,7 +76,7 @@ 
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(3);
-		if(isset($page) && is_numeric($page))
+		if (isset($page) && is_numeric($page))
 			return $page;
 		return 1;
 	}
@@ -84,7 +84,7 @@ 
 	private $search_result;
 	private function get_search_result()
 	{
-		if(!isset($this->search_result))
+		if (!isset($this->search_result))
 		{
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
@@ -114,24 +114,24 @@ 
 
 	protected function get_list_next_link()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 			return;
-		if($this->page == 2)
+		if ($this->page == 2)
 			return Content::instance('URLSafe', "/search/{$this->query}/")->activate();
-		return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page - 1) . '/')->activate();
+		return Content::instance('URLSafe', "/search/{$this->query}/".($this->page - 1).'/')->activate();
 	}
 
 	protected function get_list_prev_link()
 	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
+		if (($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
 			return;
-		return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page + 1) . '/')->activate();
+		return Content::instance('URLSafe', "/search/{$this->query}/".($this->page + 1).'/')->activate();
 	}
 
 	private $total_post_count;
 	protected function get_total_post_count()
 	{
-		if(!isset($this->total_post_count))
+		if (!isset($this->total_post_count))
 			$this->total_post_count = count($this->get_search_result());
 		return $this->total_post_count;
 	}

Indentation +118 added lines, -118 removed lines

@@ -6,134 +6,134 @@
 final class SearchController extends DefaultListController
 {
 
-	private static $TITLE_MAIN = "%s Search | Jacob Emerick's Blog";
-	private static $DESCRIPTION_MAIN = "Posts containing the phrase %s on Jacob Emerick's Blog.";
-
-	private static $TITLE_PAGINATED = "%s Search - Page %d of %d | Jacob Emerick's Blog";
-	private static $DESCRIPTION_PAGINATED = "Page %d of %d with posts containing the phrase %s on Jacob Emerick's Blog.";
-
-	private static $KEYWORD_ARRAY = array(
-		'hiking',
-		'web development',
-		'blog',
-		'Jacob Emerick');
-
-	private static $LIST_DESCRIPTION = 'Viewing %d - %d of %d posts containing the phrase %s.';
-	private static $SEARCH_WEIGHTS = array(
-		array(
-			'field' => 'title',
-			'weight' => 8),
-		array(
-			'field' => 'body',
-			'weight' => 4));
-
-	private $query;
-
-	public function __construct()
-	{
-		$query = URLDecode::getPiece(2);
-		$query = urldecode($query);
+    private static $TITLE_MAIN = "%s Search | Jacob Emerick's Blog";
+    private static $DESCRIPTION_MAIN = "Posts containing the phrase %s on Jacob Emerick's Blog.";
+
+    private static $TITLE_PAGINATED = "%s Search - Page %d of %d | Jacob Emerick's Blog";
+    private static $DESCRIPTION_PAGINATED = "Page %d of %d with posts containing the phrase %s on Jacob Emerick's Blog.";
+
+    private static $KEYWORD_ARRAY = array(
+        'hiking',
+        'web development',
+        'blog',
+        'Jacob Emerick');
+
+    private static $LIST_DESCRIPTION = 'Viewing %d - %d of %d posts containing the phrase %s.';
+    private static $SEARCH_WEIGHTS = array(
+        array(
+            'field' => 'title',
+            'weight' => 8),
+        array(
+            'field' => 'body',
+            'weight' => 4));
+
+    private $query;
+
+    public function __construct()
+    {
+        $query = URLDecode::getPiece(2);
+        $query = urldecode($query);
         $query = str_replace('-', ' ', $query);
 		
-		$this->query = $query;
+        $this->query = $query;
 		
-		parent::__construct();
-	}
+        parent::__construct();
+    }
 
-	protected function set_head_data()
-	{
-		parent::set_head_data();
+    protected function set_head_data()
+    {
+        parent::set_head_data();
 		
-		if($this->page == 1)
-		{
-			$this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->query)));
-			$this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->query)));
-		}
-		else
-		{
-			$this->set_title(sprintf(self::$TITLE_PAGINATED, ucwords($this->query), $this->page, $this->total_pages));
-			$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages, ucwords($this->query)));
-		}
+        if($this->page == 1)
+        {
+            $this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->query)));
+            $this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->query)));
+        }
+        else
+        {
+            $this->set_title(sprintf(self::$TITLE_PAGINATED, ucwords($this->query), $this->page, $this->total_pages));
+            $this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages, ucwords($this->query)));
+        }
 		
-		$keyword_array = self::$KEYWORD_ARRAY;
-		array_unshift($keyword_array, $this->query);
-		$this->set_keywords($keyword_array);
-	}
-
-	protected function get_introduction()
-	{
-		if($this->total_pages > 1)
-			return array(
-				'title' => "Posts from search '{$this->query}', page {$this->page} of {$this->total_pages}.");
-		else if($this->total_pages == 1)
-			return array(
-				'title' => "Posts from search '{$this->query}'.");
-		else
-			return array(
-				'title' => "Sorry, '{$this->query}' didn't return any posts.");
-	}
-
-	protected function get_page_number()
-	{
-		$page = URLDecode::getPiece(3);
-		if(isset($page) && is_numeric($page))
-			return $page;
-		return 1;
-	}
-
-	private $search_result;
-	private function get_search_result()
-	{
-		if(!isset($this->search_result))
-		{
+        $keyword_array = self::$KEYWORD_ARRAY;
+        array_unshift($keyword_array, $this->query);
+        $this->set_keywords($keyword_array);
+    }
+
+    protected function get_introduction()
+    {
+        if($this->total_pages > 1)
+            return array(
+                'title' => "Posts from search '{$this->query}', page {$this->page} of {$this->total_pages}.");
+        else if($this->total_pages == 1)
+            return array(
+                'title' => "Posts from search '{$this->query}'.");
+        else
+            return array(
+                'title' => "Sorry, '{$this->query}' didn't return any posts.");
+    }
+
+    protected function get_page_number()
+    {
+        $page = URLDecode::getPiece(3);
+        if(isset($page) && is_numeric($page))
+            return $page;
+        return 1;
+    }
+
+    private $search_result;
+    private function get_search_result()
+    {
+        if(!isset($this->search_result))
+        {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         $posts = $repository->getActivePosts();
 			
-			$this->search_result = Search::instance()
-				->setQuery($this->query)
-				->setResult($posts)
-				->setWeight(self::$SEARCH_WEIGHTS)
-				->perform();
-		}
-		return $this->search_result;
-	}
-
-	protected function get_list_results()
-	{
-		return array_slice($this->get_search_result(), $this->offset, self::$POSTS_PER_PAGE);
-	}
-
-	protected function get_list_description()
-	{
-		$start = $this->offset + 1;
-		$end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
+            $this->search_result = Search::instance()
+                ->setQuery($this->query)
+                ->setResult($posts)
+                ->setWeight(self::$SEARCH_WEIGHTS)
+                ->perform();
+        }
+        return $this->search_result;
+    }
+
+    protected function get_list_results()
+    {
+        return array_slice($this->get_search_result(), $this->offset, self::$POSTS_PER_PAGE);
+    }
+
+    protected function get_list_description()
+    {
+        $start = $this->offset + 1;
+        $end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
 		
-		return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count(), $this->query);
-	}
-
-	protected function get_list_next_link()
-	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Content::instance('URLSafe', "/search/{$this->query}/")->activate();
-		return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page - 1) . '/')->activate();
-	}
-
-	protected function get_list_prev_link()
-	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
-			return;
-		return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page + 1) . '/')->activate();
-	}
-
-	private $total_post_count;
-	protected function get_total_post_count()
-	{
-		if(!isset($this->total_post_count))
-			$this->total_post_count = count($this->get_search_result());
-		return $this->total_post_count;
-	}
+        return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count(), $this->query);
+    }
+
+    protected function get_list_next_link()
+    {
+        if($this->page == 1)
+            return;
+        if($this->page == 2)
+            return Content::instance('URLSafe', "/search/{$this->query}/")->activate();
+        return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page - 1) . '/')->activate();
+    }
+
+    protected function get_list_prev_link()
+    {
+        if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
+            return;
+        return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page + 1) . '/')->activate();
+    }
+
+    private $total_post_count;
+    protected function get_total_post_count()
+    {
+        if(!isset($this->total_post_count))
+            $this->total_post_count = count($this->get_search_result());
+        return $this->total_post_count;
+    }
 
 }

Braces +48 added lines, -43 removed lines

@@ -3,8 +3,8 @@ 
 Loader::load('controller', 'blog/DefaultListController');
 Loader::load('utility', 'Search');
 
-final class SearchController extends DefaultListController
-{
+final class SearchController extends DefaultListController

+{

 
 	private static $TITLE_MAIN = "%s Search | Jacob Emerick's Blog";
 	private static $DESCRIPTION_MAIN = "Posts containing the phrase %s on Jacob Emerick's Blog.";
@@ -29,8 +29,8 @@ 
 
 	private $query;
 
-	public function __construct()
-	{
+	public function __construct()

+	{

 		$query = URLDecode::getPiece(2);
 		$query = urldecode($query);
         $query = str_replace('-', ' ', $query);
@@ -40,16 +40,15 @@ 
 		parent::__construct();
 	}
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		parent::set_head_data();
 		
 		if($this->page == 1)
 		{
 			$this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->query)));
 			$this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->query)));
-		}
-		else
+		} else
 		{
 			$this->set_title(sprintf(self::$TITLE_PAGINATED, ucwords($this->query), $this->page, $this->total_pages));
 			$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages, ucwords($this->query)));
@@ -60,30 +59,32 @@ 
 		$this->set_keywords($keyword_array);
 	}
 
-	protected function get_introduction()
-	{
-		if($this->total_pages > 1)
-			return array(
-				'title' => "Posts from search '{$this->query}', page {$this->page} of {$this->total_pages}.");
-		else if($this->total_pages == 1)
-			return array(
-				'title' => "Posts from search '{$this->query}'.");
-		else
-			return array(
-				'title' => "Sorry, '{$this->query}' didn't return any posts.");
+	protected function get_introduction()

+	{

+		if($this->total_pages > 1) {

+					return array(
+				'title' => "Posts from search '{$this->query}', page {$this->page} of {$this->total_pages}.");

+		} else if($this->total_pages == 1) {

+					return array(
+				'title' => "Posts from search '{$this->query}'.");

+		} else {

+					return array(
+				'title' => "Sorry, '{$this->query}' didn't return any posts.");

+		}

 	}
 
-	protected function get_page_number()
-	{
+	protected function get_page_number()

+	{

 		$page = URLDecode::getPiece(3);
-		if(isset($page) && is_numeric($page))
-			return $page;
+		if(isset($page) && is_numeric($page)) {

+					return $page;

+		}

 		return 1;
 	}
 
 	private $search_result;
-	private function get_search_result()
-	{
+	private function get_search_result()

+	{

 		if(!isset($this->search_result))
 		{
         global $container;
@@ -99,40 +100,44 @@ 
 		return $this->search_result;
 	}
 
-	protected function get_list_results()
-	{
+	protected function get_list_results()

+	{

 		return array_slice($this->get_search_result(), $this->offset, self::$POSTS_PER_PAGE);
 	}
 
-	protected function get_list_description()
-	{
+	protected function get_list_description()

+	{

 		$start = $this->offset + 1;
 		$end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
 		
 		return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count(), $this->query);
 	}
 
-	protected function get_list_next_link()
-	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Content::instance('URLSafe', "/search/{$this->query}/")->activate();
+	protected function get_list_next_link()

+	{

+		if($this->page == 1) {

+					return;

+		}

+		if($this->page == 2) {

+					return Content::instance('URLSafe', "/search/{$this->query}/")->activate();

+		}

 		return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page - 1) . '/')->activate();
 	}
 
-	protected function get_list_prev_link()
-	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
-			return;
+	protected function get_list_prev_link()

+	{

+		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) {

+					return;

+		}

 		return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page + 1) . '/')->activate();
 	}
 
 	private $total_post_count;
-	protected function get_total_post_count()
-	{
-		if(!isset($this->total_post_count))
-			$this->total_post_count = count($this->get_search_result());
+	protected function get_total_post_count()

+	{

+		if(!isset($this->total_post_count)) {

+					$this->total_post_count = count($this->get_search_result());

+		}

 		return $this->total_post_count;
 	}
 

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

src/Domain/Comment/Commenter/CommenterRepositoryInterface.php

Braces +2 added lines, -2 removed lines

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

+{

     public function createCommenter(array $commenter);
     public function getCommenter($commenterId);
     public function getCommenters($page = null, $perPage = null);

src/Domain/Waterfall/County/CountyRepositoryInterface.php

Braces +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@
 
 namespace Jacobemerick\Web\Domain\Waterfall\County;
 
-interface CountyRepositoryInterface
-{
+interface CountyRepositoryInterface

+{

     public function getCountyList();
 }

src/Domain/Waterfall/Period/PeriodRepositoryInterface.php

Braces +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@
 
 namespace Jacobemerick\Web\Domain\Waterfall\Period;
 
-interface PeriodRepositoryInterface
-{
+interface PeriodRepositoryInterface

+{

     public function getPeriodList();
 }

src/Domain/Waterfall/Watercourse/WatercourseRepositoryInterface.php

Braces +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@
 
 namespace Jacobemerick\Web\Domain\Waterfall\Watercourse;
 
-interface WatercourseRepositoryInterface
-{
+interface WatercourseRepositoryInterface

+{

     public function getWatercourseList();
 }