Inspection of "Feature/monolog pqp handler" - jacobemerick/web - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#2)

by Jacob

created 2016-01-15 11:27 UTC

Status

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

@@ -8,85 +8,85 @@
 block discarded – undo
 class MysqlBlogRepository implements BlogRepositoryInterface
 {
 
-    /** @var  ConnectionLocator */
-    protected $connections;
+	/** @var  ConnectionLocator */
+	protected $connections;
 
-    /**
-     * @param ConnectonLocator $connections
-     */
-    public function __construct(ConnectionLocator $connections)
-    {
-        $this->connections = $connections;
-    }
+	/**
+	 * @param ConnectonLocator $connections
+	 */
+	public function __construct(ConnectionLocator $connections)
+	{
+		$this->connections = $connections;
+	}
 
-    public function getBlogByPermalink($permalink)
-    {
-        $query = "
+	public function getBlogByPermalink($permalink)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`blog2`
             WHERE `permalink` = :permalink
             LIMIT 1";
-        $bindings = [
-            'permalink' => $permalink,
-        ];
+		$bindings = [
+			'permalink' => $permalink,
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchOne($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchOne($query, $bindings);
+	}
 
-    public function getBlogs($limit = null, $offset = 0)
-    {
-        $query = "
+	public function getBlogs($limit = null, $offset = 0)
+	{
+		$query = "
             SELECT `id`, `permalink`, `datetime`
             FROM `jpemeric_stream`.`blog2`
             ORDER BY `datetime` DESC";
-        if (!is_null($limit)) {
-            $query .= "
+		if (!is_null($limit)) {
+			$query .= "
             LIMIT {$limit}, {$offset}";
-        }
+		}
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query);
+	}
 
-    public function getBlogsUpdatedSince(DateTime $datetime)
-    {
-        $query = "
+	public function getBlogsUpdatedSince(DateTime $datetime)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`blog2`
             WHERE `updated_at` >= :last_update";
 
-        $bindings = [
-            'last_update' => $datetime->format('Y-m-d H:i:s'),
-        ];
+		$bindings = [
+			'last_update' => $datetime->format('Y-m-d H:i:s'),
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query, $bindings);
+	}
 
-    public function insertBlog($permalink, DateTime $datetime, array $metadata)
-    {
-        $query = "
+	public function insertBlog($permalink, DateTime $datetime, array $metadata)
+	{
+		$query = "
             INSERT INTO `jpemeric_stream`.`blog2`
                 (`permalink`, `datetime`, `metadata`)
             VALUES
                 (:permalink, :datetime, :metadata)";
 
-        $bindings = [
-            'permalink' => $permalink,
-            'datetime' => $datetime->format('Y-m-d H:i:s'),
-            'metadata' => json_encode($metadata),
-        ];
+		$bindings = [
+			'permalink' => $permalink,
+			'datetime' => $datetime->format('Y-m-d H:i:s'),
+			'metadata' => json_encode($metadata),
+		];
 
-        return $this
-            ->connections
-            ->getWrite()
-            ->perform($query, $bindings);
-    }
+		return $this
+			->connections
+			->getWrite()
+			->perform($query, $bindings);
+	}
 }

Please login to merge, or discard this patch.

src/Domain/Stream/Twitter/MysqlTwitterRepository.php 1 patch

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

@@ -8,87 +8,87 @@
 block discarded – undo
 class MysqlTwitterRepository implements TwitterRepositoryInterface
 {
 
-    /** @var  ConnectionLocator */
-    protected $connections;
-
-    /**
-     * @param ConnectonLocator $connections
-     */
-    public function __construct(ConnectionLocator $connections)
-    {
-        $this->connections = $connections;
-    }
-
-    public function getTwitterByTweetId($tweetId)
-    {
-        $query = "
+	/** @var  ConnectionLocator */
+	protected $connections;
+
+	/**
+	 * @param ConnectonLocator $connections
+	 */
+	public function __construct(ConnectionLocator $connections)
+	{
+		$this->connections = $connections;
+	}
+
+	public function getTwitterByTweetId($tweetId)
+	{
+		$query = "
             SELECT `id`, `tweet_id`, `datetime`, `metadata`
             FROM `jpemeric_stream`.`twitter2`
             WHERE `tweet_id` = :tweet_id
             LIMIT 1";
 
-        $bindings = [
-            'tweet_id' => $tweetId,
-        ];
+		$bindings = [
+			'tweet_id' => $tweetId,
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchOne($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchOne($query, $bindings);
+	}
 
-    public function getTwittersUpdatedSince(DateTime $datetime)
-    {
-        $query = "
+	public function getTwittersUpdatedSince(DateTime $datetime)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`twitter2`
             WHERE `updated_at` >= :last_update";
 
-        $bindings = [
-            'last_update' => $datetime->format('Y-m-d H:i:s'),
-        ];
+		$bindings = [
+			'last_update' => $datetime->format('Y-m-d H:i:s'),
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query, $bindings);
+	}
 
-    public function insertTweet($tweetId, DateTime $datetime, array $metadata)
-    {
-        $query = "
+	public function insertTweet($tweetId, DateTime $datetime, array $metadata)
+	{
+		$query = "
             INSERT INTO `jpemeric_stream`.`twitter2`
                 (`tweet_id`, `datetime`, `metadata`)
             VALUES
                 (:tweet_id, :datetime, :metadata)";
 
-        $bindings = [
-            'tweet_id' => $tweetId,
-            'datetime' => $datetime->format('Y-m-d H:i:s'),
-            'metadata' => json_encode($metadata),
-        ];
-
-        return $this
-            ->connections
-            ->getWrite()
-            ->perform($query, $bindings);
-    }
-
-    public function updateTweetMetadata($tweetId, array $metadata)
-    {
-        $query = "
+		$bindings = [
+			'tweet_id' => $tweetId,
+			'datetime' => $datetime->format('Y-m-d H:i:s'),
+			'metadata' => json_encode($metadata),
+		];
+
+		return $this
+			->connections
+			->getWrite()
+			->perform($query, $bindings);
+	}
+
+	public function updateTweetMetadata($tweetId, array $metadata)
+	{
+		$query = "
             UPDATE `jpemeric_stream`.`twitter2`
             SET `metadata` = :metadata
             WHERE `tweet_id` = :tweet_id";
 
-        $bindings = [
-            'metadata' => json_encode($metadata),
-            'tweet_id' => $tweetId,
-        ];
+		$bindings = [
+			'metadata' => json_encode($metadata),
+			'tweet_id' => $tweetId,
+		];
 
-        return $this
-            ->connections
-            ->getWrite()
-            ->perform($query, $bindings);
-    }
+		return $this
+			->connections
+			->getWrite()
+			->perform($query, $bindings);
+	}
 }

Please login to merge, or discard this patch.

src/Domain/Stream/YouTube/MysqlYouTubeRepository.php 1 patch

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

@@ -8,88 +8,88 @@
 block discarded – undo
 class MysqlYouTubeRepository implements YouTubeRepositoryInterface
 {
 
-    /** @var  ConnectionLocator */
-    protected $connections;
+	/** @var  ConnectionLocator */
+	protected $connections;
 
-    /**
-     * @param ConnectonLocator $connections
-     */
-    public function __construct(ConnectionLocator $connections)
-    {
-        $this->connections = $connections;
-    }
+	/**
+	 * @param ConnectonLocator $connections
+	 */
+	public function __construct(ConnectionLocator $connections)
+	{
+		$this->connections = $connections;
+	}
 
-    public function getYouTubes($limit = null, $offset = 0)
-    {
-        $query = "
+	public function getYouTubes($limit = null, $offset = 0)
+	{
+		$query = "
             SELECT `id`, `video_id`, `datetime`
             FROM `jpemeric_stream`.`youtube`
             ORDER BY `datetime` DESC";
-        if (!is_null($limit)) {
-            $query .= "
+		if (!is_null($limit)) {
+			$query .= "
             LIMIT {$offset}, {$limit}";
-        }
+		}
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query);
+	}
 
-    /**
-     * @param string $title
-     *
-     * @return array|false
-     */
-    public function getYouTubeByVideoId($videoId)
-    {
-        $query = "
+	/**
+	 * @param string $title
+	 *
+	 * @return array|false
+	 */
+	public function getYouTubeByVideoId($videoId)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`youtube`
             WHERE `video_id` = :video_id
             LIMIT 1";
-        $bindings = [
-            'video_id' => $videoId,
-        ];
+		$bindings = [
+			'video_id' => $videoId,
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchOne($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchOne($query, $bindings);
+	}
 
-    public function getYouTubesUpdatedSince(DateTime $datetime)
-    {
-        $query = "
+	public function getYouTubesUpdatedSince(DateTime $datetime)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`youtube`
             WHERE `updated_at` >= :last_update";
-        $bindings = [
-            'last_update' => $datetime->format('Y-m-d H:i:s'),
-        ];
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query, $bindings);
-    }
+		$bindings = [
+			'last_update' => $datetime->format('Y-m-d H:i:s'),
+		];
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query, $bindings);
+	}
 
-    public function insertVideo($videoId, DateTime $datetime, array $metadata)
-    {
-        $query = "
+	public function insertVideo($videoId, DateTime $datetime, array $metadata)
+	{
+		$query = "
             INSERT INTO `jpemeric_stream`.`youtube`
                 (`video_id`, `datetime`, `metadata`)
             VALUES
                 (:video_id, :datetime, :metadata)";
 
-        $bindings = [
-            'video_id' => $videoId,
-            'datetime' => $datetime->format('Y-m-d H:i:s'),
-            'metadata' => json_encode($metadata),
-        ];
+		$bindings = [
+			'video_id' => $videoId,
+			'datetime' => $datetime->format('Y-m-d H:i:s'),
+			'metadata' => json_encode($metadata),
+		];
 
-        return $this
-            ->connections
-            ->getWrite()
-            ->perform($query, $bindings);
-    }
+		return $this
+			->connections
+			->getWrite()
+			->perform($query, $bindings);
+	}
 }

Please login to merge, or discard this patch.

script/cron/generate-rss-feeds.php 1 patch

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

@@ -21,14 +21,14 @@  discard block
 block discarded – undo
  * @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 @@  discard block
 block discarded – undo
 $activeBlogPosts = $blogPostRepository->getActivePosts();
 
 foreach ($activeBlogPosts as $blogPost) {
-    $blogPostItem = new Item();
-
-    $blogPostItem->title($blogPost['title']);
-
-    $url = "http://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 = "http://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("http://blog.jacobemerick.com{$firstPhotoPath}", $firstPhotoSize, $firstPhotoType);
-    }
-
-    $blogPostItem->appendTo($blogPostChannel);
+	$blogPostItem = new Item();
+
+	$blogPostItem->title($blogPost['title']);
+
+	$url = "http://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 = "http://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("http://blog.jacobemerick.com{$firstPhotoPath}", $firstPhotoSize, $firstPhotoType);
+	}
+
+	$blogPostItem->appendTo($blogPostChannel);
 }
 
 $buildFeed($blogPostFeed, 'blog');
@@ -114,33 +114,33 @@  discard block
 block discarded – undo
 $activeBlogComments = $commentRepository->getActiveCommentsBySite('blog');
 
 foreach ($activeBlogComments as $blogComment) {
-    $blogCommentItem = new Item();
-
-    $blogCommentItem->title("Comment on '{$blogComment['title']}' from {$blogComment['name']}");
-
-    $url = "http://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 = "http://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');

Please login to merge, or discard this patch.

controller/blog/PostController.class.inc.php 1 patch

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

@@ -120,13 +120,13 @@
 block discarded – undo
 			
 			$post = new stdclass();
 
-      if (strpos($post_row->title, 'Rainy Supe Loop') === 0) {
-        $title = $post_row->title;
-        $title = explode(':', $title);
-        $title = array_pop($title);
-        $title = trim($title);
-        $post->title = $title;
-      } else if (strpos($post_row->title, 'Isle Royale') === 0) {
+	  if (strpos($post_row->title, 'Rainy Supe Loop') === 0) {
+		$title = $post_row->title;
+		$title = explode(':', $title);
+		$title = array_pop($title);
+		$title = trim($title);
+		$post->title = $title;
+	  } else if (strpos($post_row->title, 'Isle Royale') === 0) {
 				$title = $post_row->title;
 				$title = explode(',', $title);
 				$title = array_pop($title);

Please login to merge, or discard this patch.

controller/PageController.class.inc.php 1 patch

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

@@ -56,37 +56,37 @@  discard block
 block discarded – undo
 		return $domain_container;
 	}
 
-    protected function get_recent_activity()
-    {
-        global $container;
-        $activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']);
-        $post_result = $activityRepository->getActivities(5);
-
-        $post_array = array();
-        foreach($post_result as $row) {
-            array_push($post_array, $this->expand_post($row));
-        }
-
-        return $post_array;
-    }
-
-    protected function expand_post($raw_post, $format = 'short')
-    {
-        $post = [
-            'type' => $raw_post['type'],
-            'title' => ($format == 'short') ? $raw_post['message'] : $raw_post['message_long'],
-            'date' => $this->get_parsed_date($raw_post['datetime']),
-        ];
-
-        if ($format != 'short') {
-            $post['url'] = Loader::getRootUrl('lifestream') . "{$raw_post['type']}/{$raw_post['id']}/";
-
-            $metadata = json_decode($raw_post['metadata'], true);
-            $post = array_merge($post, $metadata);
-        }
-
-        return (object) $post;
-    }
+	protected function get_recent_activity()
+	{
+		global $container;
+		$activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']);
+		$post_result = $activityRepository->getActivities(5);
+
+		$post_array = array();
+		foreach($post_result as $row) {
+			array_push($post_array, $this->expand_post($row));
+		}
+
+		return $post_array;
+	}
+
+	protected function expand_post($raw_post, $format = 'short')
+	{
+		$post = [
+			'type' => $raw_post['type'],
+			'title' => ($format == 'short') ? $raw_post['message'] : $raw_post['message_long'],
+			'date' => $this->get_parsed_date($raw_post['datetime']),
+		];
+
+		if ($format != 'short') {
+			$post['url'] = Loader::getRootUrl('lifestream') . "{$raw_post['type']}/{$raw_post['id']}/";
+
+			$metadata = json_decode($raw_post['metadata'], true);
+			$post = array_merge($post, $metadata);
+		}
+
+		return (object) $post;
+	}
 
 	public function activate()
 	{
@@ -107,11 +107,11 @@  discard block
 block discarded – undo
 				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
 		}
         
-        if (URLDecode::getSite() == 'waterfalls') {
-            Loader::load('view', '/WaterfallFoot');
-        } else {
-            Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
-        }
+		if (URLDecode::getSite() == 'waterfalls') {
+			Loader::load('view', '/WaterfallFoot');
+		} else {
+			Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
+		}
 		
 		if($view == '/404' || $view == '/503')
 			exit;
@@ -169,19 +169,19 @@  discard block
 block discarded – undo
 
 	private function load_assets()
 	{
-    $css_array = array_map(function ($stylesheet) {
-      $path = "/css/{$stylesheet[0]}.css";
-      if ($stylesheet[1] > 1) {
-        $path .= "?v={$stylesheet[1]}";
-      }
-      return $path;
-    }, $this->css_array);
-    $js_array = array_map(function ($script) {
-      if (substr($script, 0, 4) == 'http') {
-        return $script;
-      }
-      return "/js/{$script}.min.js";
-    }, $this->js_array);
+	$css_array = array_map(function ($stylesheet) {
+	  $path = "/css/{$stylesheet[0]}.css";
+	  if ($stylesheet[1] > 1) {
+		$path .= "?v={$stylesheet[1]}";
+	  }
+	  return $path;
+	}, $this->css_array);
+	$js_array = array_map(function ($script) {
+	  if (substr($script, 0, 4) == 'http') {
+		return $script;
+	  }
+	  return "/js/{$script}.min.js";
+	}, $this->js_array);
 		
 		$this->set_head('css_link_array', $css_array);
 		$this->set_head('js_link_array', $js_array);

Please login to merge, or discard this patch.

controller/lifestream/TagController.class.inc.php 1 patch

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

@@ -57,9 +57,9 @@  discard block
 block discarded – undo
 			case 'distance' :
 				return 'Run, Jacob, and Hike';
 			break;
-      case 'github' :
-        return 'Jacob, Code Monkey';
-      break;
+	  case 'github' :
+		return 'Jacob, Code Monkey';
+	  break;
 			case 'hulu' :
 				return 'Jacob watches Hulu';
 			break;
@@ -85,9 +85,9 @@  discard block
 block discarded – undo
 			case 'distance' :
 				return 'All the cool kids like to be in shape. Jacob goes running and hiking.';
 			break;
-      case 'github' :
-        return 'Since he is trying to be a developer, Jacob codes. Here is some code that he pushed around on the Githubs.';
-      break;
+	  case 'github' :
+		return 'Since he is trying to be a developer, Jacob codes. Here is some code that he pushed around on the Githubs.';
+	  break;
 			case 'hulu' :
 				return 'Occasionally Jacob chills and watches some Hulu. Well, used to, anyways.';
 			break;

Please login to merge, or discard this patch.

controller/lifestream/PostController.class.inc.php 1 patch

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

@@ -70,9 +70,9 @@  discard block
 block discarded – undo
 			case 'distance' :
 				return 'Jacob ran xor hiked';
 			break;
-      case 'github' :
-        return 'Jacob did code';
-      break;
+	  case 'github' :
+		return 'Jacob did code';
+	  break;
 			case 'hulu' :
 				return 'What Jacob watched';
 			break;
@@ -98,9 +98,9 @@  discard block
 block discarded – undo
 			case 'distance' :
 				return 'Well, it might have been both at the same time if there was a bear.';
 			break;
-      case 'github' :
-        return 'An epic code change by Jacob on the Githubs.';
-      break;
+	  case 'github' :
+		return 'An epic code change by Jacob on the Githubs.';
+	  break;
 			case 'hulu' :
 				return 'It was a cold, dark night, so Jacob watched something on Hulu.';
 			break;

Please login to merge, or discard this patch.

script/cron/generate-sitemaps.php 1 patch

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

@@ -27,26 +27,26 @@  discard block
 block discarded – undo
  * @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 @@  discard block
 block discarded – undo
  * 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 @@  discard block
 block discarded – undo
 
 // 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 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
  * 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 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
  * 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 @@  discard block
 block discarded – undo
 $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');

Please login to merge, or discard this patch.

		@@ -120,13 +120,13 @@
		block discarded – undo
120	120
121	121	$post = new stdclass();
122	122
123		- if (strpos($post_row->title, 'Rainy Supe Loop') === 0) {
124		- $title = $post_row->title;
125		- $title = explode(':', $title);
126		- $title = array_pop($title);
127		- $title = trim($title);
128		- $post->title = $title;
129		- } else if (strpos($post_row->title, 'Isle Royale') === 0) {
	123	+ if (strpos($post_row->title, 'Rainy Supe Loop') === 0) {
	124	+ $title = $post_row->title;
	125	+ $title = explode(':', $title);
	126	+ $title = array_pop($title);
	127	+ $title = trim($title);
	128	+ $post->title = $title;
	129	+ } else if (strpos($post_row->title, 'Isle Royale') === 0) {
130	130	$title = $post_row->title;
131	131	$title = explode(',', $title);
132	132	$title = array_pop($title);

		@@ -8,85 +8,85 @@
		block discarded – undo
8	8	class MysqlBlogRepository implements BlogRepositoryInterface
9	9	{
10	10
11		- /** @var ConnectionLocator */
12		- protected $connections;
	11	+ /** @var ConnectionLocator */
	12	+ protected $connections;
13	13
14		- /**
15		- * @param ConnectonLocator $connections
16		- */
17		- public function __construct(ConnectionLocator $connections)
18		- {
19		- $this->connections = $connections;
20		- }
	14	+ /**
	15	+ * @param ConnectonLocator $connections
	16	+ */
	17	+ public function __construct(ConnectionLocator $connections)
	18	+ {
	19	+ $this->connections = $connections;
	20	+ }
21	21
22		- public function getBlogByPermalink($permalink)
23		- {
24		- $query = "
	22	+ public function getBlogByPermalink($permalink)
	23	+ {
	24	+ $query = "
25	25	SELECT *
26	26	FROM `jpemeric_stream`.`blog2`
27	27	WHERE `permalink` = :permalink
28	28	LIMIT 1";
29		- $bindings = [
30		- 'permalink' => $permalink,
31		- ];
	29	+ $bindings = [
	30	+ 'permalink' => $permalink,
	31	+ ];
32	32
33		- return $this
34		- ->connections
35		- ->getRead()
36		- ->fetchOne($query, $bindings);
37		- }
	33	+ return $this
	34	+ ->connections
	35	+ ->getRead()
	36	+ ->fetchOne($query, $bindings);
	37	+ }
38	38
39		- public function getBlogs($limit = null, $offset = 0)
40		- {
41		- $query = "
	39	+ public function getBlogs($limit = null, $offset = 0)
	40	+ {
	41	+ $query = "
42	42	SELECT `id`, `permalink`, `datetime`
43	43	FROM `jpemeric_stream`.`blog2`
44	44	ORDER BY `datetime` DESC";
45		- if (!is_null($limit)) {
46		- $query .= "
	45	+ if (!is_null($limit)) {
	46	+ $query .= "
47	47	LIMIT {$limit}, {$offset}";
48		- }
	48	+ }
49	49
50		- return $this
51		- ->connections
52		- ->getRead()
53		- ->fetchAll($query);
54		- }
	50	+ return $this
	51	+ ->connections
	52	+ ->getRead()
	53	+ ->fetchAll($query);
	54	+ }
55	55
56		- public function getBlogsUpdatedSince(DateTime $datetime)
57		- {
58		- $query = "
	56	+ public function getBlogsUpdatedSince(DateTime $datetime)
	57	+ {
	58	+ $query = "
59	59	SELECT *
60	60	FROM `jpemeric_stream`.`blog2`
61	61	WHERE `updated_at` >= :last_update";
62	62
63		- $bindings = [
64		- 'last_update' => $datetime->format('Y-m-d H:i:s'),
65		- ];
	63	+ $bindings = [
	64	+ 'last_update' => $datetime->format('Y-m-d H:i:s'),
	65	+ ];
66	66
67		- return $this
68		- ->connections
69		- ->getRead()
70		- ->fetchAll($query, $bindings);
71		- }
	67	+ return $this
	68	+ ->connections
	69	+ ->getRead()
	70	+ ->fetchAll($query, $bindings);
	71	+ }
72	72
73		- public function insertBlog($permalink, DateTime $datetime, array $metadata)
74		- {
75		- $query = "
	73	+ public function insertBlog($permalink, DateTime $datetime, array $metadata)
	74	+ {
	75	+ $query = "
76	76	INSERT INTO `jpemeric_stream`.`blog2`
77	77	(`permalink`, `datetime`, `metadata`)
78	78	VALUES
79	79	(:permalink, :datetime, :metadata)";
80	80
81		- $bindings = [
82		- 'permalink' => $permalink,
83		- 'datetime' => $datetime->format('Y-m-d H:i:s'),
84		- 'metadata' => json_encode($metadata),
85		- ];
	81	+ $bindings = [
	82	+ 'permalink' => $permalink,
	83	+ 'datetime' => $datetime->format('Y-m-d H:i:s'),
	84	+ 'metadata' => json_encode($metadata),
	85	+ ];
86	86
87		- return $this
88		- ->connections
89		- ->getWrite()
90		- ->perform($query, $bindings);
91		- }
	87	+ return $this
	88	+ ->connections
	89	+ ->getWrite()
	90	+ ->perform($query, $bindings);
	91	+ }
92	92	}

		@@ -8,87 +8,87 @@
		block discarded – undo
8	8	class MysqlTwitterRepository implements TwitterRepositoryInterface
9	9	{
10	10
11		- /** @var ConnectionLocator */
12		- protected $connections;
13		-
14		- /**
15		- * @param ConnectonLocator $connections
16		- */
17		- public function __construct(ConnectionLocator $connections)
18		- {
19		- $this->connections = $connections;
20		- }
21		-
22		- public function getTwitterByTweetId($tweetId)
23		- {
24		- $query = "
	11	+ /** @var ConnectionLocator */
	12	+ protected $connections;
	13	+
	14	+ /**
	15	+ * @param ConnectonLocator $connections
	16	+ */
	17	+ public function __construct(ConnectionLocator $connections)
	18	+ {
	19	+ $this->connections = $connections;
	20	+ }
	21	+
	22	+ public function getTwitterByTweetId($tweetId)
	23	+ {
	24	+ $query = "
25	25	SELECT `id`, `tweet_id`, `datetime`, `metadata`
26	26	FROM `jpemeric_stream`.`twitter2`
27	27	WHERE `tweet_id` = :tweet_id
28	28	LIMIT 1";
29	29
30		- $bindings = [
31		- 'tweet_id' => $tweetId,
32		- ];
	30	+ $bindings = [
	31	+ 'tweet_id' => $tweetId,
	32	+ ];
33	33
34		- return $this
35		- ->connections
36		- ->getRead()
37		- ->fetchOne($query, $bindings);
38		- }
	34	+ return $this
	35	+ ->connections
	36	+ ->getRead()
	37	+ ->fetchOne($query, $bindings);
	38	+ }
39	39
40		- public function getTwittersUpdatedSince(DateTime $datetime)
41		- {
42		- $query = "
	40	+ public function getTwittersUpdatedSince(DateTime $datetime)
	41	+ {
	42	+ $query = "
43	43	SELECT *
44	44	FROM `jpemeric_stream`.`twitter2`
45	45	WHERE `updated_at` >= :last_update";
46	46
47		- $bindings = [
48		- 'last_update' => $datetime->format('Y-m-d H:i:s'),
49		- ];
	47	+ $bindings = [
	48	+ 'last_update' => $datetime->format('Y-m-d H:i:s'),
	49	+ ];
50	50
51		- return $this
52		- ->connections
53		- ->getRead()
54		- ->fetchAll($query, $bindings);
55		- }
	51	+ return $this
	52	+ ->connections
	53	+ ->getRead()
	54	+ ->fetchAll($query, $bindings);
	55	+ }
56	56
57		- public function insertTweet($tweetId, DateTime $datetime, array $metadata)
58		- {
59		- $query = "
	57	+ public function insertTweet($tweetId, DateTime $datetime, array $metadata)
	58	+ {
	59	+ $query = "
60	60	INSERT INTO `jpemeric_stream`.`twitter2`
61	61	(`tweet_id`, `datetime`, `metadata`)
62	62	VALUES
63	63	(:tweet_id, :datetime, :metadata)";
64	64
65		- $bindings = [
66		- 'tweet_id' => $tweetId,
67		- 'datetime' => $datetime->format('Y-m-d H:i:s'),
68		- 'metadata' => json_encode($metadata),
69		- ];
70		-
71		- return $this
72		- ->connections
73		- ->getWrite()
74		- ->perform($query, $bindings);
75		- }
76		-
77		- public function updateTweetMetadata($tweetId, array $metadata)
78		- {
79		- $query = "
	65	+ $bindings = [
	66	+ 'tweet_id' => $tweetId,
	67	+ 'datetime' => $datetime->format('Y-m-d H:i:s'),
	68	+ 'metadata' => json_encode($metadata),
	69	+ ];
	70	+
	71	+ return $this
	72	+ ->connections
	73	+ ->getWrite()
	74	+ ->perform($query, $bindings);
	75	+ }
	76	+
	77	+ public function updateTweetMetadata($tweetId, array $metadata)
	78	+ {
	79	+ $query = "
80	80	UPDATE `jpemeric_stream`.`twitter2`
81	81	SET `metadata` = :metadata
82	82	WHERE `tweet_id` = :tweet_id";
83	83
84		- $bindings = [
85		- 'metadata' => json_encode($metadata),
86		- 'tweet_id' => $tweetId,
87		- ];
	84	+ $bindings = [
	85	+ 'metadata' => json_encode($metadata),
	86	+ 'tweet_id' => $tweetId,
	87	+ ];
88	88
89		- return $this
90		- ->connections
91		- ->getWrite()
92		- ->perform($query, $bindings);
93		- }
	89	+ return $this
	90	+ ->connections
	91	+ ->getWrite()
	92	+ ->perform($query, $bindings);
	93	+ }
94	94	}

		@@ -8,88 +8,88 @@
		block discarded – undo
8	8	class MysqlYouTubeRepository implements YouTubeRepositoryInterface
9	9	{
10	10
11		- /** @var ConnectionLocator */
12		- protected $connections;
	11	+ /** @var ConnectionLocator */
	12	+ protected $connections;
13	13
14		- /**
15		- * @param ConnectonLocator $connections
16		- */
17		- public function __construct(ConnectionLocator $connections)
18		- {
19		- $this->connections = $connections;
20		- }
	14	+ /**
	15	+ * @param ConnectonLocator $connections
	16	+ */
	17	+ public function __construct(ConnectionLocator $connections)
	18	+ {
	19	+ $this->connections = $connections;
	20	+ }
21	21
22		- public function getYouTubes($limit = null, $offset = 0)
23		- {
24		- $query = "
	22	+ public function getYouTubes($limit = null, $offset = 0)
	23	+ {
	24	+ $query = "
25	25	SELECT `id`, `video_id`, `datetime`
26	26	FROM `jpemeric_stream`.`youtube`
27	27	ORDER BY `datetime` DESC";
28		- if (!is_null($limit)) {
29		- $query .= "
	28	+ if (!is_null($limit)) {
	29	+ $query .= "
30	30	LIMIT {$offset}, {$limit}";
31		- }
	31	+ }
32	32
33		- return $this
34		- ->connections
35		- ->getRead()
36		- ->fetchAll($query);
37		- }
	33	+ return $this
	34	+ ->connections
	35	+ ->getRead()
	36	+ ->fetchAll($query);
	37	+ }
38	38
39		- /**
40		- * @param string $title
41		- *
42		- * @return array\|false
43		- */
44		- public function getYouTubeByVideoId($videoId)
45		- {
46		- $query = "
	39	+ /**
	40	+ * @param string $title
	41	+ *
	42	+ * @return array\|false
	43	+ */
	44	+ public function getYouTubeByVideoId($videoId)
	45	+ {
	46	+ $query = "
47	47	SELECT *
48	48	FROM `jpemeric_stream`.`youtube`
49	49	WHERE `video_id` = :video_id
50	50	LIMIT 1";
51		- $bindings = [
52		- 'video_id' => $videoId,
53		- ];
	51	+ $bindings = [
	52	+ 'video_id' => $videoId,
	53	+ ];
54	54
55		- return $this
56		- ->connections
57		- ->getRead()
58		- ->fetchOne($query, $bindings);
59		- }
	55	+ return $this
	56	+ ->connections
	57	+ ->getRead()
	58	+ ->fetchOne($query, $bindings);
	59	+ }
60	60
61		- public function getYouTubesUpdatedSince(DateTime $datetime)
62		- {
63		- $query = "
	61	+ public function getYouTubesUpdatedSince(DateTime $datetime)
	62	+ {
	63	+ $query = "
64	64	SELECT *
65	65	FROM `jpemeric_stream`.`youtube`
66	66	WHERE `updated_at` >= :last_update";
67		- $bindings = [
68		- 'last_update' => $datetime->format('Y-m-d H:i:s'),
69		- ];
70		- return $this
71		- ->connections
72		- ->getRead()
73		- ->fetchAll($query, $bindings);
74		- }
	67	+ $bindings = [
	68	+ 'last_update' => $datetime->format('Y-m-d H:i:s'),
	69	+ ];
	70	+ return $this
	71	+ ->connections
	72	+ ->getRead()
	73	+ ->fetchAll($query, $bindings);
	74	+ }
75	75
76		- public function insertVideo($videoId, DateTime $datetime, array $metadata)
77		- {
78		- $query = "
	76	+ public function insertVideo($videoId, DateTime $datetime, array $metadata)
	77	+ {
	78	+ $query = "
79	79	INSERT INTO `jpemeric_stream`.`youtube`
80	80	(`video_id`, `datetime`, `metadata`)
81	81	VALUES
82	82	(:video_id, :datetime, :metadata)";
83	83
84		- $bindings = [
85		- 'video_id' => $videoId,
86		- 'datetime' => $datetime->format('Y-m-d H:i:s'),
87		- 'metadata' => json_encode($metadata),
88		- ];
	84	+ $bindings = [
	85	+ 'video_id' => $videoId,
	86	+ 'datetime' => $datetime->format('Y-m-d H:i:s'),
	87	+ 'metadata' => json_encode($metadata),
	88	+ ];
89	89
90		- return $this
91		- ->connections
92		- ->getWrite()
93		- ->perform($query, $bindings);
94		- }
	90	+ return $this
	91	+ ->connections
	92	+ ->getWrite()
	93	+ ->perform($query, $bindings);
	94	+ }
95	95	}

		@@ -21,14 +21,14 @@ discard block
		block discarded – undo
21	21	* @return boolean
22	22	*/
23	23	$buildFeed = function (Feed $feed, $folder, $name = 'rss') {
24		- $tempFeed = __DIR__ . "/../../public/{$folder}/{$name}-new.xml";
25		- $finalFeed = __DIR__ . "/../../public/{$folder}/{$name}.xml";
	24	+ $tempFeed = __DIR__ . "/../../public/{$folder}/{$name}-new.xml";
	25	+ $finalFeed = __DIR__ . "/../../public/{$folder}/{$name}.xml";
26	26
27		- $feedHandle = fopen($tempFeed, 'w');
28		- fwrite($feedHandle, $feed->render());
29		- fclose($feedHandle);
	27	+ $feedHandle = fopen($tempFeed, 'w');
	28	+ fwrite($feedHandle, $feed->render());
	29	+ fclose($feedHandle);
30	30
31		- rename($tempFeed, $finalFeed);
	31	+ rename($tempFeed, $finalFeed);
32	32	};
33	33
34	34
		@@ -47,56 +47,56 @@ discard block
		block discarded – undo
47	47	$activeBlogPosts = $blogPostRepository->getActivePosts();
48	48
49	49	foreach ($activeBlogPosts as $blogPost) {
50		- $blogPostItem = new Item();
51		-
52		- $blogPostItem->title($blogPost['title']);
53		-
54		- $url = "http://blog.jacobemerick.com/{$blogPost['category']}/{$blogPost['path']}/";
55		- $blogPostItem->url($url);
56		- $blogPostItem->guid($url, true);
57		-
58		- $description = $blogPost['body'];
59		- $description = strip_tags($description);
60		- $description = strtok($description, "\n");
61		- if (strlen($description) > 250) {
62		- $description = wordwrap($description, 250);
63		- $description = strtok($description, "\n");
64		- if (substr($description, -1) != '.') {
65		- $description .= '…';
66		- }
67		- }
68		- $description = html_entity_decode($description);
69		- $blogPostItem->description($description);
70		-
71		- $categoryUrl = "http://blog.jacobemerick.com/{$blogPost['category']}/";
72		- $blogPostItem->category($blogPost['category'], $categoryUrl);
73		-
74		- $pubDate = new DateTime($blogPost['date']);
75		- $blogPostItem->pubDate($pubDate->getTimestamp());
76		-
77		- $firstPhoto = Content::instance('FetchFirstPhoto', $blogPost['body'])->activate(true, 'large');
78		- if (!empty($firstPhoto)) {
79		- $firstPhotoPieces = sscanf($firstPhoto, '<img src="%s" height="%d" width="%d" alt="%s" />');
80		- $firstPhotoPath = current($firstPhotoPieces);
81		- $firstPhotoPath = trim($firstPhotoPath, '"');
82		-
83		- $firstPhotoInternalPath = __DIR__ . '/../../public' . $firstPhotoPath;
84		-
85		- $firstPhotoSize = filesize($firstPhotoInternalPath);
86		-
87		- /**
88		- * ugh, remote host does not have pecl fileinfo
89		- *
90		- * $fInfo = new finfo(FILEINFO_MIME_TYPE);
91		- * $firstPhotoType = $fInfo->file($firstPhotoInternalPath);
92		- * unset($fInfo);
93		- **/
94		- $firstPhotoType = 'image/jpeg';
95		-
96		- $blogPostItem->enclosure("http://blog.jacobemerick.com{$firstPhotoPath}", $firstPhotoSize, $firstPhotoType);
97		- }
98		-
99		- $blogPostItem->appendTo($blogPostChannel);
	50	+ $blogPostItem = new Item();
	51	+
	52	+ $blogPostItem->title($blogPost['title']);
	53	+
	54	+ $url = "http://blog.jacobemerick.com/{$blogPost['category']}/{$blogPost['path']}/";
	55	+ $blogPostItem->url($url);
	56	+ $blogPostItem->guid($url, true);
	57	+
	58	+ $description = $blogPost['body'];
	59	+ $description = strip_tags($description);
	60	+ $description = strtok($description, "\n");
	61	+ if (strlen($description) > 250) {
	62	+ $description = wordwrap($description, 250);
	63	+ $description = strtok($description, "\n");
	64	+ if (substr($description, -1) != '.') {
	65	+ $description .= '…';
	66	+ }
	67	+ }
	68	+ $description = html_entity_decode($description);
	69	+ $blogPostItem->description($description);
	70	+
	71	+ $categoryUrl = "http://blog.jacobemerick.com/{$blogPost['category']}/";
	72	+ $blogPostItem->category($blogPost['category'], $categoryUrl);
	73	+
	74	+ $pubDate = new DateTime($blogPost['date']);
	75	+ $blogPostItem->pubDate($pubDate->getTimestamp());
	76	+
	77	+ $firstPhoto = Content::instance('FetchFirstPhoto', $blogPost['body'])->activate(true, 'large');
	78	+ if (!empty($firstPhoto)) {
	79	+ $firstPhotoPieces = sscanf($firstPhoto, '<img src="%s" height="%d" width="%d" alt="%s" />');
	80	+ $firstPhotoPath = current($firstPhotoPieces);
	81	+ $firstPhotoPath = trim($firstPhotoPath, '"');
	82	+
	83	+ $firstPhotoInternalPath = __DIR__ . '/../../public' . $firstPhotoPath;
	84	+
	85	+ $firstPhotoSize = filesize($firstPhotoInternalPath);
	86	+
	87	+ /**
	88	+ * ugh, remote host does not have pecl fileinfo
	89	+ *
	90	+ * $fInfo = new finfo(FILEINFO_MIME_TYPE);
	91	+ * $firstPhotoType = $fInfo->file($firstPhotoInternalPath);
	92	+ * unset($fInfo);
	93	+ **/
	94	+ $firstPhotoType = 'image/jpeg';
	95	+
	96	+ $blogPostItem->enclosure("http://blog.jacobemerick.com{$firstPhotoPath}", $firstPhotoSize, $firstPhotoType);
	97	+ }
	98	+
	99	+ $blogPostItem->appendTo($blogPostChannel);
100	100	}
101	101
102	102	$buildFeed($blogPostFeed, 'blog');
		@@ -114,33 +114,33 @@ discard block
		block discarded – undo
114	114	$activeBlogComments = $commentRepository->getActiveCommentsBySite('blog');
115	115
116	116	foreach ($activeBlogComments as $blogComment) {
117		- $blogCommentItem = new Item();
118		-
119		- $blogCommentItem->title("Comment on '{$blogComment['title']}' from {$blogComment['name']}");
120		-
121		- $url = "http://blog.jacobemerick.com/{$blogComment['category']}/{$blogComment['path']}/";
122		- $url .= "#comment-{$blogComment['id']}";
123		- $blogCommentItem->url($url);
124		- $blogCommentItem->guid($url, true);
125		-
126		- $description = $blogComment['body'];
127		- $description = strip_tags($description);
128		- $description = strtok($description, "\n");
129		- if (strlen($description) > 250) {
130		- $description = wordwrap($description, 250);
131		- $description = strtok($description, "\n");
132		- if (substr($description, -1) != '.') {
133		- $description .= '…';
134		- }
135		- }
136		- $description = html_entity_decode($description);
137		- $description = trim($description);
138		- $blogCommentItem->description($description);
139		-
140		- $pubDate = new DateTime($blogComment['date']);
141		- $blogCommentItem->pubDate($pubDate->getTimestamp());
142		-
143		- $blogCommentItem->appendTo($blogCommentChannel);
	117	+ $blogCommentItem = new Item();
	118	+
	119	+ $blogCommentItem->title("Comment on '{$blogComment['title']}' from {$blogComment['name']}");
	120	+
	121	+ $url = "http://blog.jacobemerick.com/{$blogComment['category']}/{$blogComment['path']}/";
	122	+ $url .= "#comment-{$blogComment['id']}";
	123	+ $blogCommentItem->url($url);
	124	+ $blogCommentItem->guid($url, true);
	125	+
	126	+ $description = $blogComment['body'];
	127	+ $description = strip_tags($description);
	128	+ $description = strtok($description, "\n");
	129	+ if (strlen($description) > 250) {
	130	+ $description = wordwrap($description, 250);
	131	+ $description = strtok($description, "\n");
	132	+ if (substr($description, -1) != '.') {
	133	+ $description .= '…';
	134	+ }
	135	+ }
	136	+ $description = html_entity_decode($description);
	137	+ $description = trim($description);
	138	+ $blogCommentItem->description($description);
	139	+
	140	+ $pubDate = new DateTime($blogComment['date']);
	141	+ $blogCommentItem->pubDate($pubDate->getTimestamp());
	142	+
	143	+ $blogCommentItem->appendTo($blogCommentChannel);
144	144	}
145	145
146	146	$buildFeed($blogCommentFeed, 'blog', 'rss-comments');

		@@ -56,37 +56,37 @@ discard block
		block discarded – undo
56	56	return $domain_container;
57	57	}
58	58
59		- protected function get_recent_activity()
60		- {
61		- global $container;
62		- $activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']);
63		- $post_result = $activityRepository->getActivities(5);
64		-
65		- $post_array = array();
66		- foreach($post_result as $row) {
67		- array_push($post_array, $this->expand_post($row));
68		- }
69		-
70		- return $post_array;
71		- }
72		-
73		- protected function expand_post($raw_post, $format = 'short')
74		- {
75		- $post = [
76		- 'type' => $raw_post['type'],
77		- 'title' => ($format == 'short') ? $raw_post['message'] : $raw_post['message_long'],
78		- 'date' => $this->get_parsed_date($raw_post['datetime']),
79		- ];
80		-
81		- if ($format != 'short') {
82		- $post['url'] = Loader::getRootUrl('lifestream') . "{$raw_post['type']}/{$raw_post['id']}/";
83		-
84		- $metadata = json_decode($raw_post['metadata'], true);
85		- $post = array_merge($post, $metadata);
86		- }
87		-
88		- return (object) $post;
89		- }
	59	+ protected function get_recent_activity()
	60	+ {
	61	+ global $container;
	62	+ $activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']);
	63	+ $post_result = $activityRepository->getActivities(5);
	64	+
	65	+ $post_array = array();
	66	+ foreach($post_result as $row) {
	67	+ array_push($post_array, $this->expand_post($row));
	68	+ }
	69	+
	70	+ return $post_array;
	71	+ }
	72	+
	73	+ protected function expand_post($raw_post, $format = 'short')
	74	+ {
	75	+ $post = [
	76	+ 'type' => $raw_post['type'],
	77	+ 'title' => ($format == 'short') ? $raw_post['message'] : $raw_post['message_long'],
	78	+ 'date' => $this->get_parsed_date($raw_post['datetime']),
	79	+ ];
	80	+
	81	+ if ($format != 'short') {
	82	+ $post['url'] = Loader::getRootUrl('lifestream') . "{$raw_post['type']}/{$raw_post['id']}/";
	83	+
	84	+ $metadata = json_decode($raw_post['metadata'], true);
	85	+ $post = array_merge($post, $metadata);
	86	+ }
	87	+
	88	+ return (object) $post;
	89	+ }
90	90
91	91	public function activate()
92	92	{
		@@ -107,11 +107,11 @@ discard block
		block discarded – undo
107	107	Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
108	108	}
109	109
110		- if (URLDecode::getSite() == 'waterfalls') {
111		- Loader::load('view', '/WaterfallFoot');
112		- } else {
113		- Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
114		- }
	110	+ if (URLDecode::getSite() == 'waterfalls') {
	111	+ Loader::load('view', '/WaterfallFoot');
	112	+ } else {
	113	+ Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
	114	+ }
115	115
116	116	if($view == '/404' \|\| $view == '/503')
117	117	exit;
		@@ -169,19 +169,19 @@ discard block
		block discarded – undo
169	169
170	170	private function load_assets()
171	171	{
172		- $css_array = array_map(function ($stylesheet) {
173		- $path = "/css/{$stylesheet[0]}.css";
174		- if ($stylesheet[1] > 1) {
175		- $path .= "?v={$stylesheet[1]}";
176		- }
177		- return $path;
178		- }, $this->css_array);
179		- $js_array = array_map(function ($script) {
180		- if (substr($script, 0, 4) == 'http') {
181		- return $script;
182		- }
183		- return "/js/{$script}.min.js";
184		- }, $this->js_array);
	172	+ $css_array = array_map(function ($stylesheet) {
	173	+ $path = "/css/{$stylesheet[0]}.css";
	174	+ if ($stylesheet[1] > 1) {
	175	+ $path .= "?v={$stylesheet[1]}";
	176	+ }
	177	+ return $path;
	178	+ }, $this->css_array);
	179	+ $js_array = array_map(function ($script) {
	180	+ if (substr($script, 0, 4) == 'http') {
	181	+ return $script;
	182	+ }
	183	+ return "/js/{$script}.min.js";
	184	+ }, $this->js_array);
185	185
186	186	$this->set_head('css_link_array', $css_array);
187	187	$this->set_head('js_link_array', $js_array);

		@@ -57,9 +57,9 @@ discard block
		block discarded – undo
57	57	case 'distance' :
58	58	return 'Run, Jacob, and Hike';
59	59	break;
60		- case 'github' :
61		- return 'Jacob, Code Monkey';
62		- break;
	60	+ case 'github' :
	61	+ return 'Jacob, Code Monkey';
	62	+ break;
63	63	case 'hulu' :
64	64	return 'Jacob watches Hulu';
65	65	break;
		@@ -85,9 +85,9 @@ discard block
		block discarded – undo
85	85	case 'distance' :
86	86	return 'All the cool kids like to be in shape. Jacob goes running and hiking.';
87	87	break;
88		- case 'github' :
89		- return 'Since he is trying to be a developer, Jacob codes. Here is some code that he pushed around on the Githubs.';
90		- break;
	88	+ case 'github' :
	89	+ return 'Since he is trying to be a developer, Jacob codes. Here is some code that he pushed around on the Githubs.';
	90	+ break;
91	91	case 'hulu' :
92	92	return 'Occasionally Jacob chills and watches some Hulu. Well, used to, anyways.';
93	93	break;

		@@ -70,9 +70,9 @@ discard block
		block discarded – undo
70	70	case 'distance' :
71	71	return 'Jacob ran xor hiked';
72	72	break;
73		- case 'github' :
74		- return 'Jacob did code';
75		- break;
	73	+ case 'github' :
	74	+ return 'Jacob did code';
	75	+ break;
76	76	case 'hulu' :
77	77	return 'What Jacob watched';
78	78	break;
		@@ -98,9 +98,9 @@ discard block
		block discarded – undo
98	98	case 'distance' :
99	99	return 'Well, it might have been both at the same time if there was a bear.';
100	100	break;
101		- case 'github' :
102		- return 'An epic code change by Jacob on the Githubs.';
103		- break;
	101	+ case 'github' :
	102	+ return 'An epic code change by Jacob on the Githubs.';
	103	+ break;
104	104	case 'hulu' :
105	105	return 'It was a cold, dark night, so Jacob watched something on Hulu.';
106	106	break;

jacobemerick / web

Pull Request — master (#2)

Status

Category

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

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

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

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

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

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

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

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

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