jacobemerick / web

script/cron/fetch-goodreads-activity.php

Indentation +20 added lines, -20 removed lines

@@ -6,7 +6,7 @@ 
 use Jacobemerick\Web\Domain\Stream\Goodread\MysqlGoodreadRepository as GoodreadRepository;
 
 $client = new Client([
-    'base_uri' => 'http://www.goodreads.com',
+	'base_uri' => 'http://www.goodreads.com',
 ]);
 
 $goodreadRepository = new GoodreadRepository($container['db_connection_locator']);
@@ -20,23 +20,23 @@ 
 $reviews = simplexml_load_string($reviews, 'SimpleXMLElement', LIBXML_NOCDATA);
 
 foreach ($reviews->channel->item as $review) {
-    $datetime = new DateTime((string) $review->pubDate);
-    if ($datetime <= $mostRecentReviewDateTime) {
-        break;
-    }
-
-    $uniqueReviewCheck = $goodreadRepository->getReviewByPermalink((string) $review->guid);
-    if ($uniqueReviewCheck !== false) {
-        continue;
-    }
-
-    $datetime->setTimezone($container['default_timezone']);
-    $metadata = json_decode(json_encode($review), true);
-
-    $goodreadRepository->insertReview(
-        (string) $review->guid,
-        (string) $review->book_id,
-        $datetime,
-        $metadata
-    );
+	$datetime = new DateTime((string) $review->pubDate);
+	if ($datetime <= $mostRecentReviewDateTime) {
+		break;
+	}
+
+	$uniqueReviewCheck = $goodreadRepository->getReviewByPermalink((string) $review->guid);
+	if ($uniqueReviewCheck !== false) {
+		continue;
+	}
+
+	$datetime->setTimezone($container['default_timezone']);
+	$metadata = json_decode(json_encode($review), true);
+
+	$goodreadRepository->insertReview(
+		(string) $review->guid,
+		(string) $review->book_id,
+		$datetime,
+		$metadata
+	);
 }

script/manual/historic-twitter-fetch.php

Indentation +29 added lines, -29 removed lines

@@ -4,17 +4,17 @@ 
 
 $options = getopt('f:');
 if (empty($options['f'])) {
-    exit('Must pass in a file with the f parameter.');
+	exit('Must pass in a file with the f parameter.');
 }
 
 use Abraham\TwitterOAuth\TwitterOAuth;
 use Jacobemerick\Web\Domain\Stream\Twitter\MysqlTwitterRepository as TwitterRepository;
 
 $client = new TwitterOAuth(
-    $config->twitter->consumer_key,
-    $config->twitter->consumer_secret,
-    $config->twitter->access_token,
-    $config->twitter->access_token_secret
+	$config->twitter->consumer_key,
+	$config->twitter->consumer_secret,
+	$config->twitter->access_token,
+	$config->twitter->access_token_secret
 );
 $client->setDecodeJsonAsArray(true);
 
@@ -24,29 +24,29 @@ 
 
 $handle = fopen(__DIR__ . '/' . $options['f'], 'r');
 while ($row = fgets($handle)) {
-    array_push($idList, trim($row));
-    if (count($idList) == 100) {
-        $tweetLookup = $client->get('statuses/lookup', [
-            'id' => implode(',', $idList),
-            'trim_user' => true,
-        ]);
-
-        foreach ($tweetLookup as $tweet) {
-            $uniqueTweetCheck = $twitterRepository->getTwitterByTweetId($tweet['id_str']);
-            if ($uniqueTweetCheck !== false) {
-                if ($uniqueTweetCheck['metadata'] != json_encode($tweet)) {
-                    $twitterRepository->updateTweetMetadata($tweet['id_str'], $tweet);
-                }
-                continue;
-            }
-
-            $twitterRepository->insertTweet(
-                $tweet['id_str'],
-                (new DateTime($tweet['created_at']))->setTimezone($container['default_timezone']),
-                $tweet
-            );
-        }
-        $idList = [];
-    }
+	array_push($idList, trim($row));
+	if (count($idList) == 100) {
+		$tweetLookup = $client->get('statuses/lookup', [
+			'id' => implode(',', $idList),
+			'trim_user' => true,
+		]);
+
+		foreach ($tweetLookup as $tweet) {
+			$uniqueTweetCheck = $twitterRepository->getTwitterByTweetId($tweet['id_str']);
+			if ($uniqueTweetCheck !== false) {
+				if ($uniqueTweetCheck['metadata'] != json_encode($tweet)) {
+					$twitterRepository->updateTweetMetadata($tweet['id_str'], $tweet);
+				}
+				continue;
+			}
+
+			$twitterRepository->insertTweet(
+				$tweet['id_str'],
+				(new DateTime($tweet['created_at']))->setTimezone($container['default_timezone']),
+				$tweet
+			);
+		}
+		$idList = [];
+	}
 }
 fclose($handle);

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

src/Domain/Stream/Activity/MysqlActivityRepository.php

Indentation +146 added lines, -146 removed lines

@@ -8,192 +8,192 @@
 class MysqlActivityRepository implements ActivityRepositoryInterface
 {
 
-    /** @var  ConnectionLocator */
-    protected $connections;
-
-    /**
-     * @param ConnectonLocator $connections
-     */
-    public function __construct(ConnectionLocator $connections)
-    {
-        $this->connections = $connections;
-    }
-
-    /**
-     * @param integer $id
-     *
-     * @return array|false
-     */
-    public function getActivityById($id)
-    {
-        $query = "
+	/** @var  ConnectionLocator */
+	protected $connections;
+
+	/**
+	 * @param ConnectonLocator $connections
+	 */
+	public function __construct(ConnectionLocator $connections)
+	{
+		$this->connections = $connections;
+	}
+
+	/**
+	 * @param integer $id
+	 *
+	 * @return array|false
+	 */
+	public function getActivityById($id)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`activity`
             WHERE `id` = :id
             LIMIT 1";
-        $bindings = [
-            'id' => $id,
-        ];
-
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchOne($query, $bindings);
-    }
-
-    public function getActivityByTypeId($type, $typeId)
-    {
-        $query = "
+		$bindings = [
+			'id' => $id,
+		];
+
+		return $this
+			->connections
+			->getRead()
+			->fetchOne($query, $bindings);
+	}
+
+	public function getActivityByTypeId($type, $typeId)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`activity`
             WHERE `type` = :type && `type_id` = :type_id
             LIMIT 1";
-        $bindings = [
-            'type'    => $type,
-            'type_id' => $typeId,
-        ];
-
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchOne($query, $bindings);
-    }
-
-    public function getActivityLastUpdateByType($type)
-    {
-        $query = "
+		$bindings = [
+			'type'    => $type,
+			'type_id' => $typeId,
+		];
+
+		return $this
+			->connections
+			->getRead()
+			->fetchOne($query, $bindings);
+	}
+
+	public function getActivityLastUpdateByType($type)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`activity`
             WHERE `type` = :type
             ORDER BY `updated_at` DESC
             LIMIT 1";
 
-        $bindings = [
-            'type' => $type,
-        ];
-
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchOne($query, $bindings);
-    }
-
-    /**
-     * @param integer $limit
-     * @param integer $offset
-     *
-     * @return array|false
-     */
-    public function getActivities($limit = null, $offset = 0)
-    {
-        $query = "
+		$bindings = [
+			'type' => $type,
+		];
+
+		return $this
+			->connections
+			->getRead()
+			->fetchOne($query, $bindings);
+	}
+
+	/**
+	 * @param integer $limit
+	 * @param integer $offset
+	 *
+	 * @return array|false
+	 */
+	public function getActivities($limit = null, $offset = 0)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`activity`
             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);
+	}
 
-    public function getActivitiesCount()
-    {
-        $query = "
+	public function getActivitiesCount()
+	{
+		$query = "
             SELECT COUNT(1) AS `count`
             FROM `jpemeric_stream`.`activity`";
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchValue($query);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchValue($query);
+	}
 
-    public function getActivitiesByType($type, $limit = null, $offset = 0)
-    {
-        $query = "
+	public function getActivitiesByType($type, $limit = null, $offset = 0)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`activity`
             WHERE `type` = :type
             ORDER BY `datetime` DESC";
-        if (!is_null($limit)) {
-            $query .= "
+		if (!is_null($limit)) {
+			$query .= "
             LIMIT {$offset}, {$limit}";
-        }
-        $bindings = [
-            'type' => $type,
-        ];
-
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query, $bindings);
-    }
-
-    public function getActivitiesByTypeCount($type)
-    {
-        $query = "
+		}
+		$bindings = [
+			'type' => $type,
+		];
+
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query, $bindings);
+	}
+
+	public function getActivitiesByTypeCount($type)
+	{
+		$query = "
             SELECT COUNT(1) AS `count`
             FROM `jpemeric_stream`.`activity`
             WHERE `type` = :type";
-        $bindings = [
-            'type' => $type,
-        ];
-
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchValue($query, $bindings);
-    }
-
-    public function insertActivity(
-        $message,
-        $messageLong,
-        DateTime $datetime,
-        array $metadata,
-        $type,
-        $typeId
-    ) {
-        $query = "
+		$bindings = [
+			'type' => $type,
+		];
+
+		return $this
+			->connections
+			->getRead()
+			->fetchValue($query, $bindings);
+	}
+
+	public function insertActivity(
+		$message,
+		$messageLong,
+		DateTime $datetime,
+		array $metadata,
+		$type,
+		$typeId
+	) {
+		$query = "
             INSERT INTO `jpemeric_stream`.`activity`
                 (`message`, `message_long`, `datetime`, `metadata`, `type`, `type_id`)
             VALUES
                 (:message, :message_long, :datetime, :metadata, :type, :type_id)";
 
-        $bindings = [
-            'message' => $message,
-            'message_long' => $messageLong,
-            'datetime' => $datetime->format('Y-m-d H:i:s'),
-            'metadata' => json_encode($metadata),
-            'type' => $type,
-            'type_id' => $typeId,
-        ];
-
-        return $this
-            ->connections
-            ->getWrite()
-            ->perform($query, $bindings);
-    }
-
-    public function updateActivityMetadata($activityId, array $metadata)
-    {
-        $query = "
+		$bindings = [
+			'message' => $message,
+			'message_long' => $messageLong,
+			'datetime' => $datetime->format('Y-m-d H:i:s'),
+			'metadata' => json_encode($metadata),
+			'type' => $type,
+			'type_id' => $typeId,
+		];
+
+		return $this
+			->connections
+			->getWrite()
+			->perform($query, $bindings);
+	}
+
+	public function updateActivityMetadata($activityId, array $metadata)
+	{
+		$query = "
             UPDATE `jpemeric_stream`.`activity`
             SET `metadata` = :metadata
             WHERE `id` = :id";
 
-        $bindings = [
-            'metadata' => json_encode($metadata),
-            'id' => $activityId,
-        ];
+		$bindings = [
+			'metadata' => json_encode($metadata),
+			'id' => $activityId,
+		];
 
-        return $this
-            ->connections
-            ->getWrite()
-            ->perform($query, $bindings);
-    }
+		return $this
+			->connections
+			->getWrite()
+			->perform($query, $bindings);
+	}
 }

src/Domain/Stream/DailyMile/MysqlDailyMileRepository.php

Indentation +82 added lines, -82 removed lines

@@ -8,106 +8,106 @@
 class MysqlDailyMileRepository implements DailyMileRepositoryInterface
 {
 
-    /** @var  ConnectionLocator */
-    protected $connections;
-
-    /**
-     * @param ConnectonLocator $connections
-     */
-    public function __construct(ConnectionLocator $connections)
-    {
-        $this->connections = $connections;
-    }
-
-    /**
-     * @param integer $limit
-     * @param integer $offset
-     *
-     * @return array|false
-     */
-    public function getEntries($limit = null, $offset = 0)
-    {
-        $query = "
+	/** @var  ConnectionLocator */
+	protected $connections;
+
+	/**
+	 * @param ConnectonLocator $connections
+	 */
+	public function __construct(ConnectionLocator $connections)
+	{
+		$this->connections = $connections;
+	}
+
+	/**
+	 * @param integer $limit
+	 * @param integer $offset
+	 *
+	 * @return array|false
+	 */
+	public function getEntries($limit = null, $offset = 0)
+	{
+		$query = "
             SELECT `id`, `entry_id`, `datetime`
             FROM `jpemeric_stream`.`dailymile`
             ORDER BY `datetime` DESC";
-        if (!is_null($limit)) {
-          $query .= "
+		if (!is_null($limit)) {
+		  $query .= "
           LIMIT {$offset}, {$limit}";
-        }
-
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query);
-    }
-
-    /**
-     * @param integer $entryId
-     *
-     * @return array|false
-     */
-    public function getEntryByEntryId($entryId)
-    {
-        $query = "
+		}
+
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query);
+	}
+
+	/**
+	 * @param integer $entryId
+	 *
+	 * @return array|false
+	 */
+	public function getEntryByEntryId($entryId)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`dailymile`
             WHERE `entry_id` = :entry_id
             LIMIT 1";
 
-        $bindings = [
-            'entry_id' => $entryId,
-        ];
+		$bindings = [
+			'entry_id' => $entryId,
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchOne($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchOne($query, $bindings);
+	}
 
-    public function getDailyMilesUpdatedSince(DateTime $datetime)
-    {
-        $query = "
+	public function getDailyMilesUpdatedSince(DateTime $datetime)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`dailymile`
             WHERE `updated_at` >= :last_update";
 
-        $bindings = [
-            'last_update' => $datetime->format('Y-m-d H:i:s'),
-        ];
-
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query, $bindings);
-    }
-
-    /**
-     * @param integer  $entryId
-     * @param string   $entryType
-     * @param DateTime $datetime
-     * @param array    $metadata
-     *
-     * @return
-     */
-    public function insertEntry($entryId, $entryType, DateTime $datetime, array $metadata)
-    {
-        $query = "
+		$bindings = [
+			'last_update' => $datetime->format('Y-m-d H:i:s'),
+		];
+
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query, $bindings);
+	}
+
+	/**
+	 * @param integer  $entryId
+	 * @param string   $entryType
+	 * @param DateTime $datetime
+	 * @param array    $metadata
+	 *
+	 * @return
+	 */
+	public function insertEntry($entryId, $entryType, DateTime $datetime, array $metadata)
+	{
+		$query = "
             INSERT INTO `jpemeric_stream`.`dailymile`
                 (`entry_id`, `type`, `datetime`, `metadata`)
             VALUES
                 (:entry_id, :entry_type, :datetime, :metadata)";
 
-        $bindings = [
-            'entry_id' => $entryId,
-            'entry_type' => $entryType,
-            'datetime' => $datetime->format('Y-m-d H:i:s'),
-            'metadata' => json_encode($metadata),
-        ];
-
-        return $this
-            ->connections
-            ->getWrite()
-            ->perform($query, $bindings);
-    }
+		$bindings = [
+			'entry_id' => $entryId,
+			'entry_type' => $entryType,
+			'datetime' => $datetime->format('Y-m-d H:i:s'),
+			'metadata' => json_encode($metadata),
+		];
+
+		return $this
+			->connections
+			->getWrite()
+			->perform($query, $bindings);
+	}
 }

src/Domain/Stream/Goodread/MysqlGoodreadRepository.php

Indentation +65 added lines, -65 removed lines

@@ -8,93 +8,93 @@
 class MysqlGoodreadRepository implements GoodreadRepositoryInterface
 {
 
-    /** @var  ConnectionLocator */
-    protected $connections;
-
-    /**
-     * @param ConnectonLocator $connections
-     */
-    public function __construct(ConnectionLocator $connections)
-    {
-        $this->connections = $connections;
-    }
-
-    /**
-     * @param integer $limit
-     * @param integer $offset
-     *
-     * @return array|false
-     */
-    public function getReviews($limit = null, $offset = 0)
-    {
-        $query = "
+	/** @var  ConnectionLocator */
+	protected $connections;
+
+	/**
+	 * @param ConnectonLocator $connections
+	 */
+	public function __construct(ConnectionLocator $connections)
+	{
+		$this->connections = $connections;
+	}
+
+	/**
+	 * @param integer $limit
+	 * @param integer $offset
+	 *
+	 * @return array|false
+	 */
+	public function getReviews($limit = null, $offset = 0)
+	{
+		$query = "
             SELECT `id`, `permalink`, `datetime`
             FROM `jpemeric_stream`.`goodread`
             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);
+	}
 
-    public function getReviewByPermalink($permalink)
-    {
-        $query = "
+	public function getReviewByPermalink($permalink)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`goodread`
             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 getGoodreadsUpdatedSince(DateTime $datetime)
-    {
-        $query = "
+	public function getGoodreadsUpdatedSince(DateTime $datetime)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`goodread`
             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 insertReview($permalink, $bookId, DateTime $datetime, array $metadata)
-    {
-        $query = "
+	public function insertReview($permalink, $bookId, DateTime $datetime, array $metadata)
+	{
+		$query = "
             INSERT INTO `jpemeric_stream`.`goodread`
                 (`permalink`, `book_id`, `datetime`, `metadata`)
             VALUES
                 (:permalink, :book_id, :datetime, :metadata)";
 
-        $bindings = [
-            'permalink' => $permalink,
-            'book_id' => $bookId,
-            'datetime' => $datetime->format('Y-m-d H:i:s'),
-            'metadata' => json_encode($metadata),
-        ];
-
-        return $this
-            ->connections
-            ->getWrite()
-            ->perform($query, $bindings);
-    }
+		$bindings = [
+			'permalink' => $permalink,
+			'book_id' => $bookId,
+			'datetime' => $datetime->format('Y-m-d H:i:s'),
+			'metadata' => json_encode($metadata),
+		];
+
+		return $this
+			->connections
+			->getWrite()
+			->perform($query, $bindings);
+	}
 }

src/Domain/Stream/Github/MysqlGithubRepository.php

Indentation +75 added lines, -75 removed lines

@@ -8,104 +8,104 @@
 class MysqlGithubRepository implements GithubRepositoryInterface
 {
 
-    /** @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;
+	}
 
-    /**
-     * @param integer $limit
-     * @param integer $offset
-     *
-     * @return array|false
-     */
-    public function getEvents($limit = null, $offset = 0)
-    {
-        $query = "
+	/**
+	 * @param integer $limit
+	 * @param integer $offset
+	 *
+	 * @return array|false
+	 */
+	public function getEvents($limit = null, $offset = 0)
+	{
+		$query = "
             SELECT `id`, `event_id`, `datetime`
             FROM `jpemeric_stream`.`github`
             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 integer $eventId
-     *
-     * @return array|false
-     */
-    public function getEventByEventId($eventId)
-    {
-        $query = "
+	/**
+	 * @param integer $eventId
+	 *
+	 * @return array|false
+	 */
+	public function getEventByEventId($eventId)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`github`
             WHERE `event_id` = :event_id
             LIMIT 1";
 
-        $bindings = [
-            'event_id' => $eventId,
-        ];
+		$bindings = [
+			'event_id' => $eventId,
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchOne($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchOne($query, $bindings);
+	}
 
-    public function getGithubsUpdatedSince(DateTime $datetime)
-    {
-        $query = "
+	public function getGithubsUpdatedSince(DateTime $datetime)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`github`
             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);
+	}
 
-    /**
-     * @param integer  $eventId
-     * @param string   $eventType
-     * @param DateTime $datetime
-     * @param array    $metadata
-     *
-     * @return
-     */
-    public function insertEvent($eventId, $eventType, DateTime $datetime, array $metadata)
-    {
-        $query = "
+	/**
+	 * @param integer  $eventId
+	 * @param string   $eventType
+	 * @param DateTime $datetime
+	 * @param array    $metadata
+	 *
+	 * @return
+	 */
+	public function insertEvent($eventId, $eventType, DateTime $datetime, array $metadata)
+	{
+		$query = "
             INSERT INTO `jpemeric_stream`.`github`
                 (`event_id`, `type`, `datetime`, `metadata`)
             VALUES
                 (:event_id, :event_type, :datetime, :metadata)";
 
-        $bindings = [
-            'event_id' => $eventId,
-            'event_type' => $eventType,
-            'datetime' => $datetime->format('Y-m-d H:i:s'),
-            'metadata' => json_encode($metadata),
-        ];
+		$bindings = [
+			'event_id' => $eventId,
+			'event_type' => $eventType,
+			'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);
+	}
 }

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