jacobemerick / web

src/Domain/Comment/Comment/CommentRepositoryInterface.php

Indentation +1 added lines, -1 removed lines

@@ -4,5 +4,5 @@
 
 interface CommentRepositoryInterface
 {
-    public function getActiveCommentsBySite($site, $limit = null, $offset= 0);
+	public function getActiveCommentsBySite($site, $limit = null, $offset= 0);
 }

Spacing +1 added lines, -1 removed lines

@@ -4,5 +4,5 @@
 
 interface CommentRepositoryInterface
 {
-    public function getActiveCommentsBySite($site, $limit = null, $offset= 0);
+    public function getActiveCommentsBySite($site, $limit = null, $offset = 0);
 }

script/cron/generate-rss-feeds.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
  * @param string $folder
  * @return boolean
  */
-$buildFeed = function (Feed $feed, $folder, $name = 'rss') {
+$buildFeed = function(Feed $feed, $folder, $name = 'rss') {
     $tempFeed = __DIR__ . "/../../public/{$folder}/{$name}-new.xml";
     $finalFeed = __DIR__ . "/../../public/{$folder}/{$name}.xml";
 

Indentation +83 added lines, -83 removed lines

@@ -21,14 +21,14 @@ 
  * @return boolean
  */
 $buildFeed = function (Feed $feed, $folder, $name = 'rss') {
-    $tempFeed = __DIR__ . "/../../public/{$folder}/{$name}-new.xml";
-    $finalFeed = __DIR__ . "/../../public/{$folder}/{$name}.xml";
+	$tempFeed = __DIR__ . "/../../public/{$folder}/{$name}-new.xml";
+	$finalFeed = __DIR__ . "/../../public/{$folder}/{$name}.xml";
 
-    $feedHandle = fopen($tempFeed, 'w');
-    fwrite($feedHandle, $feed->render());
-    fclose($feedHandle);
+	$feedHandle = fopen($tempFeed, 'w');
+	fwrite($feedHandle, $feed->render());
+	fclose($feedHandle);
 
-    rename($tempFeed, $finalFeed);
+	rename($tempFeed, $finalFeed);
 };
 
 
@@ -47,56 +47,56 @@ 
 $activeBlogPosts = $blogPostRepository->getActivePosts();
 
 foreach ($activeBlogPosts as $blogPost) {
-    $blogPostItem = new Item();
-
-    $blogPostItem->title($blogPost['title']);
-
-    $url = "https://blog.jacobemerick.com/{$blogPost['category']}/{$blogPost['path']}/";
-    $blogPostItem->url($url);
-    $blogPostItem->guid($url, true);
-
-    $description = $blogPost['body'];
-    $description = strip_tags($description);
-    $description = strtok($description, "\n");
-    if (strlen($description) > 250) {
-        $description = wordwrap($description, 250);
-        $description = strtok($description, "\n");
-        if (substr($description, -1) != '.') {
-            $description .= '…';
-        }
-    }
-    $description = html_entity_decode($description);
-    $blogPostItem->description($description);
-
-    $categoryUrl = "https://blog.jacobemerick.com/{$blogPost['category']}/";
-    $blogPostItem->category($blogPost['category'], $categoryUrl);
-
-    $pubDate = new DateTime($blogPost['date']);
-    $blogPostItem->pubDate($pubDate->getTimestamp());
-
-    $firstPhoto = Content::instance('FetchFirstPhoto', $blogPost['body'])->activate(true, 'large');
-    if (!empty($firstPhoto)) {
-        $firstPhotoPieces = sscanf($firstPhoto, '<img src="%s" height="%d" width="%d" alt="%s" />');
-        $firstPhotoPath = current($firstPhotoPieces);
-        $firstPhotoPath = trim($firstPhotoPath, '"');
-
-        $firstPhotoInternalPath = __DIR__ . '/../../public' . $firstPhotoPath;
-
-        $firstPhotoSize = filesize($firstPhotoInternalPath);
-
-        /**
-         * ugh, remote host does not have pecl fileinfo
-         *
-         * $fInfo = new finfo(FILEINFO_MIME_TYPE);
-         * $firstPhotoType = $fInfo->file($firstPhotoInternalPath);
-         * unset($fInfo);
-         **/
-        $firstPhotoType = 'image/jpeg';
-
-        $blogPostItem->enclosure("https://blog.jacobemerick.com{$firstPhotoPath}", $firstPhotoSize, $firstPhotoType);
-    }
-
-    $blogPostItem->appendTo($blogPostChannel);
+	$blogPostItem = new Item();
+
+	$blogPostItem->title($blogPost['title']);
+
+	$url = "https://blog.jacobemerick.com/{$blogPost['category']}/{$blogPost['path']}/";
+	$blogPostItem->url($url);
+	$blogPostItem->guid($url, true);
+
+	$description = $blogPost['body'];
+	$description = strip_tags($description);
+	$description = strtok($description, "\n");
+	if (strlen($description) > 250) {
+		$description = wordwrap($description, 250);
+		$description = strtok($description, "\n");
+		if (substr($description, -1) != '.') {
+			$description .= '&hellip;';
+		}
+	}
+	$description = html_entity_decode($description);
+	$blogPostItem->description($description);
+
+	$categoryUrl = "https://blog.jacobemerick.com/{$blogPost['category']}/";
+	$blogPostItem->category($blogPost['category'], $categoryUrl);
+
+	$pubDate = new DateTime($blogPost['date']);
+	$blogPostItem->pubDate($pubDate->getTimestamp());
+
+	$firstPhoto = Content::instance('FetchFirstPhoto', $blogPost['body'])->activate(true, 'large');
+	if (!empty($firstPhoto)) {
+		$firstPhotoPieces = sscanf($firstPhoto, '<img src="%s" height="%d" width="%d" alt="%s" />');
+		$firstPhotoPath = current($firstPhotoPieces);
+		$firstPhotoPath = trim($firstPhotoPath, '"');
+
+		$firstPhotoInternalPath = __DIR__ . '/../../public' . $firstPhotoPath;
+
+		$firstPhotoSize = filesize($firstPhotoInternalPath);
+
+		/**
+		 * ugh, remote host does not have pecl fileinfo
+		 *
+		 * $fInfo = new finfo(FILEINFO_MIME_TYPE);
+		 * $firstPhotoType = $fInfo->file($firstPhotoInternalPath);
+		 * unset($fInfo);
+		 **/
+		$firstPhotoType = 'image/jpeg';
+
+		$blogPostItem->enclosure("https://blog.jacobemerick.com{$firstPhotoPath}", $firstPhotoSize, $firstPhotoType);
+	}
+
+	$blogPostItem->appendTo($blogPostChannel);
 }
 
 $buildFeed($blogPostFeed, 'blog');
@@ -114,33 +114,33 @@ 
 $activeBlogComments = $commentRepository->getActiveCommentsBySite('blog');
 
 foreach ($activeBlogComments as $blogComment) {
-    $blogCommentItem = new Item();
-
-    $blogCommentItem->title("Comment on '{$blogComment['title']}' from {$blogComment['name']}");
-
-    $url = "https://blog.jacobemerick.com/{$blogComment['category']}/{$blogComment['path']}/";
-    $url .= "#comment-{$blogComment['id']}";
-    $blogCommentItem->url($url);
-    $blogCommentItem->guid($url, true);
-
-    $description = $blogComment['body'];
-    $description = strip_tags($description);
-    $description = strtok($description, "\n");
-    if (strlen($description) > 250) {
-        $description = wordwrap($description, 250);
-        $description = strtok($description, "\n");
-        if (substr($description, -1) != '.') {
-            $description .= '&hellip;';
-        }
-    }
-    $description = html_entity_decode($description);
-    $description = trim($description);
-    $blogCommentItem->description($description);
-
-    $pubDate = new DateTime($blogComment['date']);
-    $blogCommentItem->pubDate($pubDate->getTimestamp());
-
-    $blogCommentItem->appendTo($blogCommentChannel);
+	$blogCommentItem = new Item();
+
+	$blogCommentItem->title("Comment on '{$blogComment['title']}' from {$blogComment['name']}");
+
+	$url = "https://blog.jacobemerick.com/{$blogComment['category']}/{$blogComment['path']}/";
+	$url .= "#comment-{$blogComment['id']}";
+	$blogCommentItem->url($url);
+	$blogCommentItem->guid($url, true);
+
+	$description = $blogComment['body'];
+	$description = strip_tags($description);
+	$description = strtok($description, "\n");
+	if (strlen($description) > 250) {
+		$description = wordwrap($description, 250);
+		$description = strtok($description, "\n");
+		if (substr($description, -1) != '.') {
+			$description .= '&hellip;';
+		}
+	}
+	$description = html_entity_decode($description);
+	$description = trim($description);
+	$blogCommentItem->description($description);
+
+	$pubDate = new DateTime($blogComment['date']);
+	$blogCommentItem->pubDate($pubDate->getTimestamp());
+
+	$blogCommentItem->appendTo($blogCommentChannel);
 }
 
 $buildFeed($blogCommentFeed, 'blog', 'rss-comments');

src/Domain/Stream/Activity/ActivityRepositoryInterface.php

Indentation +5 added lines, -5 removed lines

@@ -4,9 +4,9 @@
 
 interface ActivityRepositoryInterface
 {
-    public function getActivityById($id);
-    public function getActivities($limit = null, $offset = 0);
-    public function getActivitiesCount();
-    public function getActivitiesByType($type, $limit = null, $offset = 0);
-    public function getActivitiesByTypeCount($type);
+	public function getActivityById($id);
+	public function getActivities($limit = null, $offset = 0);
+	public function getActivitiesCount();
+	public function getActivitiesByType($type, $limit = null, $offset = 0);
+	public function getActivitiesByTypeCount($type);
 }

controller/lifestream/DefaultPageController.class.inc.php

Indentation +3 added lines, -3 removed lines

@@ -10,10 +10,10 @@
 
   public function __construct()
   {
-    parent::__construct();
+	parent::__construct();
 
-    global $container;
-    $this->activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']);
+	global $container;
+	$this->activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']);
   }
 
 	protected function set_head_data()

script/cron/generate-sitemaps.php

Spacing +9 added lines, -9 removed lines

@@ -26,7 +26,7 @@ 
  * @param string $domain
  * @return boolean
  */
-$buildSitemap = function (array $entries, $domain, $folder) {
+$buildSitemap = function(array $entries, $domain, $folder) {
     $urlSet = new Urlset();
     foreach ($entries as $path => $entry) {
         $url = new Url("{$domain}{$path}"); // todo better detection of domain by env
@@ -53,13 +53,13 @@ 
 /*********************************************
  * blog.jacobemerick.com
  *********************************************/
-$reduceToMostRecentBlogPost = function ($recentPost, $post) {
+$reduceToMostRecentBlogPost = function($recentPost, $post) {
     if (is_null($recentPost)) {
         return $post;
     }
     $postDate = new DateTime($post['date']);
     $recentPostDate = new DateTime($recentPost['date']);
-    return ($postDate > $recentPostDate) ? $post: $recentPost;
+    return ($postDate > $recentPostDate) ? $post : $recentPost;
 };
 
 $blogPostsPerPage = 10;
@@ -94,7 +94,7 @@ 
 ];
 
 foreach ($blogCategoryArray as $blogCategory) {
-    $blogCategoryPosts = array_filter($activeBlogPosts, function ($post) use ($blogCategory) {
+    $blogCategoryPosts = array_filter($activeBlogPosts, function($post) use ($blogCategory) {
         return $post['category'] == $blogCategory;
     });
     $mostRecentBlogCategoryPost = array_reduce($blogCategoryPosts, $reduceToMostRecentBlogPost);
@@ -207,13 +207,13 @@ 
 /*********************************************
  * lifestream.jacobemerick.com
  *********************************************/
-$reduceToMostRecentStreamActivity = function ($recentActivity, $activity) {
+$reduceToMostRecentStreamActivity = function($recentActivity, $activity) {
     if (is_null($recentActivity)) {
         return $activity;
     }
     $activityDate = new DateTime($activity['datetime']);
     $recentActivityDate = new DateTime($recentActivity['datetime']);
-    return ($activityDate > $recentActivityDate) ? $activity: $recentActivity;
+    return ($activityDate > $recentActivityDate) ? $activity : $recentActivity;
 };
 
 $streamActivitiesPerPage = 15;
@@ -251,7 +251,7 @@ 
 ];
 
 foreach ($streamTypeArray as $streamType) {
-    $streamTypeActivities = array_filter($streamActivities, function ($post) use ($streamType) {
+    $streamTypeActivities = array_filter($streamActivities, function($post) use ($streamType) {
         return $post['type'] == $streamType;
     });
     $mostRecentStreamTypeActivity = array_reduce($streamTypeActivities, $reduceToMostRecentStreamActivity);
@@ -385,13 +385,13 @@ 
 /*********************************************
  * www.waterfallofthekeweenaw.com
  *********************************************/
-$reduceToMostRecentJournalLog = function ($recentLog, $log) {
+$reduceToMostRecentJournalLog = function($recentLog, $log) {
     if (is_null($recentLog)) {
         return $log;
     }
     $logDate = new DateTime($log['publish_date']);
     $recentLogDate = new DateTime($recentLog['publish_date']);
-    return ($logDate > $recentLogDate) ? log: $recentLog;
+    return ($logDate > $recentLogDate) ? log : $recentLog;
 };
 
 $waterfallRepository = new WaterfallRepository($container['db_connection_locator']);

Indentation +378 added lines, -378 removed lines

@@ -27,26 +27,26 @@ 
  * @return boolean
  */
 $buildSitemap = function (array $entries, $domain, $folder) {
-    $urlSet = new Urlset();
-    foreach ($entries as $path => $entry) {
-        $url = new Url("{$domain}{$path}"); // todo better detection of domain by env
-        $url->setLastMod($entry['lastmod']); // todo check if exists
-        $url->setChangeFreq($entry['changefreq']); // todo check if exists
-        $url->setPriority($entry['priority']); // todo check if exists
-        $urlSet->addUrl($url);
-    }
-
-    $output = new Output();
-    $output->setIndentString('  '); // change indentation from 4 to 2 spaces
-
-    $tempSitemap = __DIR__ . "/../../public/{$folder}/sitemap-new.xml";
-    $finalSitemap = __DIR__ . "/../../public/{$folder}/sitemap.xml";
-
-    $sitemapHandle = fopen($tempSitemap, 'w');
-    fwrite($sitemapHandle, $output->getOutput($urlSet));
-    fclose($sitemapHandle);
-
-    rename($tempSitemap, $finalSitemap);
+	$urlSet = new Urlset();
+	foreach ($entries as $path => $entry) {
+		$url = new Url("{$domain}{$path}"); // todo better detection of domain by env
+		$url->setLastMod($entry['lastmod']); // todo check if exists
+		$url->setChangeFreq($entry['changefreq']); // todo check if exists
+		$url->setPriority($entry['priority']); // todo check if exists
+		$urlSet->addUrl($url);
+	}
+
+	$output = new Output();
+	$output->setIndentString('  '); // change indentation from 4 to 2 spaces
+
+	$tempSitemap = __DIR__ . "/../../public/{$folder}/sitemap-new.xml";
+	$finalSitemap = __DIR__ . "/../../public/{$folder}/sitemap.xml";
+
+	$sitemapHandle = fopen($tempSitemap, 'w');
+	fwrite($sitemapHandle, $output->getOutput($urlSet));
+	fclose($sitemapHandle);
+
+	rename($tempSitemap, $finalSitemap);
 };
 
 
@@ -54,12 +54,12 @@ 
  * blog.jacobemerick.com
  *********************************************/
 $reduceToMostRecentBlogPost = function ($recentPost, $post) {
-    if (is_null($recentPost)) {
-        return $post;
-    }
-    $postDate = new DateTime($post['date']);
-    $recentPostDate = new DateTime($recentPost['date']);
-    return ($postDate > $recentPostDate) ? $post: $recentPost;
+	if (is_null($recentPost)) {
+		return $post;
+	}
+	$postDate = new DateTime($post['date']);
+	$recentPostDate = new DateTime($recentPost['date']);
+	return ($postDate > $recentPostDate) ? $post: $recentPost;
 };
 
 $blogPostsPerPage = 10;
@@ -70,107 +70,107 @@ 
 
 // todo these post-level dates should be accurate to H:i:s
 $entryArray = [
-    '/' => [
-        'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'),
-        'changefreq' => 'daily',
-        'priority' => .9,
-    ]
+	'/' => [
+		'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'),
+		'changefreq' => 'daily',
+		'priority' => .9,
+	]
 ];
 for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($activeBlogPosts); $i++) {
-    $entryKey = "/{$i}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'),
-            'changefreq' => 'daily',
-            'priority' => .1,
-        ]
-    ];
+	$entryKey = "/{$i}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'),
+			'changefreq' => 'daily',
+			'priority' => .1,
+		]
+	];
 }
 
 $blogCategoryArray = [
-    'hiking',
-    'personal',
-    'web-development',
+	'hiking',
+	'personal',
+	'web-development',
 ];
 
 foreach ($blogCategoryArray as $blogCategory) {
-    $blogCategoryPosts = array_filter($activeBlogPosts, function ($post) use ($blogCategory) {
-        return $post['category'] == $blogCategory;
-    });
-    $mostRecentBlogCategoryPost = array_reduce($blogCategoryPosts, $reduceToMostRecentBlogPost);
-
-    $entryKey = "/{$blogCategory}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'),
-            'changefreq' => 'daily',
-            'priority' => .3,
-        ]
-    ];
-
-    for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogCategoryPosts); $i++) {
-        $entryKey = "/{$blogCategory}/{$i}/";
-        $entryArray += [
-            $entryKey => [
-                'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'),
-                'changefreq' => 'daily',
-                'priority' => .1,
-            ]
-        ];
-    }
+	$blogCategoryPosts = array_filter($activeBlogPosts, function ($post) use ($blogCategory) {
+		return $post['category'] == $blogCategory;
+	});
+	$mostRecentBlogCategoryPost = array_reduce($blogCategoryPosts, $reduceToMostRecentBlogPost);
+
+	$entryKey = "/{$blogCategory}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'),
+			'changefreq' => 'daily',
+			'priority' => .3,
+		]
+	];
+
+	for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogCategoryPosts); $i++) {
+		$entryKey = "/{$blogCategory}/{$i}/";
+		$entryArray += [
+			$entryKey => [
+				'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'),
+				'changefreq' => 'daily',
+				'priority' => .1,
+			]
+		];
+	}
 }
 
 $blogTagRepository = new BlogTagRepository($container['db_connection_locator']);
 $blogTags = $blogTagRepository->getAllTags();
 foreach ($blogTags as $blogTag) {
-    $blogPostsWithTag = $blogPostRepository->getActivePostsByTag($blogTag['id']);
-    if (count($blogPostsWithTag) < 1) {
-        continue;
-    }
-
-    $mostRecentBlogTagPost = array_reduce($blogPostsWithTag, $reduceToMostRecentBlogPost);
-
-    $blogTagPath = str_replace(' ', '-', $blogTag['tag']);
-    $entryKey = "/tag/{$blogTagPath}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'),
-            'changefreq' => 'daily',
-            'priority' => .1,
-        ]
-    ];
-
-    for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogPostsWithTag); $i++) {
-        $blogTagPath = str_replace(' ', '-', $blogTag['tag']);
-        $entryKey = "/tag/{$blogTagPath}/{$i}/";
-        $entryArray += [
-            $entryKey => [
-                'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'),
-                'changefreq' => 'daily',
-                'priority' => .1,
-            ]
-        ];
-    }
+	$blogPostsWithTag = $blogPostRepository->getActivePostsByTag($blogTag['id']);
+	if (count($blogPostsWithTag) < 1) {
+		continue;
+	}
+
+	$mostRecentBlogTagPost = array_reduce($blogPostsWithTag, $reduceToMostRecentBlogPost);
+
+	$blogTagPath = str_replace(' ', '-', $blogTag['tag']);
+	$entryKey = "/tag/{$blogTagPath}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'),
+			'changefreq' => 'daily',
+			'priority' => .1,
+		]
+	];
+
+	for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogPostsWithTag); $i++) {
+		$blogTagPath = str_replace(' ', '-', $blogTag['tag']);
+		$entryKey = "/tag/{$blogTagPath}/{$i}/";
+		$entryArray += [
+			$entryKey => [
+				'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'),
+				'changefreq' => 'daily',
+				'priority' => .1,
+			]
+		];
+	}
 }
 
 $reversedBlogPosts = array_reverse($activeBlogPosts);
 foreach ($reversedBlogPosts as $blogPost) {
-    $entryKey = "/{$blogPost['category']}/{$blogPost['path']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($blogPost['date']))->format('Y-m-d'), // todo this should be based on comment
-            'changefreq' => 'weekly',
-            'priority' => .8,
-        ],
-    ];
+	$entryKey = "/{$blogPost['category']}/{$blogPost['path']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($blogPost['date']))->format('Y-m-d'), // todo this should be based on comment
+			'changefreq' => 'weekly',
+			'priority' => .8,
+		],
+	];
 }
 
 $entryArray += [
-    '/about/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'monthly',
-        'priority' => .2,
-    ]
+	'/about/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'monthly',
+		'priority' => .2,
+	]
 ];
 
 $buildSitemap($entryArray, 'http://blog.jacobemerick.com', 'blog');
@@ -184,21 +184,21 @@ 
 $mostRecentPost = current($mostRecentPost);
 
 $entryArray = [
-    '/' => [
-        'lastmod' => (new DateTime($mostRecentPost['date']))->format('Y-m-d'),
-        'changefreq' => 'daily',
-        'priority' => 1,
-    ],
-    '/about/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'monthly',
-        'priority' => .4,
-    ],
-    '/contact/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'monthly',
-        'priority' => .3,
-    ],
+	'/' => [
+		'lastmod' => (new DateTime($mostRecentPost['date']))->format('Y-m-d'),
+		'changefreq' => 'daily',
+		'priority' => 1,
+	],
+	'/about/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'monthly',
+		'priority' => .4,
+	],
+	'/contact/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'monthly',
+		'priority' => .3,
+	],
 ];
 
 $buildSitemap($entryArray, 'http://home.jacobemerick.com', 'home');
@@ -208,12 +208,12 @@ 
  * lifestream.jacobemerick.com
  *********************************************/
 $reduceToMostRecentStreamActivity = function ($recentActivity, $activity) {
-    if (is_null($recentActivity)) {
-        return $activity;
-    }
-    $activityDate = new DateTime($activity['datetime']);
-    $recentActivityDate = new DateTime($recentActivity['datetime']);
-    return ($activityDate > $recentActivityDate) ? $activity: $recentActivity;
+	if (is_null($recentActivity)) {
+		return $activity;
+	}
+	$activityDate = new DateTime($activity['datetime']);
+	$recentActivityDate = new DateTime($recentActivity['datetime']);
+	return ($activityDate > $recentActivityDate) ? $activity: $recentActivity;
 };
 
 $streamActivitiesPerPage = 15;
@@ -223,78 +223,78 @@ 
 $mostRecentStreamActivity = array_reduce($streamActivities, $reduceToMostRecentStreamActivity);
 
 $entryArray = [
-    '/' => [
-        'lastmod' => (new DateTime($mostRecentStreamActivity['datetime']))->format('c'),
-        'changefreq' => 'hourly',
-        'priority' => .9,
-    ]
+	'/' => [
+		'lastmod' => (new DateTime($mostRecentStreamActivity['datetime']))->format('c'),
+		'changefreq' => 'hourly',
+		'priority' => .9,
+	]
 ];
 for ($i = 2; (($i - 1) * $streamActivitiesPerPage) < count($streamActivities); $i++) {
-    $entryKey = "/page/{$i}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($mostRecentStreamActivity['datetime']))->format('c'),
-            'changefreq' => 'hourly',
-            'priority' => .1,
-        ]
-    ];
+	$entryKey = "/page/{$i}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($mostRecentStreamActivity['datetime']))->format('c'),
+			'changefreq' => 'hourly',
+			'priority' => .1,
+		]
+	];
 }
 
 $streamTypeArray = [
-    'blog',
-    'books',
-    'distance',
-    'github',
-    'hulu',
-    'twitter',
-    'youtube',
+	'blog',
+	'books',
+	'distance',
+	'github',
+	'hulu',
+	'twitter',
+	'youtube',
 ];
 
 foreach ($streamTypeArray as $streamType) {
-    $streamTypeActivities = array_filter($streamActivities, function ($post) use ($streamType) {
-        return $post['type'] == $streamType;
-    });
-    $mostRecentStreamTypeActivity = array_reduce($streamTypeActivities, $reduceToMostRecentStreamActivity);
-
-    $entryKey = "/{$streamType}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($mostRecentStreamTypeActivity['datetime']))->format('c'),
-            'changefreq' => 'hourly',
-            'priority' => .3,
-        ]
-    ];
-
-    for ($i = 2; (($i - 1) * $streamActivitiesPerPage) < count($streamTypeActivities); $i++) {
-        $entryKey = "/{$streamType}/page/{$i}/";
-        $entryArray += [
-            $entryKey => [
-                'lastmod' => (new DateTime($mostRecentStreamTypeActivity['datetime']))->format('c'),
-                'changefreq' => 'hourly',
-                'priority' => .1,
-            ]
-        ];
-    }
+	$streamTypeActivities = array_filter($streamActivities, function ($post) use ($streamType) {
+		return $post['type'] == $streamType;
+	});
+	$mostRecentStreamTypeActivity = array_reduce($streamTypeActivities, $reduceToMostRecentStreamActivity);
+
+	$entryKey = "/{$streamType}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($mostRecentStreamTypeActivity['datetime']))->format('c'),
+			'changefreq' => 'hourly',
+			'priority' => .3,
+		]
+	];
+
+	for ($i = 2; (($i - 1) * $streamActivitiesPerPage) < count($streamTypeActivities); $i++) {
+		$entryKey = "/{$streamType}/page/{$i}/";
+		$entryArray += [
+			$entryKey => [
+				'lastmod' => (new DateTime($mostRecentStreamTypeActivity['datetime']))->format('c'),
+				'changefreq' => 'hourly',
+				'priority' => .1,
+			]
+		];
+	}
 }
 
 $reversedStreamActivities = array_reverse($streamActivities);
 foreach ($reversedStreamActivities as $streamActivity) {
-    $entryKey = "/{$streamActivity['type']}/{$streamActivity['id']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($streamActivity['datetime']))->format('c'),
-            'changefreq' => 'never',
-            'priority' => .5,
-        ],
-    ];
+	$entryKey = "/{$streamActivity['type']}/{$streamActivity['id']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($streamActivity['datetime']))->format('c'),
+			'changefreq' => 'never',
+			'priority' => .5,
+		],
+	];
 }
 
 $entryArray += [
-    '/about/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'monthly',
-        'priority' => .7,
-    ]
+	'/about/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'monthly',
+		'priority' => .7,
+	]
 ];
 
 $buildSitemap($entryArray, 'http://lifestream.jacobemerick.com', 'lifestream');
@@ -307,43 +307,43 @@ 
 $portfolioPieces = $portfolioRepository->getPieces();
 
 $entryArray = [
-    '/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'weekly',
-        'priority' => 1,
-    ],
-    '/print/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'never',
-        'priority' => .1,
-    ],
-    '/web/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'never',
-        'priority' => .1,
-    ],
-    '/contact/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'never',
-        'priority' => .4,
-    ],
-    '/resume/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'yearly',
-        'priority' => .9,
-    ],
+	'/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'weekly',
+		'priority' => 1,
+	],
+	'/print/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'never',
+		'priority' => .1,
+	],
+	'/web/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'never',
+		'priority' => .1,
+	],
+	'/contact/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'never',
+		'priority' => .4,
+	],
+	'/resume/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'yearly',
+		'priority' => .9,
+	],
 ];
 
 foreach ($portfolioPieces as $portfolioPiece) {
-    $portfolioCategory = ($portfolioPiece['category'] == 1) ? 'web' : 'print';
-    $entryKey = "/{$portfolioCategory}/{$portfolioPiece['title_url']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-            'changefreq' => 'never',
-            'priority' => .7,
-        ],
-    ];
+	$portfolioCategory = ($portfolioPiece['category'] == 1) ? 'web' : 'print';
+	$entryKey = "/{$portfolioCategory}/{$portfolioPiece['title_url']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+			'changefreq' => 'never',
+			'priority' => .7,
+		],
+	];
 }
 
 $buildSitemap($entryArray, 'http://portfolio.jacobemerick.com', 'portfolio');
@@ -357,26 +357,26 @@ 
 $mostRecentChange = current($mostRecentChange);
 
 $entryArray = [
-    '/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'weekly',
-        'priority' => 1,
-    ],
-    '/terms/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'weekly',
-        'priority' => .3,
-    ],
-    '/change-log/' => [
-        'lastmod' => (new DateTime($mostRecentChange['datetime']))->format('c'),
-        'changefreq' => 'daily',
-        'priority' => .1,
-    ],
-    '/contact/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'weekly',
-        'priority' => .6,
-    ],
+	'/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'weekly',
+		'priority' => 1,
+	],
+	'/terms/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'weekly',
+		'priority' => .3,
+	],
+	'/change-log/' => [
+		'lastmod' => (new DateTime($mostRecentChange['datetime']))->format('c'),
+		'changefreq' => 'daily',
+		'priority' => .1,
+	],
+	'/contact/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'weekly',
+		'priority' => .6,
+	],
 ];
 
 $buildSitemap($entryArray, 'http://site.jacobemerick.com', 'site');
@@ -386,108 +386,108 @@ 
  * www.waterfallofthekeweenaw.com
  *********************************************/
 $reduceToMostRecentJournalLog = function ($recentLog, $log) {
-    if (is_null($recentLog)) {
-        return $log;
-    }
-    $logDate = new DateTime($log['publish_date']);
-    $recentLogDate = new DateTime($recentLog['publish_date']);
-    return ($logDate > $recentLogDate) ? log: $recentLog;
+	if (is_null($recentLog)) {
+		return $log;
+	}
+	$logDate = new DateTime($log['publish_date']);
+	$recentLogDate = new DateTime($recentLog['publish_date']);
+	return ($logDate > $recentLogDate) ? log: $recentLog;
 };
 
 $waterfallRepository = new WaterfallRepository($container['db_connection_locator']);
 $waterfallList = $waterfallRepository->getWaterfalls();
 
 $entryArray = [
-    '/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'daily',
-        'priority' => 1,
-    ],
-    '/falls/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'weekly',
-        'priority' => .3,
-    ],
+	'/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'daily',
+		'priority' => 1,
+	],
+	'/falls/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'weekly',
+		'priority' => .3,
+	],
 ];
 
 for ($i = 2; (($i - 1) * 24) < count($waterfallList); $i++) {
-    $entryKey = "/falls/{$i}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-            'changefreq' => 'weekly',
-            'priority' => .1,
-        ]
-    ];
+	$entryKey = "/falls/{$i}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+			'changefreq' => 'weekly',
+			'priority' => .1,
+		]
+	];
 }
 
 $waterfallCountyRepository = new WaterfallCountyRepository($container['db_connection_locator']);
 $waterfallCountyList = $waterfallCountyRepository->getCountyList();
 
 foreach ($waterfallCountyList as $waterfallCounty) {
-    $entryKey = "/{$waterfallCounty['alias']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-            'changefreq' => 'monthly',
-            'priority' => .6
-        ]
-    ];
-
-    for ($i = 2; (($i - 1) * 12) < $waterfallCounty['count']; $i++) {
-        $entryKey = "/{$waterfallCounty['alias']}/{$i}/";
-        $entryArray += [
-            $entryKey => [
-                'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-                'changefreq' => 'monthly',
-                'priority' => .1
-            ]
-        ];
-    }
+	$entryKey = "/{$waterfallCounty['alias']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+			'changefreq' => 'monthly',
+			'priority' => .6
+		]
+	];
+
+	for ($i = 2; (($i - 1) * 12) < $waterfallCounty['count']; $i++) {
+		$entryKey = "/{$waterfallCounty['alias']}/{$i}/";
+		$entryArray += [
+			$entryKey => [
+				'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+				'changefreq' => 'monthly',
+				'priority' => .1
+			]
+		];
+	}
 }
 
 $waterfallWatercourseRepository = new WaterfallWatercourseRepository($container['db_connection_locator']);
 $waterfallWatercourseList = $waterfallWatercourseRepository->getWatercourseList();
 
 foreach ($waterfallWatercourseList as $waterfallWatercourse) {
-    $entryKey = "/{$waterfallWatercourse['alias']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-            'changefreq' => 'monthly',
-            'priority' => .6
-        ]
-    ];
-
-    for ($i = 2; (($i - 1) * 12) < $waterfallWatercourse['count']; $i++) {
-        $entryKey = "/{$waterfallWatercourse['alias']}/{$i}/";
-        $entryArray += [
-            $entryKey => [
-                'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-                'changefreq' => 'monthly',
-                'priority' => .1
-            ]
-        ];
-    }
+	$entryKey = "/{$waterfallWatercourse['alias']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+			'changefreq' => 'monthly',
+			'priority' => .6
+		]
+	];
+
+	for ($i = 2; (($i - 1) * 12) < $waterfallWatercourse['count']; $i++) {
+		$entryKey = "/{$waterfallWatercourse['alias']}/{$i}/";
+		$entryArray += [
+			$entryKey => [
+				'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+				'changefreq' => 'monthly',
+				'priority' => .1
+			]
+		];
+	}
 }
 
 foreach ($waterfallList as $waterfall) {
-    $entryKey = "/{$waterfall['watercourse_alias']}/{$waterfall['alias']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-            'changefreq' => 'weekly',
-            'priority' => .8,
-        ],
-    ];
+	$entryKey = "/{$waterfall['watercourse_alias']}/{$waterfall['alias']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+			'changefreq' => 'weekly',
+			'priority' => .8,
+		],
+	];
 }
 
 $entryArray += [
-    '/map/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'monthly',
-        'priority' => .6,
-    ]
+	'/map/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'monthly',
+		'priority' => .6,
+	]
 ];
 
 $waterfallLogRepository = new WaterfallLogRepository($container['db_connection_locator']);
@@ -496,91 +496,91 @@ 
 $mostRecentWaterfallLog = array_reduce($activeWaterfallLogs, $reduceToMostRecentJournalLog);
 
 $entryArray += [
-    '/journal/' => [
-        'lastmod' => (new DateTime($mostRecentWaterfallLog['publish_date']))->format('c'),
-        'changefreq' => 'weekly',
-        'priority' => .3,
-    ],
+	'/journal/' => [
+		'lastmod' => (new DateTime($mostRecentWaterfallLog['publish_date']))->format('c'),
+		'changefreq' => 'weekly',
+		'priority' => .3,
+	],
 ];
 
 for ($i = 2; (($i - 1) * 10) < count($activeWaterfallLogs); $i++) {
-    $entryKey = "/journal/{$i}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($mostRecentWaterfallLog['publish_date']))->format('c'),
-            'changefreq' => 'weekly',
-            'priority' => .1,
-        ]
-    ];
+	$entryKey = "/journal/{$i}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($mostRecentWaterfallLog['publish_date']))->format('c'),
+			'changefreq' => 'weekly',
+			'priority' => .1,
+		]
+	];
 }
 
 $waterfallCompanionRepository = new WaterfallCompanionRepository($container['db_connection_locator']);
 $waterfallCompanionList = $waterfallCompanionRepository->getCompanionList();
 
 foreach ($waterfallCompanionList as $waterfallCompanion) {
-    $entryKey = "/companion/{$waterfallCompanion['alias']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), // todo based on log
-            'changefreq' => 'monthly',
-            'priority' => .2
-        ]
-    ];
-
-    for ($i = 2; (($i - 1) * 10) < $waterfallCompanion['count']; $i++) {
-        $entryKey = "/companion/{$waterfallCompanion['alias']}/{$i}/";
-        $entryArray += [
-            $entryKey => [
-                'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-                'changefreq' => 'monthly',
-                'priority' => .1
-            ]
-        ];
-    }
+	$entryKey = "/companion/{$waterfallCompanion['alias']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), // todo based on log
+			'changefreq' => 'monthly',
+			'priority' => .2
+		]
+	];
+
+	for ($i = 2; (($i - 1) * 10) < $waterfallCompanion['count']; $i++) {
+		$entryKey = "/companion/{$waterfallCompanion['alias']}/{$i}/";
+		$entryArray += [
+			$entryKey => [
+				'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+				'changefreq' => 'monthly',
+				'priority' => .1
+			]
+		];
+	}
 }
 
 $waterfallPeriodRepository = new WaterfallPeriodRepository($container['db_connection_locator']);
 $waterfallPeriodList = $waterfallPeriodRepository->getPeriodList();
 
 foreach ($waterfallPeriodList as $waterfallPeriod) {
-    $entryKey = "/period/{$waterfallPeriod['alias']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), // todo based on log
-            'changefreq' => 'monthly',
-            'priority' => .2
-        ]
-    ];
-
-    for ($i = 2; (($i - 1) * 10) < $waterfallPeriod['count']; $i++) {
-        $entryKey = "/period/{$waterfallPeriod['alias']}/{$i}/";
-        $entryArray += [
-            $entryKey => [
-                'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-                'changefreq' => 'monthly',
-                'priority' => .1
-            ]
-        ];
-    }
+	$entryKey = "/period/{$waterfallPeriod['alias']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), // todo based on log
+			'changefreq' => 'monthly',
+			'priority' => .2
+		]
+	];
+
+	for ($i = 2; (($i - 1) * 10) < $waterfallPeriod['count']; $i++) {
+		$entryKey = "/period/{$waterfallPeriod['alias']}/{$i}/";
+		$entryArray += [
+			$entryKey => [
+				'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+				'changefreq' => 'monthly',
+				'priority' => .1
+			]
+		];
+	}
 }
 
 foreach ($activeWaterfallLogs as $waterfallLog) {
-    $entryKey = "/journal/{$waterfallLog['alias']}/";
-    $entryArray += [
-        $entryKey => [
-            'lastmod' => (new DateTime($waterfallLog['publish_date']))->format('c'),
-            'changefreq' => 'weekly',
-            'priority' => .4,
-        ],
-    ];
+	$entryKey = "/journal/{$waterfallLog['alias']}/";
+	$entryArray += [
+		$entryKey => [
+			'lastmod' => (new DateTime($waterfallLog['publish_date']))->format('c'),
+			'changefreq' => 'weekly',
+			'priority' => .4,
+		],
+	];
 }
 
 $entryArray += [
-    '/about/' => [
-        'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
-        'changefreq' => 'monthly',
-        'priority' => .6,
-    ]
+	'/about/' => [
+		'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'),
+		'changefreq' => 'monthly',
+		'priority' => .6,
+	]
 ];
 
 $buildSitemap($entryArray, 'http://www.waterfallsofthekeweenaw.com', 'waterfalls');

utility/Loader.class.inc.php

Doc Comments +6 added lines

@@ -59,6 +59,9 @@ 
 		$this->add_posts($youtube_result, 'youtube');

 	}

 

+	/**
+	 * @param string $type
+	 */
 	private function remove_existing($result, $type)

 	{

 		foreach($result as $key => $row)

@@ -70,6 +73,9 @@ 
 		return $result;

 	}

 

+	/**
+	 * @param string $type
+	 */
 	private function add_posts($result, $type)

 	{

 		foreach($result as $row)

Spacing +8 added lines, -8 removed lines

@@ -17,14 +17,14 @@ 
 
 	public static function instance()
 	{
-		if(!isset(self::$instance))
+		if (!isset(self::$instance))
 			self::$instance = new Loader();
 		return self::$instance;
 	}
 
 	private function get_root()
 	{
-		if(!isset($this->root))
+		if (!isset($this->root))
 		{
 			$current_directory = dirname(__FILE__);
 			$current_directory = substr($current_directory, 0, -7);
@@ -52,7 +52,7 @@ 
 
 	private static function get_extension($type)
 	{
-		switch($type)
+		switch ($type)
 		{
 			case 'collector' :
 			case 'controller' :
@@ -104,10 +104,10 @@ 
 
 	public static function load($type, $files, $data = array())
 	{
-		foreach((array) $files as $file)
+		foreach ((array) $files as $file)
 		{
 			$file_path = self::instance()->get_path($type, $file);
-			if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
+			if (in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
 				continue;
 			
 			// if(!file_exists($file_path))
@@ -115,7 +115,7 @@ 
 			
 			self::instance()->add_included_file($file_path);
 			
-			switch($type)
+			switch ($type)
 			{
 				case 'images' :
 				case 'scripts' :
@@ -145,7 +145,7 @@ 
 		
 		$reflectionObject = self::create_reflection_class($file);
 		
-		if(
+		if (
 			$reflectionObject->hasMethod('instance') &&
 			$reflectionObject->getMethod('instance')->isStatic())
 		{
@@ -160,7 +160,7 @@ 
 		
 		$reflectionObject = self::create_reflection_class($file);
 		
-		if($reflectionObject->hasMethod('__construct'))
+		if ($reflectionObject->hasMethod('__construct'))
 			return $reflectionObject->newInstanceArgs($data);
 		else
 			return $reflectionObject->newInstance();

Braces +11 added lines, -8 removed lines

@@ -17,8 +17,9 @@ 
 
 	public static function instance()
 	{
-		if(!isset(self::$instance))
-			self::$instance = new Loader();
+		if(!isset(self::$instance)) {

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

+		}

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

+							continue;

+			}

 			
 			// if(!file_exists($file_path))
 			// 	Debugger::logMessage("Requested file does not exist: {$type}, {$file}");
@@ -160,10 +162,11 @@ 
 		
 		$reflectionObject = self::create_reflection_class($file);
 		
-		if($reflectionObject->hasMethod('__construct'))
-			return $reflectionObject->newInstanceArgs($data);
-		else
-			return $reflectionObject->newInstance();
+		if($reflectionObject->hasMethod('__construct')) {

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

+		} else {

+					return $reflectionObject->newInstance();

+		}

 	}
 
 	public static function getRoot()

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 '/';
+	}
 
 }

router/AJAXRouter.class.inc.php

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 			(object) array(
 				'match' => '/get/portfolioImage.json',
 				'controller' => 'GetPortfolioImageController'),
-    );
+	);
 	}
 
 }

public/index.php

Indentation +24 added lines, -24 removed lines

@@ -22,28 +22,28 @@
 
 // sets up shutdown function to display profiler
 register_shutdown_function(function () use ($container) {
-    if (
-        !isset($_COOKIE['debugger']) ||
-        $_COOKIE['debugger'] != 'display'
-    ) {
-        return;
-    }
-
-    $dbProfiles = $container['db_connection_locator']
-        ->getRead()
-        ->getProfiler()
-        ->getProfiles();
-    $dbProfiles = array_filter($dbProfiles, function ($profile) {
-        return $profile['function'] == 'perform';
-    });
-    $dbProfiles = array_map(function ($profile) {
-        return [
-            'sql' => trim(preg_replace('/\s+/', ' ', $profile['statement'])),
-            'parameters' => $profile['bind_values'],
-            'time' => $profile['duration'],
-        ];
-    }, $dbProfiles);
-    $container['profiler']->setProfiledQueries($dbProfiles);
-    $container['profiler']->setDisplay(new Particletree\Pqp\Display());
-    $container['profiler']->display($container['db_connection_locator']->getRead());
+	if (
+		!isset($_COOKIE['debugger']) ||
+		$_COOKIE['debugger'] != 'display'
+	) {
+		return;
+	}
+
+	$dbProfiles = $container['db_connection_locator']
+		->getRead()
+		->getProfiler()
+		->getProfiles();
+	$dbProfiles = array_filter($dbProfiles, function ($profile) {
+		return $profile['function'] == 'perform';
+	});
+	$dbProfiles = array_map(function ($profile) {
+		return [
+			'sql' => trim(preg_replace('/\s+/', ' ', $profile['statement'])),
+			'parameters' => $profile['bind_values'],
+			'time' => $profile['duration'],
+		];
+	}, $dbProfiles);
+	$container['profiler']->setProfiledQueries($dbProfiles);
+	$container['profiler']->setDisplay(new Particletree\Pqp\Display());
+	$container['profiler']->display($container['db_connection_locator']->getRead());
 });

Spacing +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
 
 
 // sets up shutdown function to display profiler
-register_shutdown_function(function () use ($container) {
+register_shutdown_function(function() use ($container) {
     if (
         !isset($_COOKIE['debugger']) ||
         $_COOKIE['debugger'] != 'display'
@@ -33,10 +33,10 @@ 
         ->getRead()
         ->getProfiler()
         ->getProfiles();
-    $dbProfiles = array_filter($dbProfiles, function ($profile) {
+    $dbProfiles = array_filter($dbProfiles, function($profile) {
         return $profile['function'] == 'perform';
     });
-    $dbProfiles = array_map(function ($profile) {
+    $dbProfiles = array_map(function($profile) {
         return [
             'sql' => trim(preg_replace('/\s+/', ' ', $profile['statement'])),
             'parameters' => $profile['bind_values'],

bootstrap.php

Spacing +6 added lines, -6 removed lines

@@ -25,14 +25,14 @@ 
 
 // timezones are fun
 date_default_timezone_set('America/Phoenix'); // todo - belongs in configuration
-$container['default_timezone'] = function ($c) {
+$container['default_timezone'] = function($c) {
     return new DateTimeZone('America/Phoenix');
 };
 
 
 // configure the db connections holder
 $db_connections = new Aura\Sql\ConnectionLocator();
-$db_connections->setDefault(function () use ($config) {
+$db_connections->setDefault(function() use ($config) {
     $connection = $config->database->slave;
     return new Aura\Sql\ExtendedPdo(
         "mysql:host={$connection->host}",
@@ -40,7 +40,7 @@ 
         $connection->password
     );
 });
-$db_connections->setWrite('master', function () use ($config) {
+$db_connections->setWrite('master', function() use ($config) {
     $connection = $config->database->master;
     return new Aura\Sql\ExtendedPdo(
         "mysql:host={$connection->host}",
@@ -48,7 +48,7 @@ 
         $connection->password
     );
 });
-$db_connections->setRead('slave', function () use ($config) {
+$db_connections->setRead('slave', function() use ($config) {
     $connection = $config->database->slave;
     $pdo = new Aura\Sql\ExtendedPdo(
         "mysql:host={$connection->host}",
@@ -66,13 +66,13 @@ 
 
 
 // setup mail handler
-$container['mail'] = $container->factory(function ($c) {
+$container['mail'] = $container->factory(function($c) {
     return new Jacobemerick\Archangel\Archangel();
 });
 
 
 // setup the logger
-$container['setup_logger'] = $container->protect(function ($name) use ($container) {
+$container['setup_logger'] = $container->protect(function($name) use ($container) {
     $logger = new Monolog\Logger($name);
 
     $logPath = __DIR__ . "/../logs/{$name}.log";

Indentation +37 added lines, -37 removed lines

@@ -10,7 +10,7 @@ 
 
 $handle = @fopen($config_path, 'r');
 if ($handle === false) {
-    throw new RuntimeException("Could not load config");
+	throw new RuntimeException("Could not load config");
 }
 $config = fread($handle, filesize($config_path));
 fclose($handle);
@@ -18,7 +18,7 @@ 
 $config = json_decode($config);
 $last_json_error = json_last_error();
 if ($last_json_error !== JSON_ERROR_NONE) {
-    throw new RuntimeException("Could not parse config - JSON error detected");
+	throw new RuntimeException("Could not parse config - JSON error detected");
 }
 $container['config'] = $config;
 
@@ -26,64 +26,64 @@ 
 // timezones are fun
 date_default_timezone_set('America/Phoenix'); // todo - belongs in configuration
 $container['default_timezone'] = function ($c) {
-    return new DateTimeZone('America/Phoenix');
+	return new DateTimeZone('America/Phoenix');
 };
 
 
 // configure the db connections holder
 $db_connections = new Aura\Sql\ConnectionLocator();
 $db_connections->setDefault(function () use ($config) {
-    $connection = $config->database->slave;
-    return new Aura\Sql\ExtendedPdo(
-        "mysql:host={$connection->host}",
-        $connection->user,
-        $connection->password
-    );
+	$connection = $config->database->slave;
+	return new Aura\Sql\ExtendedPdo(
+		"mysql:host={$connection->host}",
+		$connection->user,
+		$connection->password
+	);
 });
 $db_connections->setWrite('master', function () use ($config) {
-    $connection = $config->database->master;
-    return new Aura\Sql\ExtendedPdo(
-        "mysql:host={$connection->host}",
-        $connection->user,
-        $connection->password
-    );
+	$connection = $config->database->master;
+	return new Aura\Sql\ExtendedPdo(
+		"mysql:host={$connection->host}",
+		$connection->user,
+		$connection->password
+	);
 });
 $db_connections->setRead('slave', function () use ($config) {
-    $connection = $config->database->slave;
-    $pdo = new Aura\Sql\ExtendedPdo(
-        "mysql:host={$connection->host}",
-        $connection->user,
-        $connection->password
-    );
-
-    $profiler = new Aura\Sql\Profiler();
-    $profiler->setActive(true);
-    $pdo->setProfiler($profiler);
-
-    return $pdo;
+	$connection = $config->database->slave;
+	$pdo = new Aura\Sql\ExtendedPdo(
+		"mysql:host={$connection->host}",
+		$connection->user,
+		$connection->password
+	);
+
+	$profiler = new Aura\Sql\Profiler();
+	$profiler->setActive(true);
+	$pdo->setProfiler($profiler);
+
+	return $pdo;
 });
 $container['db_connection_locator'] = $db_connections;
 
 
 // setup mail handler
 $container['mail'] = $container->factory(function ($c) {
-    return (new Jacobemerick\Archangel\Archangel())->setLogger($c['logger']);
+	return (new Jacobemerick\Archangel\Archangel())->setLogger($c['logger']);
 });
 
 
 // setup the logger
 $container['setup_logger'] = $container->protect(function ($name) use ($container) {
-    $logger = new Monolog\Logger($name);
+	$logger = new Monolog\Logger($name);
 
-    $logPath = __DIR__ . "/../logs/{$name}.log";
-    $streamHandler = new Monolog\Handler\StreamHandler($logPath, Monolog\Logger::INFO);
-    $streamHandler->setFormatter(
-        new Monolog\Formatter\LineFormatter("[%datetime%] %channel%.%level_name%: %message%\n")
-    );
-    $logger->pushHandler($streamHandler);
+	$logPath = __DIR__ . "/../logs/{$name}.log";
+	$streamHandler = new Monolog\Handler\StreamHandler($logPath, Monolog\Logger::INFO);
+	$streamHandler->setFormatter(
+		new Monolog\Formatter\LineFormatter("[%datetime%] %channel%.%level_name%: %message%\n")
+	);
+	$logger->pushHandler($streamHandler);
 
-    Monolog\ErrorHandler::register($logger);
-    $container['logger'] = $logger;
+	Monolog\ErrorHandler::register($logger);
+	$container['logger'] = $logger;
 });