jacobemerick / web

router/WaterfallRouter.class.inc.php

Braces +8 added lines, -8 removed lines

@@ -5,11 +5,11 @@ 
     'waterfall/WaterfallCollector'));
 Loader::load('router', 'Router');
 
-class WaterfallRouter extends Router
-{
+class WaterfallRouter extends Router

+{

 
-	protected function get_redirect_array()
-	{
+	protected function get_redirect_array()

+	{

 		return array(
 			(object) array(
 				'pattern' => '@/index.(html|htm|php)$@',
@@ -71,8 +71,8 @@ 
 		);
 	}
 
-	protected function check_for_special_redirect($uri)
-	{
+	protected function check_for_special_redirect($uri)

+	{

         if (preg_match('@^/falls/([a-z\'-]+)(/?)$@', $uri, $matches)) {
             $alias = $matches[1];
             $alias = str_replace("'", '', $alias);
@@ -128,8 +128,8 @@ 
 		return $uri;
 	}
 
-	protected function get_direct_array()
-	{
+	protected function get_direct_array()

+	{

 		return array(
 			(object) array(
 				'match' => '/',

Indentation +130 added lines, -130 removed lines

@@ -8,24 +8,24 @@ 
 class WaterfallRouter extends Router
 {
 
-	protected function get_redirect_array()
-	{
-		return array(
-			(object) array(
-				'pattern' => '@/index.(html|htm|php)$@',
-				'replace' => '/'),
-			(object) array(
-				'pattern' => '@^/home(/?)$@',
-				'replace' => '/'),
-			(object) array(
-				'pattern' => '@^/falls/by-rating(/?)$@',
-				'replace' => '/falls/'),
-			(object) array(
-				'pattern' => '@^/falls/by-rating/([0-9]+)(/?)$@',
-				'replace' => '/falls/'),
-			(object) array(
-				'pattern' => '@^/falls/results(/?)$@',
-				'replace' => '/falls/'),
+    protected function get_redirect_array()
+    {
+        return array(
+            (object) array(
+                'pattern' => '@/index.(html|htm|php)$@',
+                'replace' => '/'),
+            (object) array(
+                'pattern' => '@^/home(/?)$@',
+                'replace' => '/'),
+            (object) array(
+                'pattern' => '@^/falls/by-rating(/?)$@',
+                'replace' => '/falls/'),
+            (object) array(
+                'pattern' => '@^/falls/by-rating/([0-9]+)(/?)$@',
+                'replace' => '/falls/'),
+            (object) array(
+                'pattern' => '@^/falls/results(/?)$@',
+                'replace' => '/falls/'),
             (object) array(
                 'pattern' => '@^/log(/?)$@',
                 'replace' => '/journal/'),
@@ -35,47 +35,47 @@ 
             (object) array(
                 'pattern' => '@^/map/([^/]+)(/?)$@',
                 'replace' => '/map/'),
-			(object) array(
-				'pattern' => '@^/about/([a-z]*)(/?)$@',
-				'replace' => '/about/'),
-			(object) array(
-				'pattern' => '@^/birch-creek/birch-creek-falls/?$@',
-				'replace' => '/birch-creek/gold-mine-falls/'),
-			(object) array(
-				'pattern' => '@^/big-iron-river/bonanza-falls/?$@',
-				'replace' => '/big-iron-river/greenwood-falls/'),
-			(object) array(
-				'pattern' => '@^/east-branch-huron-river/east-branch-huron-river-falls/?$@',
-				'replace' => '/east-branch-huron-river/east-branch-falls/'),
-			(object) array(
-				'pattern' => '@^/montreal-river/lower-montreal-falls/?$@',
-				'replace' => '/montreal-river/montreal-falls/'),
-			(object) array(
-				'pattern' => '@^/manganese-creek/manganese-gorge-falls/?$@',
-				'replace' => '/manganese-creek/manganese-falls/'),
-			(object) array(
-				'pattern' => '@^/dead-river/tourist-park-dam-falls/?$@',
-				'replace' => '/dead-river/tourist-park-falls/'),
-			(object) array(
-				'pattern' => '@^/sturgeon-river/upper-sturgeon-falls/?$@',
-				'replace' => '/sturgeon-river/little-spruce-falls/'),
-			(object) array(
-				'pattern' => '@^/tahquamenon-river/upper-tahquamenon-falls/?$@',
-				'replace' => '/tahquamenon-river/tahquamenon-falls/'),
-			(object) array(
-				'pattern' => '@^/west-branch-huron-river/west-branch-huron-river-falls/?@',
-				'replace' => '/west-branch-huron-river/west-branch-falls/'),
-			(object) array(
-				'pattern' => '@^/west-branch-yellow-dog-river/west-branch-yellow-dog-falls/?@',
-				'replace' => '/west-branch-yellow-dog-river/west-branch-falls/'),
-			(object) array(
-				'pattern' => '@^/baltimore-river/peanut-butter-falls/?@',
-				'replace' => '/baltimore-river/konteko-falls/'),
-		);
-	}
+            (object) array(
+                'pattern' => '@^/about/([a-z]*)(/?)$@',
+                'replace' => '/about/'),
+            (object) array(
+                'pattern' => '@^/birch-creek/birch-creek-falls/?$@',
+                'replace' => '/birch-creek/gold-mine-falls/'),
+            (object) array(
+                'pattern' => '@^/big-iron-river/bonanza-falls/?$@',
+                'replace' => '/big-iron-river/greenwood-falls/'),
+            (object) array(
+                'pattern' => '@^/east-branch-huron-river/east-branch-huron-river-falls/?$@',
+                'replace' => '/east-branch-huron-river/east-branch-falls/'),
+            (object) array(
+                'pattern' => '@^/montreal-river/lower-montreal-falls/?$@',
+                'replace' => '/montreal-river/montreal-falls/'),
+            (object) array(
+                'pattern' => '@^/manganese-creek/manganese-gorge-falls/?$@',
+                'replace' => '/manganese-creek/manganese-falls/'),
+            (object) array(
+                'pattern' => '@^/dead-river/tourist-park-dam-falls/?$@',
+                'replace' => '/dead-river/tourist-park-falls/'),
+            (object) array(
+                'pattern' => '@^/sturgeon-river/upper-sturgeon-falls/?$@',
+                'replace' => '/sturgeon-river/little-spruce-falls/'),
+            (object) array(
+                'pattern' => '@^/tahquamenon-river/upper-tahquamenon-falls/?$@',
+                'replace' => '/tahquamenon-river/tahquamenon-falls/'),
+            (object) array(
+                'pattern' => '@^/west-branch-huron-river/west-branch-huron-river-falls/?@',
+                'replace' => '/west-branch-huron-river/west-branch-falls/'),
+            (object) array(
+                'pattern' => '@^/west-branch-yellow-dog-river/west-branch-yellow-dog-falls/?@',
+                'replace' => '/west-branch-yellow-dog-river/west-branch-falls/'),
+            (object) array(
+                'pattern' => '@^/baltimore-river/peanut-butter-falls/?@',
+                'replace' => '/baltimore-river/konteko-falls/'),
+        );
+    }
 
-	protected function check_for_special_redirect($uri)
-	{
+    protected function check_for_special_redirect($uri)
+    {
         if (preg_match('@^/falls/([a-z\'-]+)(/?)$@', $uri, $matches)) {
             $alias = $matches[1];
             $alias = str_replace("'", '', $alias);
@@ -128,81 +128,81 @@ 
             }
         }
         
-		return $uri;
-	}
+        return $uri;
+    }
 
-	protected function get_direct_array()
-	{
-		return array(
-			(object) array(
-				'match' => '/',
-				'controller' => 'HomeController'),
-			(object) array(
-				'match' => '/falls/',
-				'controller' => 'WaterfallListController'),
-			(object) array(
-				'match' => '/falls/([0-9]+)/',
-				'controller' => 'WaterfallListController'),
-			(object) array(
-				'match' => '/([a-z]+)-county/',
-				'controller' => 'CountyListController'),
-			(object) array(
-				'match' => '/([a-z]+)-county/([0-9]+)/',
-				'controller' => 'CountyListController'),
-			(object) array(
-				'match' => '/([a-z0-9-]+)-(creek|river)/',
-				'controller' => 'WatercourseListController'),
-			(object) array(
-				'match' => '/([a-z0-9-]+)-(creek|river)/([0-9]+)/',
-				'controller' => 'WatercourseListController'),
-			(object) array(
-				'match' => '/category/([a-z]+)/',
-				'controller' => 'CategoryListController'),
-			(object) array(
-				'match' => '/category/([a-z]+)/([0-9]+)/',
-				'controller' => 'CategoryListController'),
-			(object) array(
-				'match' => '/([a-z0-9-]+)-(creek|river)/([a-z-]+)/',
-				'controller' => 'WaterfallController'),
-			(object) array(
-				'match' => '/map/',
-				'controller' => 'MapController'),
+    protected function get_direct_array()
+    {
+        return array(
+            (object) array(
+                'match' => '/',
+                'controller' => 'HomeController'),
+            (object) array(
+                'match' => '/falls/',
+                'controller' => 'WaterfallListController'),
+            (object) array(
+                'match' => '/falls/([0-9]+)/',
+                'controller' => 'WaterfallListController'),
+            (object) array(
+                'match' => '/([a-z]+)-county/',
+                'controller' => 'CountyListController'),
+            (object) array(
+                'match' => '/([a-z]+)-county/([0-9]+)/',
+                'controller' => 'CountyListController'),
+            (object) array(
+                'match' => '/([a-z0-9-]+)-(creek|river)/',
+                'controller' => 'WatercourseListController'),
+            (object) array(
+                'match' => '/([a-z0-9-]+)-(creek|river)/([0-9]+)/',
+                'controller' => 'WatercourseListController'),
+            (object) array(
+                'match' => '/category/([a-z]+)/',
+                'controller' => 'CategoryListController'),
+            (object) array(
+                'match' => '/category/([a-z]+)/([0-9]+)/',
+                'controller' => 'CategoryListController'),
+            (object) array(
+                'match' => '/([a-z0-9-]+)-(creek|river)/([a-z-]+)/',
+                'controller' => 'WaterfallController'),
+            (object) array(
+                'match' => '/map/',
+                'controller' => 'MapController'),
             (object) array(
                 'match' => '/map/#[a-z-/]+',
                 'controller' => 'MapController'),
-			(object) array(
-				'match' => '/journal/',
-				'controller' => 'LogListController'),
-			(object) array(
-				'match' => '/journal/([0-9]+)/',
-				'controller' => 'LogListController'),
-			(object) array(
-				'match' => '/journal/[a-z-]+/',
-				'controller' => 'LogController'),
-			(object) array(
-				'match' => '/companion/([a-z-]+)/',
-				'controller' => 'CompanionListController'),
-			(object) array(
-				'match' => '/companion/([a-z-]+)/([0-9]+)/',
-				'controller' => 'CompanionListController'),
-			(object) array(
-				'match' => '/period/([a-z-]+)/',
-				'controller' => 'PeriodListController'),
-			(object) array(
-				'match' => '/period/([a-z-]+)/([0-9]+)/',
-				'controller' => 'PeriodListController'),
-			(object) array(
-				'match' => '/journal/tag/([a-z-]+)/',
-				'controller' => 'LogTagListController'),
-			(object) array(
-				'match' => '/journal/tag/([a-z-]+)/([0-9]+)/',
-				'controller' => 'LogTagListController'),
-			(object) array(
-				'match' => '/about/',
-				'controller' => 'AboutController'),
-			(object) array(
-				'match' => '/contact/',
-				'controller' => 'ContactController'));
-	}
+            (object) array(
+                'match' => '/journal/',
+                'controller' => 'LogListController'),
+            (object) array(
+                'match' => '/journal/([0-9]+)/',
+                'controller' => 'LogListController'),
+            (object) array(
+                'match' => '/journal/[a-z-]+/',
+                'controller' => 'LogController'),
+            (object) array(
+                'match' => '/companion/([a-z-]+)/',
+                'controller' => 'CompanionListController'),
+            (object) array(
+                'match' => '/companion/([a-z-]+)/([0-9]+)/',
+                'controller' => 'CompanionListController'),
+            (object) array(
+                'match' => '/period/([a-z-]+)/',
+                'controller' => 'PeriodListController'),
+            (object) array(
+                'match' => '/period/([a-z-]+)/([0-9]+)/',
+                'controller' => 'PeriodListController'),
+            (object) array(
+                'match' => '/journal/tag/([a-z-]+)/',
+                'controller' => 'LogTagListController'),
+            (object) array(
+                'match' => '/journal/tag/([a-z-]+)/([0-9]+)/',
+                'controller' => 'LogTagListController'),
+            (object) array(
+                'match' => '/about/',
+                'controller' => 'AboutController'),
+            (object) array(
+                'match' => '/contact/',
+                'controller' => 'ContactController'));
+    }
 
 }

controller/portfolio/ProjectsController.class.inc.php

Braces +6 added lines, -6 removed lines

@@ -2,11 +2,11 @@ 
 
 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 @@ 
         ]);
     }
 
-    protected function set_body_data()
-    {
+    protected function set_body_data()

+    {

         $this->set_body('body_view', 'Projects');
         $this->set_body('body_data', []);
 

controller/portfolio/AboutController.class.inc.php

Braces +6 added lines, -6 removed lines

@@ -2,11 +2,11 @@ 
 
 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 @@ 
         ]);
     }
 
-    protected function set_body_data()
-    {
+    protected function set_body_data()

+    {

         $this->set_body('body_view', 'About');
         $this->set_body('body_data', []);
 

controller/waterfalls/AboutController.class.inc.php

Braces +6 added lines, -6 removed lines

@@ -2,8 +2,8 @@ 
 
 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 @@ 
         '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 @@ 
         $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');

src/Domain/Blog/Tag/MysqlTagRepository.php

Braces +12 added lines, -12 removed lines

@@ -4,8 +4,8 @@ 
 
 use Aura\Sql\ConnectionLocator;
 
-class MysqlTagRepository implements TagRepositoryInterface
-{
+class MysqlTagRepository implements TagRepositoryInterface

+{

 
     /** @var  Aura\Sql\ConnectionLocator */
     protected $connections;
@@ -13,8 +13,8 @@ 
     /**
      * @param Aura\Sql\ConnectionLocator
      */
-    public function __construct(ConnectionLocator $connections)
-    {
+    public function __construct(ConnectionLocator $connections)

+    {

         $this->connections = $connections;
     }
 
@@ -23,8 +23,8 @@ 
      *
      * @return array|false
      */
-    public function findTagByTitle($title)
-    {
+    public function findTagByTitle($title)

+    {

         $query = "
             SELECT *
             FROM `jpemeric_blog`.`tag`
@@ -40,8 +40,8 @@ 
             ->fetchOne($query, $bindings);
     }
 
-    public function getAllTags()
-    {
+    public function getAllTags()

+    {

         $query = "
             SELECT *
             FROM `jpemeric_blog`.`tag`
@@ -53,8 +53,8 @@ 
             ->fetchAll($query);
     }
 
-    public function getTagCloud()
-    {
+    public function getTagCloud()

+    {

         $query = "
             SELECT COUNT(1) AS `count`, `tag`
             FROM `jpemeric_blog`.`tag`
@@ -72,8 +72,8 @@ 
             ->fetchAll($query, $bindings);
     }
 
-    public function getTagsForPost($post)
-    {
+    public function getTagsForPost($post)

+    {

         $query = "
             SELECT `tag`.*
             FROM `jpemeric_blog`.`tag`

src/Domain/Blog/Introduction/MysqlIntroductionRepository.php

Braces +6 added lines, -6 removed lines

@@ -4,8 +4,8 @@ 
 
 use Aura\Sql\ConnectionLocator;
 
-class MysqlIntroductionRepository implements IntroductionRepositoryInterface
-{
+class MysqlIntroductionRepository implements IntroductionRepositoryInterface

+{

 
     /** @var  Aura\Sql\ConnectionLocator */
     protected $connections;
@@ -13,8 +13,8 @@ 
     /**
      * @param Aura\Sql\ConnectionLocator
      */
-    public function __construct(ConnectionLocator $connections)
-    {
+    public function __construct(ConnectionLocator $connections)

+    {

         $this->connections = $connections;
     }
 
@@ -24,8 +24,8 @@ 
      *
      * @return array|false
      */
-    public function findByType($type, $value = '')
-    {
+    public function findByType($type, $value = '')

+    {

         $query = "
             SELECT `title`, `content`, `image`
             FROM `jpemeric_blog`.`introduction`

src/Domain/Blog/Series/MysqlSeriesRepository.php

Braces +6 added lines, -6 removed lines

@@ -4,8 +4,8 @@ 
 
 use Aura\Sql\ConnectionLocator;
 
-class MysqlSeriesRepository implements SeriesRepositoryInterface
-{
+class MysqlSeriesRepository implements SeriesRepositoryInterface

+{

 
     /** @var  Aura\Sql\ConnectionLocator */
     protected $connections;
@@ -13,8 +13,8 @@ 
     /**
      * @param Aura\Sql\ConnectionLocator
      */
-    public function __construct(ConnectionLocator $connections)
-    {
+    public function __construct(ConnectionLocator $connections)

+    {

         $this->connections = $connections;
     }
 
@@ -23,8 +23,8 @@ 
      *
      * @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`

src/Domain/Comment/Commenter/ServiceCommenterRepository.php

Braces +12 added lines, -12 removed lines

@@ -6,8 +6,8 @@ 
 use Jacobemerick\CommentService\Api\DefaultApi;
 use Jacobemerick\CommentService\Model\Commenter;
 
-class ServiceCommenterRepository implements CommenterRepositoryInterface
-{
+class ServiceCommenterRepository implements CommenterRepositoryInterface

+{

 
     /**
      * @var DefaultApi
@@ -17,8 +17,8 @@ 
     /**
      * @param DefaultApi $api
      */
-    public function __construct(DefaultApi $api)
-    {
+    public function __construct(DefaultApi $api)

+    {

         $this->api = $api;
     }
 
@@ -27,8 +27,8 @@ 
      * @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 @@ 
      * @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 @@ 
      * @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 @@ 
      * @param Commenter
      * @return array
      */
-    protected function deserializeCommenter(Commenter $commenter)
-    {
+    protected function deserializeCommenter(Commenter $commenter)

+    {

         return [
             'id' => $commenter->getId(),
             'name' => $commenter->getName(),

src/Domain/Stream/Changelog/MysqlChangelogRepository.php

Braces +6 added lines, -6 removed lines

@@ -4,8 +4,8 @@ 
 
 use Aura\Sql\ConnectionLocator;
 
-class MysqlChangelogRepository implements ChangelogRepositoryInterface
-{
+class MysqlChangelogRepository implements ChangelogRepositoryInterface

+{

 
     /** @var  ConnectionLocator */
     protected $connections;
@@ -13,8 +13,8 @@ 
     /**
      * @param ConnectonLocator $connections
      */
-    public function __construct(ConnectionLocator $connections)
-    {
+    public function __construct(ConnectionLocator $connections)

+    {

         $this->connections = $connections;
     }
 
@@ -24,8 +24,8 @@ 
      *
      * @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`