Inspection of "Fixes phpunit ci step" - jacobemerick/web - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 04228d...052193 )

by Jacob

created 2017-05-14 18:32 UTC

Status

Indentation +105 added lines, -105 removed lines patch added patch discarded remove patch

@@ -5,121 +5,121 @@
 block discarded – undo
 class BlogRouter extends Router
 {
 
-	protected function get_redirect_array()
-	{
-		return array(
-			(object) array(
-				'pattern' => '@^/page_([0-9]+)/$@',
-				'replace' => '/$1/'),
-			(object) array(
-				'pattern' => '@/index.(html|htm|php)$@',
-				'replace' => '/'),
-			(object) array(
-				'pattern' => '@^/([0-9]{4})-([a-z]+)/$@',
-				'replace' => '/'),
-			(object) array(
-				'pattern' => '@^/([0-9]{4})-([a-z]+)/([0-9]+)/$@',
-				'replace' => '/'),
-			(object) array(
-				'pattern' => '@^/month_([a-z]{3,})_([0-9]{4})(/?)$@',
-				'replace' => '/'),
-			(object) array(
-				'pattern' => '@^/month_([a-z]{3,})_([0-9]{4})/page_([0-9]+)(/?)$@',
-				'replace' => '/'),
-			(object) array(
-				'pattern' => '@^/category_([a-z-]+)(/?)$@',
-				'replace' => '/$1/'),
-			(object) array(
-				'pattern' => '@^/category_([a-z-]+)/page_([0-9]+)(/?)$@',
-				'replace' => '/$1/$2/'),
-			(object) array(
-				'pattern' => '@^/tag_([a-z-]+)(/?)$@',
-				'replace' => '/tag/$1/'),
-			(object) array(
-				'pattern' => '@^/tag_([a-z-]+)/page_([0-9]+)(/?)$@',
-				'replace' => '/tag/$1/$2/'),
-			(object) array(
-				'pattern' => '@^/blog/(.*)$@',
-				'replace' => '/$1'));
-	}
+    protected function get_redirect_array()
+    {
+        return array(
+            (object) array(
+                'pattern' => '@^/page_([0-9]+)/$@',
+                'replace' => '/$1/'),
+            (object) array(
+                'pattern' => '@/index.(html|htm|php)$@',
+                'replace' => '/'),
+            (object) array(
+                'pattern' => '@^/([0-9]{4})-([a-z]+)/$@',
+                'replace' => '/'),
+            (object) array(
+                'pattern' => '@^/([0-9]{4})-([a-z]+)/([0-9]+)/$@',
+                'replace' => '/'),
+            (object) array(
+                'pattern' => '@^/month_([a-z]{3,})_([0-9]{4})(/?)$@',
+                'replace' => '/'),
+            (object) array(
+                'pattern' => '@^/month_([a-z]{3,})_([0-9]{4})/page_([0-9]+)(/?)$@',
+                'replace' => '/'),
+            (object) array(
+                'pattern' => '@^/category_([a-z-]+)(/?)$@',
+                'replace' => '/$1/'),
+            (object) array(
+                'pattern' => '@^/category_([a-z-]+)/page_([0-9]+)(/?)$@',
+                'replace' => '/$1/$2/'),
+            (object) array(
+                'pattern' => '@^/tag_([a-z-]+)(/?)$@',
+                'replace' => '/tag/$1/'),
+            (object) array(
+                'pattern' => '@^/tag_([a-z-]+)/page_([0-9]+)(/?)$@',
+                'replace' => '/tag/$1/$2/'),
+            (object) array(
+                'pattern' => '@^/blog/(.*)$@',
+                'replace' => '/$1'));
+    }
 
-	protected function check_for_special_redirect($uri)
-	{
-		if(preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
-		{
+    protected function check_for_special_redirect($uri)
+    {
+        if(preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
+        {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         $post = $repository->findPostByPath($matches[2]);
 
-			if(!$post)
-			{
-				Loader::loadNew('controller', '/Error404Controller')
-					->activate();
-			}
+            if(!$post)
+            {
+                Loader::loadNew('controller', '/Error404Controller')
+                    ->activate();
+            }
 			
-			Loader::load('utility', 'Content');
-			$uri = Content::instance('URLSafe', "/{$post['category']}/{$post['path']}/")->activate();
-		}
-		else
-		{
-			$post_uri = URLDecode::getPiece(1);
-			if($post_uri !== null)
-			{
+            Loader::load('utility', 'Content');
+            $uri = Content::instance('URLSafe', "/{$post['category']}/{$post['path']}/")->activate();
+        }
+        else
+        {
+            $post_uri = URLDecode::getPiece(1);
+            if($post_uri !== null)
+            {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         $post = $repository->findPostByPath($post_uri);
 
-				if($post != false)
-				{
-					Loader::load('utility', 'Content');
-					$uri = Content::instance('URLSafe', "/{$post['category']}/{$post['path']}/")->activate();
-				}
-			}
-		}
-		if($uri == '/search/')
-		{
-			if(Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
-			{
-				$uri .= Request::getGet('search');
-				$uri .= '/';
-			}
-		}
-		return $uri;
-	}
+                if($post != false)
+                {
+                    Loader::load('utility', 'Content');
+                    $uri = Content::instance('URLSafe', "/{$post['category']}/{$post['path']}/")->activate();
+                }
+            }
+        }
+        if($uri == '/search/')
+        {
+            if(Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
+            {
+                $uri .= Request::getGet('search');
+                $uri .= '/';
+            }
+        }
+        return $uri;
+    }
 
-	protected function get_direct_array()
-	{
-		return array(
-			(object) array(
-				'match' => '/',
-				'controller' => 'HomeController'),
-			(object) array(
-				'match' => '/([0-9]+)/',
-				'controller' => 'HomeController'),
-			(object) array(
-				'match' => '/about/',
-				'controller' => 'AboutController'),
-			(object) array(
-				'match' => '/(hiking|personal|web-development)/',
-				'controller' => 'CategoryController'),
-			(object) array(
-				'match' => '/(hiking|personal|web-development)/([0-9]+)/',
-				'controller' => 'CategoryController'),
-			(object) array(
-				'match' => '/tag/([a-z0-9-]+)/',
-				'controller' => 'TagController'),
-			(object) array(
-				'match' => '/tag/([a-z-]+)/([0-9]+)/',
-				'controller' => 'TagController'),
-			(object) array(
-				'match' => '/search/([a-z0-9-]+)/',
-				'controller' => 'SearchController'),
-			(object) array(
-				'match' => '/search/([a-z0-9-]+)/([0-9]+)/',
-				'controller' => 'SearchController'),
-			(object) array(
-				'match' => '/([a-z-]+)/([a-z0-9-]+)/',
-				'controller' => 'PostController'));
-	}
+    protected function get_direct_array()
+    {
+        return array(
+            (object) array(
+                'match' => '/',
+                'controller' => 'HomeController'),
+            (object) array(
+                'match' => '/([0-9]+)/',
+                'controller' => 'HomeController'),
+            (object) array(
+                'match' => '/about/',
+                'controller' => 'AboutController'),
+            (object) array(
+                'match' => '/(hiking|personal|web-development)/',
+                'controller' => 'CategoryController'),
+            (object) array(
+                'match' => '/(hiking|personal|web-development)/([0-9]+)/',
+                'controller' => 'CategoryController'),
+            (object) array(
+                'match' => '/tag/([a-z0-9-]+)/',
+                'controller' => 'TagController'),
+            (object) array(
+                'match' => '/tag/([a-z-]+)/([0-9]+)/',
+                'controller' => 'TagController'),
+            (object) array(
+                'match' => '/search/([a-z0-9-]+)/',
+                'controller' => 'SearchController'),
+            (object) array(
+                'match' => '/search/([a-z0-9-]+)/([0-9]+)/',
+                'controller' => 'SearchController'),
+            (object) array(
+                'match' => '/([a-z-]+)/([a-z0-9-]+)/',
+                'controller' => 'PostController'));
+    }
 
 }

Please login to merge, or discard this patch.

Braces +9 added lines, -10 removed lines patch added patch discarded remove patch

@@ -2,11 +2,11 @@  discard block
 block discarded – undo
 
 Loader::load('router', 'Router');
 
-class BlogRouter extends Router
-{
+class BlogRouter extends Router
+{
 
-	protected function get_redirect_array()
-	{
+	protected function get_redirect_array()
+	{
 		return array(
 			(object) array(
 				'pattern' => '@^/page_([0-9]+)/$@',
@@ -43,8 +43,8 @@  discard block
 block discarded – undo
 				'replace' => '/$1'));
 	}
 
-	protected function check_for_special_redirect($uri)
-	{
+	protected function check_for_special_redirect($uri)
+	{
 		if(preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
 		{
         global $container;
@@ -59,8 +59,7 @@  discard block
 block discarded – undo
 			
 			Loader::load('utility', 'Content');
 			$uri = Content::instance('URLSafe', "/{$post['category']}/{$post['path']}/")->activate();
-		}
-		else
+		} else
 		{
 			$post_uri = URLDecode::getPiece(1);
 			if($post_uri !== null)
@@ -87,8 +86,8 @@  discard block
 block discarded – undo
 		return $uri;
 	}
 
-	protected function get_direct_array()
-	{
+	protected function get_direct_array()
+	{
 		return array(
 			(object) array(
 				'match' => '/',

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -45,13 +45,13 @@  discard block
 block discarded – undo
 
 	protected function check_for_special_redirect($uri)
 	{
-		if(preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
+		if (preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
 		{
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         $post = $repository->findPostByPath($matches[2]);
 
-			if(!$post)
+			if (!$post)
 			{
 				Loader::loadNew('controller', '/Error404Controller')
 					->activate();
@@ -63,22 +63,22 @@  discard block
 block discarded – undo
 		else
 		{
 			$post_uri = URLDecode::getPiece(1);
-			if($post_uri !== null)
+			if ($post_uri !== null)
 			{
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         $post = $repository->findPostByPath($post_uri);
 
-				if($post != false)
+				if ($post != false)
 				{
 					Loader::load('utility', 'Content');
 					$uri = Content::instance('URLSafe', "/{$post['category']}/{$post['path']}/")->activate();
 				}
 			}
 		}
-		if($uri == '/search/')
+		if ($uri == '/search/')
 		{
-			if(Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
+			if (Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
 			{
 				$uri .= Request::getGet('search');
 				$uri .= '/';

Please login to merge, or discard this patch.

controller/portfolio/ProjectsController.class.inc.php 1 patch

Braces +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -2,11 +2,11 @@  discard block
 block discarded – undo
 
 Loader::load('controller', 'portfolio/DefaultPageController');
 
-class ProjectsController extends DefaultPageController
-{
+class ProjectsController extends DefaultPageController
+{
 
-    protected function set_head_data()
-    {
+    protected function set_head_data()
+    {
         $this->set_title("Projects Page | Jacob Emerick's Portfolio");
         $this->set_description("Collection of key open-source projects that Jacob has developed and maintained over the years.");
         $this->set_keywords([
@@ -19,8 +19,8 @@  discard block
 block discarded – undo
         ]);
     }
 
-    protected function set_body_data()
-    {
+    protected function set_body_data()
+    {
         $this->set_body('body_view', 'Projects');
         $this->set_body('body_data', []);
 

Please login to merge, or discard this patch.

controller/portfolio/AboutController.class.inc.php 1 patch

Braces +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -2,11 +2,11 @@  discard block
 block discarded – undo
 
 Loader::load('controller', 'portfolio/DefaultPageController');
 
-class AboutController extends DefaultPageController
-{
+class AboutController extends DefaultPageController
+{
 
-    protected function set_head_data()
-    {
+    protected function set_head_data()
+    {
         $this->set_title("Jacob Emerick's Portfolio");
         $this->set_description("Jacob Emerick's Portfolio - collection of programming projects and resume");
         $this->set_keywords([
@@ -20,8 +20,8 @@  discard block
 block discarded – undo
         ]);
     }
 
-    protected function set_body_data()
-    {
+    protected function set_body_data()
+    {
         $this->set_body('body_view', 'About');
         $this->set_body('body_data', []);
 

Please login to merge, or discard this patch.

controller/waterfalls/AboutController.class.inc.php 1 patch

Braces +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -2,8 +2,8 @@  discard block
 block discarded – undo
 
 Loader::load('controller', 'waterfalls/DefaultPageController');
 
-final class AboutController extends DefaultPageController
-{
+final class AboutController extends DefaultPageController
+{
 
     private static $TITLE = 'About the Website | Waterfalls of the Keweenaw';
     private static $DESCRIPTION = 'A little bit about the website, the area, and the reason why someone would hunt down a hundred and fifty waterfalls in the Upper Peninsula.';
@@ -14,8 +14,8 @@  discard block
 block discarded – undo
         'Jacob Emerick',
     );
 
-    protected function set_head_data()
-    {
+    protected function set_head_data()
+    {
         parent::set_head_data();
         
         $this->set_title(self::$TITLE);
@@ -23,8 +23,8 @@  discard block
 block discarded – undo
         $this->set_keywords(self::$KEYWORD_ARRAY);
     }
 
-    protected function set_body_data($page_type = 'normal')
-    {
+    protected function set_body_data($page_type = 'normal')
+    {
         parent::set_body_data($page_type);
         
         $this->set_body('view', 'About');

Please login to merge, or discard this patch.

src/Domain/Blog/Tag/MysqlTagRepository.php 1 patch

Braces +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -4,8 +4,8 @@  discard block
 block discarded – undo
 
 use Aura\Sql\ConnectionLocator;
 
-class MysqlTagRepository implements TagRepositoryInterface
-{
+class MysqlTagRepository implements TagRepositoryInterface
+{
 
     /** @var  Aura\Sql\ConnectionLocator */
     protected $connections;
@@ -13,8 +13,8 @@  discard block
 block discarded – undo
     /**
      * @param Aura\Sql\ConnectionLocator
      */
-    public function __construct(ConnectionLocator $connections)
-    {
+    public function __construct(ConnectionLocator $connections)
+    {
         $this->connections = $connections;
     }
 
@@ -23,8 +23,8 @@  discard block
 block discarded – undo
      *
      * @return array|false
      */
-    public function findTagByTitle($title)
-    {
+    public function findTagByTitle($title)
+    {
         $query = "
             SELECT *
             FROM `jpemeric_blog`.`tag`
@@ -40,8 +40,8 @@  discard block
 block discarded – undo
             ->fetchOne($query, $bindings);
     }
 
-    public function getAllTags()
-    {
+    public function getAllTags()
+    {
         $query = "
             SELECT *
             FROM `jpemeric_blog`.`tag`
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
             ->fetchAll($query);
     }
 
-    public function getTagCloud()
-    {
+    public function getTagCloud()
+    {
         $query = "
             SELECT COUNT(1) AS `count`, `tag`
             FROM `jpemeric_blog`.`tag`
@@ -72,8 +72,8 @@  discard block
 block discarded – undo
             ->fetchAll($query, $bindings);
     }
 
-    public function getTagsForPost($post)
-    {
+    public function getTagsForPost($post)
+    {
         $query = "
             SELECT `tag`.*
             FROM `jpemeric_blog`.`tag`

Please login to merge, or discard this patch.

src/Domain/Blog/Introduction/MysqlIntroductionRepository.php 1 patch

Braces +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -4,8 +4,8 @@  discard block
 block discarded – undo
 
 use Aura\Sql\ConnectionLocator;
 
-class MysqlIntroductionRepository implements IntroductionRepositoryInterface
-{
+class MysqlIntroductionRepository implements IntroductionRepositoryInterface
+{
 
     /** @var  Aura\Sql\ConnectionLocator */
     protected $connections;
@@ -13,8 +13,8 @@  discard block
 block discarded – undo
     /**
      * @param Aura\Sql\ConnectionLocator
      */
-    public function __construct(ConnectionLocator $connections)
-    {
+    public function __construct(ConnectionLocator $connections)
+    {
         $this->connections = $connections;
     }
 
@@ -24,8 +24,8 @@  discard block
 block discarded – undo
      *
      * @return array|false
      */
-    public function findByType($type, $value = '')
-    {
+    public function findByType($type, $value = '')
+    {
         $query = "
             SELECT `title`, `content`, `image`
             FROM `jpemeric_blog`.`introduction`

Please login to merge, or discard this patch.

src/Domain/Blog/Series/MysqlSeriesRepository.php 1 patch

Braces +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -4,8 +4,8 @@  discard block
 block discarded – undo
 
 use Aura\Sql\ConnectionLocator;
 
-class MysqlSeriesRepository implements SeriesRepositoryInterface
-{
+class MysqlSeriesRepository implements SeriesRepositoryInterface
+{
 
     /** @var  Aura\Sql\ConnectionLocator */
     protected $connections;
@@ -13,8 +13,8 @@  discard block
 block discarded – undo
     /**
      * @param Aura\Sql\ConnectionLocator
      */
-    public function __construct(ConnectionLocator $connections)
-    {
+    public function __construct(ConnectionLocator $connections)
+    {
         $this->connections = $connections;
     }
 
@@ -23,8 +23,8 @@  discard block
 block discarded – undo
      *
      * @return array|false
      */
-    public function getSeriesForPost($post)
-    {
+    public function getSeriesForPost($post)
+    {
         $query = "
             SELECT `series`.`title` AS `series_title`, `series`.`description` AS `series_description`,
                    `post`.`id` AS `post`, `post`.`title`, `post`.`category`, `post`.`path`

Please login to merge, or discard this patch.

src/Domain/Comment/Commenter/ServiceCommenterRepository.php 1 patch

Braces +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -6,8 +6,8 @@  discard block
 block discarded – undo
 use Jacobemerick\CommentService\Api\DefaultApi;
 use Jacobemerick\CommentService\Model\Commenter;
 
-class ServiceCommenterRepository implements CommenterRepositoryInterface
-{
+class ServiceCommenterRepository implements CommenterRepositoryInterface
+{
 
     /**
      * @var DefaultApi
@@ -17,8 +17,8 @@  discard block
 block discarded – undo
     /**
      * @param DefaultApi $api
      */
-    public function __construct(DefaultApi $api)
-    {
+    public function __construct(DefaultApi $api)
+    {
         $this->api = $api;
     }
 
@@ -27,8 +27,8 @@  discard block
 block discarded – undo
      * @return array
      * @throws ApiException
      */
-    public function createCommenter(array $commenter)
-    {
+    public function createCommenter(array $commenter)
+    {
         $response = $this->api->createCommenter($commenter);
         return $this->deserializeCommenter($response);
     }
@@ -38,8 +38,8 @@  discard block
 block discarded – undo
      * @return array
      * @throws ApiException
      */
-    public function getCommenter($commenterId)
-    {
+    public function getCommenter($commenterId)
+    {
         $response = $this->api->getCommenter($commenterId);
         return $this->deserializeCommenter($response);
     }
@@ -50,8 +50,8 @@  discard block
 block discarded – undo
      * @return array
      * @throws ApiException
      */
-    public function getCommenters($page = null, $perPage = null)
-    {
+    public function getCommenters($page = null, $perPage = null)
+    {
         $response = $this->api->getCommenters($page, $perPage);
         return array_map([$this, 'deserializeCommenter'], $response);
     }
@@ -60,8 +60,8 @@  discard block
 block discarded – undo
      * @param Commenter
      * @return array
      */
-    protected function deserializeCommenter(Commenter $commenter)
-    {
+    protected function deserializeCommenter(Commenter $commenter)
+    {
         return [
             'id' => $commenter->getId(),
             'name' => $commenter->getName(),

Please login to merge, or discard this patch.

src/Domain/Stream/Changelog/MysqlChangelogRepository.php 1 patch

Braces +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -4,8 +4,8 @@  discard block
 block discarded – undo
 
 use Aura\Sql\ConnectionLocator;
 
-class MysqlChangelogRepository implements ChangelogRepositoryInterface
-{
+class MysqlChangelogRepository implements ChangelogRepositoryInterface
+{
 
     /** @var  ConnectionLocator */
     protected $connections;
@@ -13,8 +13,8 @@  discard block
 block discarded – undo
     /**
      * @param ConnectonLocator $connections
      */
-    public function __construct(ConnectionLocator $connections)
-    {
+    public function __construct(ConnectionLocator $connections)
+    {
         $this->connections = $connections;
     }
 
@@ -24,8 +24,8 @@  discard block
 block discarded – undo
      *
      * @return array|false
      */
-    public function getChanges($limit = null, $offset = 0)
-    {
+    public function getChanges($limit = null, $offset = 0)
+    {
         $query = "
             SELECT `id`, `message`, `message_short`, `datetime`, `commit_link`
             FROM `jpemeric_stream`.`changelog`

Please login to merge, or discard this patch.

		@@ -45,13 +45,13 @@ discard block
		block discarded – undo
45	45
46	46	protected function check_for_special_redirect($uri)
47	47	{
48		- if(preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
	48	+ if (preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
49	49	{
50	50	global $container;
51	51	$repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
52	52	$post = $repository->findPostByPath($matches[2]);
53	53
54		- if(!$post)
	54	+ if (!$post)
55	55	{
56	56	Loader::loadNew('controller', '/Error404Controller')
57	57	->activate();
		@@ -63,22 +63,22 @@ discard block
		block discarded – undo
63	63	else
64	64	{
65	65	$post_uri = URLDecode::getPiece(1);
66		- if($post_uri !== null)
	66	+ if ($post_uri !== null)
67	67	{
68	68	global $container;
69	69	$repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
70	70	$post = $repository->findPostByPath($post_uri);
71	71
72		- if($post != false)
	72	+ if ($post != false)
73	73	{
74	74	Loader::load('utility', 'Content');
75	75	$uri = Content::instance('URLSafe', "/{$post['category']}/{$post['path']}/")->activate();
76	76	}
77	77	}
78	78	}
79		- if($uri == '/search/')
	79	+ if ($uri == '/search/')
80	80	{
81		- if(Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
	81	+ if (Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
82	82	{
83	83	$uri .= Request::getGet('search');
84	84	$uri .= '/';

		@@ -5,121 +5,121 @@
		block discarded – undo
5	5	class BlogRouter extends Router
6	6	{
7	7
8		- protected function get_redirect_array()
9		- {
10		- return array(
11		- (object) array(
12		- 'pattern' => '@^/page_([0-9]+)/$@',
13		- 'replace' => '/$1/'),
14		- (object) array(
15		- 'pattern' => '@/index.(html\|htm\|php)$@',
16		- 'replace' => '/'),
17		- (object) array(
18		- 'pattern' => '@^/([0-9]{4})-([a-z]+)/$@',
19		- 'replace' => '/'),
20		- (object) array(
21		- 'pattern' => '@^/([0-9]{4})-([a-z]+)/([0-9]+)/$@',
22		- 'replace' => '/'),
23		- (object) array(
24		- 'pattern' => '@^/month_([a-z]{3,})_([0-9]{4})(/?)$@',
25		- 'replace' => '/'),
26		- (object) array(
27		- 'pattern' => '@^/month_([a-z]{3,})_([0-9]{4})/page_([0-9]+)(/?)$@',
28		- 'replace' => '/'),
29		- (object) array(
30		- 'pattern' => '@^/category_([a-z-]+)(/?)$@',
31		- 'replace' => '/$1/'),
32		- (object) array(
33		- 'pattern' => '@^/category_([a-z-]+)/page_([0-9]+)(/?)$@',
34		- 'replace' => '/$1/$2/'),
35		- (object) array(
36		- 'pattern' => '@^/tag_([a-z-]+)(/?)$@',
37		- 'replace' => '/tag/$1/'),
38		- (object) array(
39		- 'pattern' => '@^/tag_([a-z-]+)/page_([0-9]+)(/?)$@',
40		- 'replace' => '/tag/$1/$2/'),
41		- (object) array(
42		- 'pattern' => '@^/blog/(.*)$@',
43		- 'replace' => '/$1'));
44		- }
	8	+ protected function get_redirect_array()
	9	+ {
	10	+ return array(
	11	+ (object) array(
	12	+ 'pattern' => '@^/page_([0-9]+)/$@',
	13	+ 'replace' => '/$1/'),
	14	+ (object) array(
	15	+ 'pattern' => '@/index.(html\|htm\|php)$@',
	16	+ 'replace' => '/'),
	17	+ (object) array(
	18	+ 'pattern' => '@^/([0-9]{4})-([a-z]+)/$@',
	19	+ 'replace' => '/'),
	20	+ (object) array(
	21	+ 'pattern' => '@^/([0-9]{4})-([a-z]+)/([0-9]+)/$@',
	22	+ 'replace' => '/'),
	23	+ (object) array(
	24	+ 'pattern' => '@^/month_([a-z]{3,})_([0-9]{4})(/?)$@',
	25	+ 'replace' => '/'),
	26	+ (object) array(
	27	+ 'pattern' => '@^/month_([a-z]{3,})_([0-9]{4})/page_([0-9]+)(/?)$@',
	28	+ 'replace' => '/'),
	29	+ (object) array(
	30	+ 'pattern' => '@^/category_([a-z-]+)(/?)$@',
	31	+ 'replace' => '/$1/'),
	32	+ (object) array(
	33	+ 'pattern' => '@^/category_([a-z-]+)/page_([0-9]+)(/?)$@',
	34	+ 'replace' => '/$1/$2/'),
	35	+ (object) array(
	36	+ 'pattern' => '@^/tag_([a-z-]+)(/?)$@',
	37	+ 'replace' => '/tag/$1/'),
	38	+ (object) array(
	39	+ 'pattern' => '@^/tag_([a-z-]+)/page_([0-9]+)(/?)$@',
	40	+ 'replace' => '/tag/$1/$2/'),
	41	+ (object) array(
	42	+ 'pattern' => '@^/blog/(.*)$@',
	43	+ 'replace' => '/$1'));
	44	+ }
45	45
46		- protected function check_for_special_redirect($uri)
47		- {
48		- if(preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
49		- {
	46	+ protected function check_for_special_redirect($uri)
	47	+ {
	48	+ if(preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
	49	+ {
50	50	global $container;
51	51	$repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
52	52	$post = $repository->findPostByPath($matches[2]);
53	53
54		- if(!$post)
55		- {
56		- Loader::loadNew('controller', '/Error404Controller')
57		- ->activate();
58		- }
	54	+ if(!$post)
	55	+ {
	56	+ Loader::loadNew('controller', '/Error404Controller')
	57	+ ->activate();
	58	+ }
59	59
60		- Loader::load('utility', 'Content');
61		- $uri = Content::instance('URLSafe', "/{$post['category']}/{$post['path']}/")->activate();
62		- }
63		- else
64		- {
65		- $post_uri = URLDecode::getPiece(1);
66		- if($post_uri !== null)
67		- {
	60	+ Loader::load('utility', 'Content');
	61	+ $uri = Content::instance('URLSafe', "/{$post['category']}/{$post['path']}/")->activate();
	62	+ }
	63	+ else
	64	+ {
	65	+ $post_uri = URLDecode::getPiece(1);
	66	+ if($post_uri !== null)
	67	+ {
68	68	global $container;
69	69	$repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
70	70	$post = $repository->findPostByPath($post_uri);
71	71
72		- if($post != false)
73		- {
74		- Loader::load('utility', 'Content');
75		- $uri = Content::instance('URLSafe', "/{$post['category']}/{$post['path']}/")->activate();
76		- }
77		- }
78		- }
79		- if($uri == '/search/')
80		- {
81		- if(Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
82		- {
83		- $uri .= Request::getGet('search');
84		- $uri .= '/';
85		- }
86		- }
87		- return $uri;
88		- }
	72	+ if($post != false)
	73	+ {
	74	+ Loader::load('utility', 'Content');
	75	+ $uri = Content::instance('URLSafe', "/{$post['category']}/{$post['path']}/")->activate();
	76	+ }
	77	+ }
	78	+ }
	79	+ if($uri == '/search/')
	80	+ {
	81	+ if(Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
	82	+ {
	83	+ $uri .= Request::getGet('search');
	84	+ $uri .= '/';
	85	+ }
	86	+ }
	87	+ return $uri;
	88	+ }
89	89
90		- protected function get_direct_array()
91		- {
92		- return array(
93		- (object) array(
94		- 'match' => '/',
95		- 'controller' => 'HomeController'),
96		- (object) array(
97		- 'match' => '/([0-9]+)/',
98		- 'controller' => 'HomeController'),
99		- (object) array(
100		- 'match' => '/about/',
101		- 'controller' => 'AboutController'),
102		- (object) array(
103		- 'match' => '/(hiking\|personal\|web-development)/',
104		- 'controller' => 'CategoryController'),
105		- (object) array(
106		- 'match' => '/(hiking\|personal\|web-development)/([0-9]+)/',
107		- 'controller' => 'CategoryController'),
108		- (object) array(
109		- 'match' => '/tag/([a-z0-9-]+)/',
110		- 'controller' => 'TagController'),
111		- (object) array(
112		- 'match' => '/tag/([a-z-]+)/([0-9]+)/',
113		- 'controller' => 'TagController'),
114		- (object) array(
115		- 'match' => '/search/([a-z0-9-]+)/',
116		- 'controller' => 'SearchController'),
117		- (object) array(
118		- 'match' => '/search/([a-z0-9-]+)/([0-9]+)/',
119		- 'controller' => 'SearchController'),
120		- (object) array(
121		- 'match' => '/([a-z-]+)/([a-z0-9-]+)/',
122		- 'controller' => 'PostController'));
123		- }
	90	+ protected function get_direct_array()
	91	+ {
	92	+ return array(
	93	+ (object) array(
	94	+ 'match' => '/',
	95	+ 'controller' => 'HomeController'),
	96	+ (object) array(
	97	+ 'match' => '/([0-9]+)/',
	98	+ 'controller' => 'HomeController'),
	99	+ (object) array(
	100	+ 'match' => '/about/',
	101	+ 'controller' => 'AboutController'),
	102	+ (object) array(
	103	+ 'match' => '/(hiking\|personal\|web-development)/',
	104	+ 'controller' => 'CategoryController'),
	105	+ (object) array(
	106	+ 'match' => '/(hiking\|personal\|web-development)/([0-9]+)/',
	107	+ 'controller' => 'CategoryController'),
	108	+ (object) array(
	109	+ 'match' => '/tag/([a-z0-9-]+)/',
	110	+ 'controller' => 'TagController'),
	111	+ (object) array(
	112	+ 'match' => '/tag/([a-z-]+)/([0-9]+)/',
	113	+ 'controller' => 'TagController'),
	114	+ (object) array(
	115	+ 'match' => '/search/([a-z0-9-]+)/',
	116	+ 'controller' => 'SearchController'),
	117	+ (object) array(
	118	+ 'match' => '/search/([a-z0-9-]+)/([0-9]+)/',
	119	+ 'controller' => 'SearchController'),
	120	+ (object) array(
	121	+ 'match' => '/([a-z-]+)/([a-z0-9-]+)/',
	122	+ 'controller' => 'PostController'));
	123	+ }
124	124
125	125	}

		@@ -2,11 +2,11 @@ discard block
		block discarded – undo
2	2
3	3	Loader::load('router', 'Router');
4	4
5		-class BlogRouter extends Router
6		-{
	5	+class BlogRouter extends Router
	6	+{
7	7
8		- protected function get_redirect_array()
9		- {
	8	+ protected function get_redirect_array()
	9	+ {
10	10	return array(
11	11	(object) array(
12	12	'pattern' => '@^/page_([0-9]+)/$@',
		@@ -43,8 +43,8 @@ discard block
		block discarded – undo
43	43	'replace' => '/$1'));
44	44	}
45	45
46		- protected function check_for_special_redirect($uri)
47		- {
	46	+ protected function check_for_special_redirect($uri)
	47	+ {
48	48	if(preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
49	49	{
50	50	global $container;
		@@ -59,8 +59,7 @@ discard block
		block discarded – undo
59	59
60	60	Loader::load('utility', 'Content');
61	61	$uri = Content::instance('URLSafe', "/{$post['category']}/{$post['path']}/")->activate();
62		- }
63		- else
	62	+ } else
64	63	{
65	64	$post_uri = URLDecode::getPiece(1);
66	65	if($post_uri !== null)
		@@ -87,8 +86,8 @@ discard block
		block discarded – undo
87	86	return $uri;
88	87	}
89	88
90		- protected function get_direct_array()
91		- {
	89	+ protected function get_direct_array()
	90	+ {
92	91	return array(
93	92	(object) array(
94	93	'match' => '/',

		@@ -2,11 +2,11 @@ discard block
		block discarded – undo
2	2
3	3	Loader::load('controller', 'portfolio/DefaultPageController');
4	4
5		-class ProjectsController extends DefaultPageController
6		-{
	5	+class ProjectsController extends DefaultPageController
	6	+{
7	7
8		- protected function set_head_data()
9		- {
	8	+ protected function set_head_data()
	9	+ {
10	10	$this->set_title("Projects Page \| Jacob Emerick's Portfolio");
11	11	$this->set_description("Collection of key open-source projects that Jacob has developed and maintained over the years.");
12	12	$this->set_keywords([
		@@ -19,8 +19,8 @@ discard block
		block discarded – undo
19	19	]);
20	20	}
21	21
22		- protected function set_body_data()
23		- {
	22	+ protected function set_body_data()
	23	+ {
24	24	$this->set_body('body_view', 'Projects');
25	25	$this->set_body('body_data', []);
26	26

		@@ -2,8 +2,8 @@ discard block
		block discarded – undo
2	2
3	3	Loader::load('controller', 'waterfalls/DefaultPageController');
4	4
5		-final class AboutController extends DefaultPageController
6		-{
	5	+final class AboutController extends DefaultPageController
	6	+{
7	7
8	8	private static $TITLE = 'About the Website \| Waterfalls of the Keweenaw';
9	9	private static $DESCRIPTION = 'A little bit about the website, the area, and the reason why someone would hunt down a hundred and fifty waterfalls in the Upper Peninsula.';
		@@ -14,8 +14,8 @@ discard block
		block discarded – undo
14	14	'Jacob Emerick',
15	15	);
16	16
17		- protected function set_head_data()
18		- {
	17	+ protected function set_head_data()
	18	+ {
19	19	parent::set_head_data();
20	20
21	21	$this->set_title(self::$TITLE);
		@@ -23,8 +23,8 @@ discard block
		block discarded – undo
23	23	$this->set_keywords(self::$KEYWORD_ARRAY);
24	24	}
25	25
26		- protected function set_body_data($page_type = 'normal')
27		- {
	26	+ protected function set_body_data($page_type = 'normal')
	27	+ {
28	28	parent::set_body_data($page_type);
29	29
30	30	$this->set_body('view', 'About');

		@@ -4,8 +4,8 @@ discard block
		block discarded – undo
4	4
5	5	use Aura\Sql\ConnectionLocator;
6	6
7		-class MysqlTagRepository implements TagRepositoryInterface
8		-{
	7	+class MysqlTagRepository implements TagRepositoryInterface
	8	+{
9	9
10	10	/** @var Aura\Sql\ConnectionLocator */
11	11	protected $connections;
		@@ -13,8 +13,8 @@ discard block
		block discarded – undo
13	13	/**
14	14	* @param Aura\Sql\ConnectionLocator
15	15	*/
16		- public function __construct(ConnectionLocator $connections)
17		- {
	16	+ public function __construct(ConnectionLocator $connections)
	17	+ {
18	18	$this->connections = $connections;
19	19	}
20	20
		@@ -23,8 +23,8 @@ discard block
		block discarded – undo
23	23	*
24	24	* @return array\|false
25	25	*/
26		- public function findTagByTitle($title)
27		- {
	26	+ public function findTagByTitle($title)
	27	+ {
28	28	$query = "
29	29	SELECT *
30	30	FROM `jpemeric_blog`.`tag`
		@@ -40,8 +40,8 @@ discard block
		block discarded – undo
40	40	->fetchOne($query, $bindings);
41	41	}
42	42
43		- public function getAllTags()
44		- {
	43	+ public function getAllTags()
	44	+ {
45	45	$query = "
46	46	SELECT *
47	47	FROM `jpemeric_blog`.`tag`
		@@ -53,8 +53,8 @@ discard block
		block discarded – undo
53	53	->fetchAll($query);
54	54	}
55	55
56		- public function getTagCloud()
57		- {
	56	+ public function getTagCloud()
	57	+ {
58	58	$query = "
59	59	SELECT COUNT(1) AS `count`, `tag`
60	60	FROM `jpemeric_blog`.`tag`
		@@ -72,8 +72,8 @@ discard block
		block discarded – undo
72	72	->fetchAll($query, $bindings);
73	73	}
74	74
75		- public function getTagsForPost($post)
76		- {
	75	+ public function getTagsForPost($post)
	76	+ {
77	77	$query = "
78	78	SELECT `tag`.*
79	79	FROM `jpemeric_blog`.`tag`

		@@ -6,8 +6,8 @@ discard block
		block discarded – undo
6	6	use Jacobemerick\CommentService\Api\DefaultApi;
7	7	use Jacobemerick\CommentService\Model\Commenter;
8	8
9		-class ServiceCommenterRepository implements CommenterRepositoryInterface
10		-{
	9	+class ServiceCommenterRepository implements CommenterRepositoryInterface
	10	+{
11	11
12	12	/**
13	13	* @var DefaultApi
		@@ -17,8 +17,8 @@ discard block
		block discarded – undo
17	17	/**
18	18	* @param DefaultApi $api
19	19	*/
20		- public function __construct(DefaultApi $api)
21		- {
	20	+ public function __construct(DefaultApi $api)
	21	+ {
22	22	$this->api = $api;
23	23	}
24	24
		@@ -27,8 +27,8 @@ discard block
		block discarded – undo
27	27	* @return array
28	28	* @throws ApiException
29	29	*/
30		- public function createCommenter(array $commenter)
31		- {
	30	+ public function createCommenter(array $commenter)
	31	+ {
32	32	$response = $this->api->createCommenter($commenter);
33	33	return $this->deserializeCommenter($response);
34	34	}
		@@ -38,8 +38,8 @@ discard block
		block discarded – undo
38	38	* @return array
39	39	* @throws ApiException
40	40	*/
41		- public function getCommenter($commenterId)
42		- {
	41	+ public function getCommenter($commenterId)
	42	+ {
43	43	$response = $this->api->getCommenter($commenterId);
44	44	return $this->deserializeCommenter($response);
45	45	}
		@@ -50,8 +50,8 @@ discard block
		block discarded – undo
50	50	* @return array
51	51	* @throws ApiException
52	52	*/
53		- public function getCommenters($page = null, $perPage = null)
54		- {
	53	+ public function getCommenters($page = null, $perPage = null)
	54	+ {
55	55	$response = $this->api->getCommenters($page, $perPage);
56	56	return array_map([$this, 'deserializeCommenter'], $response);
57	57	}
		@@ -60,8 +60,8 @@ discard block
		block discarded – undo
60	60	* @param Commenter
61	61	* @return array
62	62	*/
63		- protected function deserializeCommenter(Commenter $commenter)
64		- {
	63	+ protected function deserializeCommenter(Commenter $commenter)
	64	+ {
65	65	return [
66	66	'id' => $commenter->getId(),
67	67	'name' => $commenter->getName(),

jacobemerick / web

Push — master ( 04228d...052193 )

Status

Category

Indentation +105 added lines, -105 removed lines patch added patch discarded remove patch

Braces +9 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Braces +6 added lines, -6 removed lines patch added patch discarded remove patch

Braces +6 added lines, -6 removed lines patch added patch discarded remove patch

Braces +6 added lines, -6 removed lines patch added patch discarded remove patch

Braces +12 added lines, -12 removed lines patch added patch discarded remove patch

Braces +6 added lines, -6 removed lines patch added patch discarded remove patch

Braces +6 added lines, -6 removed lines patch added patch discarded remove patch

Braces +12 added lines, -12 removed lines patch added patch discarded remove patch

Braces +6 added lines, -6 removed lines patch added patch discarded remove patch