@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | 'date' => date('Y'))); |
| 39 | 39 | |
| 40 | 40 | Loader::loadInstance('utility', 'Database'); |
| 41 | - if(Database::isConnected() === false) |
|
| 41 | + if (Database::isConnected() === false) |
|
| 42 | 42 | $this->unavailable(); |
| 43 | 43 | } |
| 44 | 44 | |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | $post_result = $activityRepository->getActivities(5); |
| 64 | 64 | |
| 65 | 65 | $post_array = array(); |
| 66 | - foreach($post_result as $row) { |
|
| 66 | + foreach ($post_result as $row) { |
|
| 67 | 67 | array_push($post_array, $this->expand_post($row)); |
| 68 | 68 | } |
| 69 | 69 | |
@@ -99,9 +99,9 @@ discard block |
||
| 99 | 99 | $headers = $this->headers; |
| 100 | 100 | Header::$headers(); |
| 101 | 101 | Loader::load('view', '/Head', $this->data_array['head']); |
| 102 | - foreach($this->body_view_array as $view) |
|
| 102 | + foreach ($this->body_view_array as $view) |
|
| 103 | 103 | { |
| 104 | - if(substr($view, 0, 1) == '/') |
|
| 104 | + if (substr($view, 0, 1) == '/') |
|
| 105 | 105 | Loader::load('view', $view, $this->data_array['body']); |
| 106 | 106 | else |
| 107 | 107 | Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']); |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE)); |
| 114 | 114 | } |
| 115 | 115 | |
| 116 | - if($view == '/404' || $view == '/503') |
|
| 116 | + if ($view == '/404' || $view == '/503') |
|
| 117 | 117 | exit; |
| 118 | 118 | } |
| 119 | 119 | |
@@ -169,10 +169,10 @@ discard block |
||
| 169 | 169 | |
| 170 | 170 | private function load_assets() |
| 171 | 171 | { |
| 172 | - $css_array = array_map(function ($stylesheet) { |
|
| 172 | + $css_array = array_map(function($stylesheet) { |
|
| 173 | 173 | return "/css/{$stylesheet}.css"; |
| 174 | 174 | }, $this->css_array); |
| 175 | - $js_array = array_map(function ($script) { |
|
| 175 | + $js_array = array_map(function($script) { |
|
| 176 | 176 | if (substr($script, 0, 4) == 'http') { |
| 177 | 177 | return $script; |
| 178 | 178 | } |
@@ -190,26 +190,26 @@ discard block |
||
| 190 | 190 | |
| 191 | 191 | protected function eject() |
| 192 | 192 | { |
| 193 | - if(get_class($this) !== 'Error404Controller') |
|
| 193 | + if (get_class($this) !== 'Error404Controller') |
|
| 194 | 194 | Loader::loadNew('controller', '/Error404Controller')->activate(); |
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | protected function unavailable() |
| 198 | 198 | { |
| 199 | - if(get_class($this) !== 'Error503Controller') |
|
| 199 | + if (get_class($this) !== 'Error503Controller') |
|
| 200 | 200 | Loader::loadNew('controller', '/Error503Controller')->activate(); |
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | protected function redirect($uri, $method = 301) |
| 204 | 204 | { |
| 205 | - switch($method) |
|
| 205 | + switch ($method) |
|
| 206 | 206 | { |
| 207 | 207 | case 301 : |
| 208 | - if(get_class($this) !== 'Error301Controller') |
|
| 208 | + if (get_class($this) !== 'Error301Controller') |
|
| 209 | 209 | Loader::loadNew('controller', '/Error301Controller', array($uri))->activate(); |
| 210 | 210 | break; |
| 211 | 211 | case 303 : |
| 212 | - if(get_class($this) !== 'Error303Controller') |
|
| 212 | + if (get_class($this) !== 'Error303Controller') |
|
| 213 | 213 | Loader::loadNew('controller', '/Error303Controller', array($uri))->activate(); |
| 214 | 214 | break; |
| 215 | 215 | } |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | private $comment_errors; |
| 230 | 230 | protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title) |
| 231 | 231 | { |
| 232 | - if(Request::hasPost() && Request::getPost('submit') == 'Submit Comment') |
|
| 232 | + if (Request::hasPost() && Request::getPost('submit') == 'Submit Comment') |
|
| 233 | 233 | { |
| 234 | 234 | $parameters = array($site_id, $path, $redirect_url, $page_title); |
| 235 | 235 | $this->comment_errors = Loader::loadNew('module', 'form/CommentSubmitModule', $parameters)->activate(); |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | $comment_array = array(); |
| 248 | 248 | $comment_result = CommentCollector::getCommentsForURL($site, $path, $commenter->id); |
| 249 | 249 | |
| 250 | - foreach($comment_result as $comment) |
|
| 250 | + foreach ($comment_result as $comment) |
|
| 251 | 251 | { |
| 252 | 252 | $comment_object = new stdclass(); |
| 253 | 253 | $comment_object->id = $comment->id; |
@@ -257,12 +257,12 @@ discard block |
||
| 257 | 257 | $comment_object->url = $comment->url; |
| 258 | 258 | $comment_object->trusted = $comment->trusted; |
| 259 | 259 | |
| 260 | - if($comment->reply == 0 && Request::getPost('type') == $comment->id) |
|
| 260 | + if ($comment->reply == 0 && Request::getPost('type') == $comment->id) |
|
| 261 | 261 | $comment_object->errors = $this->comment_errors; |
| 262 | 262 | else |
| 263 | 263 | $comment_object->errors = array(); |
| 264 | 264 | |
| 265 | - if($comment->reply == 0) |
|
| 265 | + if ($comment->reply == 0) |
|
| 266 | 266 | { |
| 267 | 267 | $comment_object->replies = array(); |
| 268 | 268 | $comment_array[$comment->id] = $comment_object; |
@@ -293,21 +293,21 @@ discard block |
||
| 293 | 293 | $commenter->website = ''; |
| 294 | 294 | |
| 295 | 295 | $commenter_cookie = Cookie::instance('Commenter'); |
| 296 | - if(!$commenter_cookie->exists()) |
|
| 296 | + if (!$commenter_cookie->exists()) |
|
| 297 | 297 | return $commenter; |
| 298 | 298 | |
| 299 | 299 | $commenter_cookie_value = $commenter_cookie->getValue(); |
| 300 | 300 | $commenter_cookie_value = json_decode($commenter_cookie_value); |
| 301 | 301 | |
| 302 | - if($commenter_cookie_value === NULL) |
|
| 302 | + if ($commenter_cookie_value === NULL) |
|
| 303 | 303 | return $commenter; |
| 304 | 304 | |
| 305 | - if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email)) |
|
| 305 | + if (!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email)) |
|
| 306 | 306 | return $commenter; |
| 307 | 307 | |
| 308 | 308 | $commenter_object = CommentCollector::getCommenterByFields($commenter_cookie_value->name, $commenter_cookie_value->email, (isset($commenter_cookie_value->website) ? $commenter_cookie_value->website : '')); |
| 309 | 309 | |
| 310 | - if($commenter_object === NULL) |
|
| 310 | + if ($commenter_object === NULL) |
|
| 311 | 311 | return $commenter; |
| 312 | 312 | |
| 313 | 313 | $commenter->id = $commenter_object->id; |
@@ -56,37 +56,37 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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); |
@@ -10,10 +10,10 @@ |
||
| 10 | 10 | |
| 11 | 11 | public function __construct() |
| 12 | 12 | { |
| 13 | - parent::__construct(); |
|
| 13 | + parent::__construct(); |
|
| 14 | 14 | |
| 15 | - global $container; |
|
| 16 | - $this->activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']); |
|
| 15 | + global $container; |
|
| 16 | + $this->activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']); |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | protected function set_head_data() |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | |
| 46 | 46 | protected function get_list_results() |
| 47 | 47 | { |
| 48 | - return $this->activityRepository->getActivities(self::$POSTS_PER_PAGE, $this->offset); |
|
| 48 | + return $this->activityRepository->getActivities(self::$POSTS_PER_PAGE, $this->offset); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | protected function get_list_description() |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | * @param string $domain |
| 27 | 27 | * @return boolean |
| 28 | 28 | */ |
| 29 | -$buildSitemap = function (array $entries, $domain, $folder) { |
|
| 29 | +$buildSitemap = function(array $entries, $domain, $folder) { |
|
| 30 | 30 | $urlSet = new Urlset(); |
| 31 | 31 | foreach ($entries as $path => $entry) { |
| 32 | 32 | $url = new Url("{$domain}{$path}"); // todo better detection of domain by env |
@@ -53,13 +53,13 @@ discard block |
||
| 53 | 53 | /********************************************* |
| 54 | 54 | * blog.jacobemerick.com |
| 55 | 55 | *********************************************/ |
| 56 | -$reduceToMostRecentBlogPost = function ($recentPost, $post) { |
|
| 56 | +$reduceToMostRecentBlogPost = function($recentPost, $post) { |
|
| 57 | 57 | if (is_null($recentPost)) { |
| 58 | 58 | return $post; |
| 59 | 59 | } |
| 60 | 60 | $postDate = new DateTime($post['date']); |
| 61 | 61 | $recentPostDate = new DateTime($recentPost['date']); |
| 62 | - return ($postDate > $recentPostDate) ? $post: $recentPost; |
|
| 62 | + return ($postDate > $recentPostDate) ? $post : $recentPost; |
|
| 63 | 63 | }; |
| 64 | 64 | |
| 65 | 65 | $blogPostsPerPage = 10; |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | ]; |
| 95 | 95 | |
| 96 | 96 | foreach ($blogCategoryArray as $blogCategory) { |
| 97 | - $blogCategoryPosts = array_filter($activeBlogPosts, function ($post) use ($blogCategory) { |
|
| 97 | + $blogCategoryPosts = array_filter($activeBlogPosts, function($post) use ($blogCategory) { |
|
| 98 | 98 | return $post['category'] == $blogCategory; |
| 99 | 99 | }); |
| 100 | 100 | $mostRecentBlogCategoryPost = array_reduce($blogCategoryPosts, $reduceToMostRecentBlogPost); |
@@ -207,13 +207,13 @@ discard block |
||
| 207 | 207 | /********************************************* |
| 208 | 208 | * lifestream.jacobemerick.com |
| 209 | 209 | *********************************************/ |
| 210 | -$reduceToMostRecentStreamActivity = function ($recentActivity, $activity) { |
|
| 210 | +$reduceToMostRecentStreamActivity = function($recentActivity, $activity) { |
|
| 211 | 211 | if (is_null($recentActivity)) { |
| 212 | 212 | return $activity; |
| 213 | 213 | } |
| 214 | 214 | $activityDate = new DateTime($activity['datetime']); |
| 215 | 215 | $recentActivityDate = new DateTime($recentActivity['datetime']); |
| 216 | - return ($activityDate > $recentActivityDate) ? $activity: $recentActivity; |
|
| 216 | + return ($activityDate > $recentActivityDate) ? $activity : $recentActivity; |
|
| 217 | 217 | }; |
| 218 | 218 | |
| 219 | 219 | $streamActivitiesPerPage = 15; |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | ]; |
| 252 | 252 | |
| 253 | 253 | foreach ($streamTypeArray as $streamType) { |
| 254 | - $streamTypeActivities = array_filter($streamActivities, function ($post) use ($streamType) { |
|
| 254 | + $streamTypeActivities = array_filter($streamActivities, function($post) use ($streamType) { |
|
| 255 | 255 | return $post['type'] == $streamType; |
| 256 | 256 | }); |
| 257 | 257 | $mostRecentStreamTypeActivity = array_reduce($streamTypeActivities, $reduceToMostRecentStreamActivity); |
@@ -385,13 +385,13 @@ discard block |
||
| 385 | 385 | /********************************************* |
| 386 | 386 | * www.waterfallofthekeweenaw.com |
| 387 | 387 | *********************************************/ |
| 388 | -$reduceToMostRecentJournalLog = function ($recentLog, $log) { |
|
| 388 | +$reduceToMostRecentJournalLog = function($recentLog, $log) { |
|
| 389 | 389 | if (is_null($recentLog)) { |
| 390 | 390 | return $log; |
| 391 | 391 | } |
| 392 | 392 | $logDate = new DateTime($log['publish_date']); |
| 393 | 393 | $recentLogDate = new DateTime($recentLog['publish_date']); |
| 394 | - return ($logDate > $recentLogDate) ? log: $recentLog; |
|
| 394 | + return ($logDate > $recentLogDate) ? log : $recentLog; |
|
| 395 | 395 | }; |
| 396 | 396 | |
| 397 | 397 | $waterfallRepository = new WaterfallRepository($container['db_connection_locator']); |
@@ -27,26 +27,26 @@ discard block |
||
| 27 | 27 | * @return boolean |
| 28 | 28 | */ |
| 29 | 29 | $buildSitemap = function (array $entries, $domain, $folder) { |
| 30 | - $urlSet = new Urlset(); |
|
| 31 | - foreach ($entries as $path => $entry) { |
|
| 32 | - $url = new Url("{$domain}{$path}"); // todo better detection of domain by env |
|
| 33 | - $url->setLastMod($entry['lastmod']); // todo check if exists |
|
| 34 | - $url->setChangeFreq($entry['changefreq']); // todo check if exists |
|
| 35 | - $url->setPriority($entry['priority']); // todo check if exists |
|
| 36 | - $urlSet->addUrl($url); |
|
| 37 | - } |
|
| 38 | - |
|
| 39 | - $output = new Output(); |
|
| 40 | - $output->setIndentString(' '); // change indentation from 4 to 2 spaces |
|
| 41 | - |
|
| 42 | - $tempSitemap = __DIR__ . "/../../public/{$folder}/sitemap-new.xml"; |
|
| 43 | - $finalSitemap = __DIR__ . "/../../public/{$folder}/sitemap.xml"; |
|
| 44 | - |
|
| 45 | - $sitemapHandle = fopen($tempSitemap, 'w'); |
|
| 46 | - fwrite($sitemapHandle, $output->getOutput($urlSet)); |
|
| 47 | - fclose($sitemapHandle); |
|
| 48 | - |
|
| 49 | - rename($tempSitemap, $finalSitemap); |
|
| 30 | + $urlSet = new Urlset(); |
|
| 31 | + foreach ($entries as $path => $entry) { |
|
| 32 | + $url = new Url("{$domain}{$path}"); // todo better detection of domain by env |
|
| 33 | + $url->setLastMod($entry['lastmod']); // todo check if exists |
|
| 34 | + $url->setChangeFreq($entry['changefreq']); // todo check if exists |
|
| 35 | + $url->setPriority($entry['priority']); // todo check if exists |
|
| 36 | + $urlSet->addUrl($url); |
|
| 37 | + } |
|
| 38 | + |
|
| 39 | + $output = new Output(); |
|
| 40 | + $output->setIndentString(' '); // change indentation from 4 to 2 spaces |
|
| 41 | + |
|
| 42 | + $tempSitemap = __DIR__ . "/../../public/{$folder}/sitemap-new.xml"; |
|
| 43 | + $finalSitemap = __DIR__ . "/../../public/{$folder}/sitemap.xml"; |
|
| 44 | + |
|
| 45 | + $sitemapHandle = fopen($tempSitemap, 'w'); |
|
| 46 | + fwrite($sitemapHandle, $output->getOutput($urlSet)); |
|
| 47 | + fclose($sitemapHandle); |
|
| 48 | + |
|
| 49 | + rename($tempSitemap, $finalSitemap); |
|
| 50 | 50 | }; |
| 51 | 51 | |
| 52 | 52 | |
@@ -54,12 +54,12 @@ discard block |
||
| 54 | 54 | * blog.jacobemerick.com |
| 55 | 55 | *********************************************/ |
| 56 | 56 | $reduceToMostRecentBlogPost = function ($recentPost, $post) { |
| 57 | - if (is_null($recentPost)) { |
|
| 58 | - return $post; |
|
| 59 | - } |
|
| 60 | - $postDate = new DateTime($post['date']); |
|
| 61 | - $recentPostDate = new DateTime($recentPost['date']); |
|
| 62 | - return ($postDate > $recentPostDate) ? $post: $recentPost; |
|
| 57 | + if (is_null($recentPost)) { |
|
| 58 | + return $post; |
|
| 59 | + } |
|
| 60 | + $postDate = new DateTime($post['date']); |
|
| 61 | + $recentPostDate = new DateTime($recentPost['date']); |
|
| 62 | + return ($postDate > $recentPostDate) ? $post: $recentPost; |
|
| 63 | 63 | }; |
| 64 | 64 | |
| 65 | 65 | $blogPostsPerPage = 10; |
@@ -70,107 +70,107 @@ discard block |
||
| 70 | 70 | |
| 71 | 71 | // todo these post-level dates should be accurate to H:i:s |
| 72 | 72 | $entryArray = [ |
| 73 | - '/' => [ |
|
| 74 | - 'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'), |
|
| 75 | - 'changefreq' => 'daily', |
|
| 76 | - 'priority' => .9, |
|
| 77 | - ] |
|
| 73 | + '/' => [ |
|
| 74 | + 'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'), |
|
| 75 | + 'changefreq' => 'daily', |
|
| 76 | + 'priority' => .9, |
|
| 77 | + ] |
|
| 78 | 78 | ]; |
| 79 | 79 | for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($activeBlogPosts); $i++) { |
| 80 | - $entryKey = "/{$i}/"; |
|
| 81 | - $entryArray += [ |
|
| 82 | - $entryKey => [ |
|
| 83 | - 'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'), |
|
| 84 | - 'changefreq' => 'daily', |
|
| 85 | - 'priority' => .1, |
|
| 86 | - ] |
|
| 87 | - ]; |
|
| 80 | + $entryKey = "/{$i}/"; |
|
| 81 | + $entryArray += [ |
|
| 82 | + $entryKey => [ |
|
| 83 | + 'lastmod' => (new DateTime($mostRecentBlogPost['date']))->format('Y-m-d'), |
|
| 84 | + 'changefreq' => 'daily', |
|
| 85 | + 'priority' => .1, |
|
| 86 | + ] |
|
| 87 | + ]; |
|
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | $blogCategoryArray = [ |
| 91 | - 'hiking', |
|
| 92 | - 'personal', |
|
| 93 | - 'web-development', |
|
| 91 | + 'hiking', |
|
| 92 | + 'personal', |
|
| 93 | + 'web-development', |
|
| 94 | 94 | ]; |
| 95 | 95 | |
| 96 | 96 | foreach ($blogCategoryArray as $blogCategory) { |
| 97 | - $blogCategoryPosts = array_filter($activeBlogPosts, function ($post) use ($blogCategory) { |
|
| 98 | - return $post['category'] == $blogCategory; |
|
| 99 | - }); |
|
| 100 | - $mostRecentBlogCategoryPost = array_reduce($blogCategoryPosts, $reduceToMostRecentBlogPost); |
|
| 101 | - |
|
| 102 | - $entryKey = "/{$blogCategory}/"; |
|
| 103 | - $entryArray += [ |
|
| 104 | - $entryKey => [ |
|
| 105 | - 'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'), |
|
| 106 | - 'changefreq' => 'daily', |
|
| 107 | - 'priority' => .3, |
|
| 108 | - ] |
|
| 109 | - ]; |
|
| 110 | - |
|
| 111 | - for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogCategoryPosts); $i++) { |
|
| 112 | - $entryKey = "/{$blogCategory}/{$i}/"; |
|
| 113 | - $entryArray += [ |
|
| 114 | - $entryKey => [ |
|
| 115 | - 'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'), |
|
| 116 | - 'changefreq' => 'daily', |
|
| 117 | - 'priority' => .1, |
|
| 118 | - ] |
|
| 119 | - ]; |
|
| 120 | - } |
|
| 97 | + $blogCategoryPosts = array_filter($activeBlogPosts, function ($post) use ($blogCategory) { |
|
| 98 | + return $post['category'] == $blogCategory; |
|
| 99 | + }); |
|
| 100 | + $mostRecentBlogCategoryPost = array_reduce($blogCategoryPosts, $reduceToMostRecentBlogPost); |
|
| 101 | + |
|
| 102 | + $entryKey = "/{$blogCategory}/"; |
|
| 103 | + $entryArray += [ |
|
| 104 | + $entryKey => [ |
|
| 105 | + 'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'), |
|
| 106 | + 'changefreq' => 'daily', |
|
| 107 | + 'priority' => .3, |
|
| 108 | + ] |
|
| 109 | + ]; |
|
| 110 | + |
|
| 111 | + for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogCategoryPosts); $i++) { |
|
| 112 | + $entryKey = "/{$blogCategory}/{$i}/"; |
|
| 113 | + $entryArray += [ |
|
| 114 | + $entryKey => [ |
|
| 115 | + 'lastmod' => (new DateTime($mostRecentBlogCategoryPost['date']))->format('Y-m-d'), |
|
| 116 | + 'changefreq' => 'daily', |
|
| 117 | + 'priority' => .1, |
|
| 118 | + ] |
|
| 119 | + ]; |
|
| 120 | + } |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | $blogTagRepository = new BlogTagRepository($container['db_connection_locator']); |
| 124 | 124 | $blogTags = $blogTagRepository->getAllTags(); |
| 125 | 125 | foreach ($blogTags as $blogTag) { |
| 126 | - $blogPostsWithTag = $blogPostRepository->getActivePostsByTag($blogTag['id']); |
|
| 127 | - if (count($blogPostsWithTag) < 1) { |
|
| 128 | - continue; |
|
| 129 | - } |
|
| 130 | - |
|
| 131 | - $mostRecentBlogTagPost = array_reduce($blogPostsWithTag, $reduceToMostRecentBlogPost); |
|
| 132 | - |
|
| 133 | - $blogTagPath = str_replace(' ', '-', $blogTag['tag']); |
|
| 134 | - $entryKey = "/tag/{$blogTagPath}/"; |
|
| 135 | - $entryArray += [ |
|
| 136 | - $entryKey => [ |
|
| 137 | - 'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'), |
|
| 138 | - 'changefreq' => 'daily', |
|
| 139 | - 'priority' => .1, |
|
| 140 | - ] |
|
| 141 | - ]; |
|
| 142 | - |
|
| 143 | - for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogPostsWithTag); $i++) { |
|
| 144 | - $blogTagPath = str_replace(' ', '-', $blogTag['tag']); |
|
| 145 | - $entryKey = "/tag/{$blogTagPath}/{$i}/"; |
|
| 146 | - $entryArray += [ |
|
| 147 | - $entryKey => [ |
|
| 148 | - 'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'), |
|
| 149 | - 'changefreq' => 'daily', |
|
| 150 | - 'priority' => .1, |
|
| 151 | - ] |
|
| 152 | - ]; |
|
| 153 | - } |
|
| 126 | + $blogPostsWithTag = $blogPostRepository->getActivePostsByTag($blogTag['id']); |
|
| 127 | + if (count($blogPostsWithTag) < 1) { |
|
| 128 | + continue; |
|
| 129 | + } |
|
| 130 | + |
|
| 131 | + $mostRecentBlogTagPost = array_reduce($blogPostsWithTag, $reduceToMostRecentBlogPost); |
|
| 132 | + |
|
| 133 | + $blogTagPath = str_replace(' ', '-', $blogTag['tag']); |
|
| 134 | + $entryKey = "/tag/{$blogTagPath}/"; |
|
| 135 | + $entryArray += [ |
|
| 136 | + $entryKey => [ |
|
| 137 | + 'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'), |
|
| 138 | + 'changefreq' => 'daily', |
|
| 139 | + 'priority' => .1, |
|
| 140 | + ] |
|
| 141 | + ]; |
|
| 142 | + |
|
| 143 | + for ($i = 2; (($i - 1) * $blogPostsPerPage) < count($blogPostsWithTag); $i++) { |
|
| 144 | + $blogTagPath = str_replace(' ', '-', $blogTag['tag']); |
|
| 145 | + $entryKey = "/tag/{$blogTagPath}/{$i}/"; |
|
| 146 | + $entryArray += [ |
|
| 147 | + $entryKey => [ |
|
| 148 | + 'lastmod' => (new DateTime($mostRecentBlogTagPost['date']))->format('Y-m-d'), |
|
| 149 | + 'changefreq' => 'daily', |
|
| 150 | + 'priority' => .1, |
|
| 151 | + ] |
|
| 152 | + ]; |
|
| 153 | + } |
|
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | $reversedBlogPosts = array_reverse($activeBlogPosts); |
| 157 | 157 | foreach ($reversedBlogPosts as $blogPost) { |
| 158 | - $entryKey = "/{$blogPost['category']}/{$blogPost['path']}/"; |
|
| 159 | - $entryArray += [ |
|
| 160 | - $entryKey => [ |
|
| 161 | - 'lastmod' => (new DateTime($blogPost['date']))->format('Y-m-d'), // todo this should be based on comment |
|
| 162 | - 'changefreq' => 'weekly', |
|
| 163 | - 'priority' => .8, |
|
| 164 | - ], |
|
| 165 | - ]; |
|
| 158 | + $entryKey = "/{$blogPost['category']}/{$blogPost['path']}/"; |
|
| 159 | + $entryArray += [ |
|
| 160 | + $entryKey => [ |
|
| 161 | + 'lastmod' => (new DateTime($blogPost['date']))->format('Y-m-d'), // todo this should be based on comment |
|
| 162 | + 'changefreq' => 'weekly', |
|
| 163 | + 'priority' => .8, |
|
| 164 | + ], |
|
| 165 | + ]; |
|
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | $entryArray += [ |
| 169 | - '/about/' => [ |
|
| 170 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 171 | - 'changefreq' => 'monthly', |
|
| 172 | - 'priority' => .2, |
|
| 173 | - ] |
|
| 169 | + '/about/' => [ |
|
| 170 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 171 | + 'changefreq' => 'monthly', |
|
| 172 | + 'priority' => .2, |
|
| 173 | + ] |
|
| 174 | 174 | ]; |
| 175 | 175 | |
| 176 | 176 | $buildSitemap($entryArray, 'http://blog.jacobemerick.com', 'blog'); |
@@ -184,21 +184,21 @@ discard block |
||
| 184 | 184 | $mostRecentPost = current($mostRecentPost); |
| 185 | 185 | |
| 186 | 186 | $entryArray = [ |
| 187 | - '/' => [ |
|
| 188 | - 'lastmod' => (new DateTime($mostRecentPost['date']))->format('Y-m-d'), |
|
| 189 | - 'changefreq' => 'daily', |
|
| 190 | - 'priority' => 1, |
|
| 191 | - ], |
|
| 192 | - '/about/' => [ |
|
| 193 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 194 | - 'changefreq' => 'monthly', |
|
| 195 | - 'priority' => .4, |
|
| 196 | - ], |
|
| 197 | - '/contact/' => [ |
|
| 198 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 199 | - 'changefreq' => 'monthly', |
|
| 200 | - 'priority' => .3, |
|
| 201 | - ], |
|
| 187 | + '/' => [ |
|
| 188 | + 'lastmod' => (new DateTime($mostRecentPost['date']))->format('Y-m-d'), |
|
| 189 | + 'changefreq' => 'daily', |
|
| 190 | + 'priority' => 1, |
|
| 191 | + ], |
|
| 192 | + '/about/' => [ |
|
| 193 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 194 | + 'changefreq' => 'monthly', |
|
| 195 | + 'priority' => .4, |
|
| 196 | + ], |
|
| 197 | + '/contact/' => [ |
|
| 198 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 199 | + 'changefreq' => 'monthly', |
|
| 200 | + 'priority' => .3, |
|
| 201 | + ], |
|
| 202 | 202 | ]; |
| 203 | 203 | |
| 204 | 204 | $buildSitemap($entryArray, 'http://home.jacobemerick.com', 'home'); |
@@ -208,12 +208,12 @@ discard block |
||
| 208 | 208 | * lifestream.jacobemerick.com |
| 209 | 209 | *********************************************/ |
| 210 | 210 | $reduceToMostRecentStreamActivity = function ($recentActivity, $activity) { |
| 211 | - if (is_null($recentActivity)) { |
|
| 212 | - return $activity; |
|
| 213 | - } |
|
| 214 | - $activityDate = new DateTime($activity['datetime']); |
|
| 215 | - $recentActivityDate = new DateTime($recentActivity['datetime']); |
|
| 216 | - return ($activityDate > $recentActivityDate) ? $activity: $recentActivity; |
|
| 211 | + if (is_null($recentActivity)) { |
|
| 212 | + return $activity; |
|
| 213 | + } |
|
| 214 | + $activityDate = new DateTime($activity['datetime']); |
|
| 215 | + $recentActivityDate = new DateTime($recentActivity['datetime']); |
|
| 216 | + return ($activityDate > $recentActivityDate) ? $activity: $recentActivity; |
|
| 217 | 217 | }; |
| 218 | 218 | |
| 219 | 219 | $streamActivitiesPerPage = 15; |
@@ -223,78 +223,78 @@ discard block |
||
| 223 | 223 | $mostRecentStreamActivity = array_reduce($streamActivities, $reduceToMostRecentStreamActivity); |
| 224 | 224 | |
| 225 | 225 | $entryArray = [ |
| 226 | - '/' => [ |
|
| 227 | - 'lastmod' => (new DateTime($mostRecentStreamActivity['datetime']))->format('c'), |
|
| 228 | - 'changefreq' => 'hourly', |
|
| 229 | - 'priority' => .9, |
|
| 230 | - ] |
|
| 226 | + '/' => [ |
|
| 227 | + 'lastmod' => (new DateTime($mostRecentStreamActivity['datetime']))->format('c'), |
|
| 228 | + 'changefreq' => 'hourly', |
|
| 229 | + 'priority' => .9, |
|
| 230 | + ] |
|
| 231 | 231 | ]; |
| 232 | 232 | for ($i = 2; (($i - 1) * $streamActivitiesPerPage) < count($streamActivities); $i++) { |
| 233 | - $entryKey = "/page/{$i}/"; |
|
| 234 | - $entryArray += [ |
|
| 235 | - $entryKey => [ |
|
| 236 | - 'lastmod' => (new DateTime($mostRecentStreamActivity['datetime']))->format('c'), |
|
| 237 | - 'changefreq' => 'hourly', |
|
| 238 | - 'priority' => .1, |
|
| 239 | - ] |
|
| 240 | - ]; |
|
| 233 | + $entryKey = "/page/{$i}/"; |
|
| 234 | + $entryArray += [ |
|
| 235 | + $entryKey => [ |
|
| 236 | + 'lastmod' => (new DateTime($mostRecentStreamActivity['datetime']))->format('c'), |
|
| 237 | + 'changefreq' => 'hourly', |
|
| 238 | + 'priority' => .1, |
|
| 239 | + ] |
|
| 240 | + ]; |
|
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | $streamTypeArray = [ |
| 244 | - 'blog', |
|
| 245 | - 'books', |
|
| 246 | - 'distance', |
|
| 247 | - 'github', |
|
| 248 | - 'hulu', |
|
| 249 | - 'twitter', |
|
| 250 | - 'youtube', |
|
| 244 | + 'blog', |
|
| 245 | + 'books', |
|
| 246 | + 'distance', |
|
| 247 | + 'github', |
|
| 248 | + 'hulu', |
|
| 249 | + 'twitter', |
|
| 250 | + 'youtube', |
|
| 251 | 251 | ]; |
| 252 | 252 | |
| 253 | 253 | foreach ($streamTypeArray as $streamType) { |
| 254 | - $streamTypeActivities = array_filter($streamActivities, function ($post) use ($streamType) { |
|
| 255 | - return $post['type'] == $streamType; |
|
| 256 | - }); |
|
| 257 | - $mostRecentStreamTypeActivity = array_reduce($streamTypeActivities, $reduceToMostRecentStreamActivity); |
|
| 258 | - |
|
| 259 | - $entryKey = "/{$streamType}/"; |
|
| 260 | - $entryArray += [ |
|
| 261 | - $entryKey => [ |
|
| 262 | - 'lastmod' => (new DateTime($mostRecentStreamTypeActivity['datetime']))->format('c'), |
|
| 263 | - 'changefreq' => 'hourly', |
|
| 264 | - 'priority' => .3, |
|
| 265 | - ] |
|
| 266 | - ]; |
|
| 267 | - |
|
| 268 | - for ($i = 2; (($i - 1) * $streamActivitiesPerPage) < count($streamTypeActivities); $i++) { |
|
| 269 | - $entryKey = "/{$streamType}/page/{$i}/"; |
|
| 270 | - $entryArray += [ |
|
| 271 | - $entryKey => [ |
|
| 272 | - 'lastmod' => (new DateTime($mostRecentStreamTypeActivity['datetime']))->format('c'), |
|
| 273 | - 'changefreq' => 'hourly', |
|
| 274 | - 'priority' => .1, |
|
| 275 | - ] |
|
| 276 | - ]; |
|
| 277 | - } |
|
| 254 | + $streamTypeActivities = array_filter($streamActivities, function ($post) use ($streamType) { |
|
| 255 | + return $post['type'] == $streamType; |
|
| 256 | + }); |
|
| 257 | + $mostRecentStreamTypeActivity = array_reduce($streamTypeActivities, $reduceToMostRecentStreamActivity); |
|
| 258 | + |
|
| 259 | + $entryKey = "/{$streamType}/"; |
|
| 260 | + $entryArray += [ |
|
| 261 | + $entryKey => [ |
|
| 262 | + 'lastmod' => (new DateTime($mostRecentStreamTypeActivity['datetime']))->format('c'), |
|
| 263 | + 'changefreq' => 'hourly', |
|
| 264 | + 'priority' => .3, |
|
| 265 | + ] |
|
| 266 | + ]; |
|
| 267 | + |
|
| 268 | + for ($i = 2; (($i - 1) * $streamActivitiesPerPage) < count($streamTypeActivities); $i++) { |
|
| 269 | + $entryKey = "/{$streamType}/page/{$i}/"; |
|
| 270 | + $entryArray += [ |
|
| 271 | + $entryKey => [ |
|
| 272 | + 'lastmod' => (new DateTime($mostRecentStreamTypeActivity['datetime']))->format('c'), |
|
| 273 | + 'changefreq' => 'hourly', |
|
| 274 | + 'priority' => .1, |
|
| 275 | + ] |
|
| 276 | + ]; |
|
| 277 | + } |
|
| 278 | 278 | } |
| 279 | 279 | |
| 280 | 280 | $reversedStreamActivities = array_reverse($streamActivities); |
| 281 | 281 | foreach ($reversedStreamActivities as $streamActivity) { |
| 282 | - $entryKey = "/{$streamActivity['type']}/{$streamActivity['id']}/"; |
|
| 283 | - $entryArray += [ |
|
| 284 | - $entryKey => [ |
|
| 285 | - 'lastmod' => (new DateTime($streamActivity['datetime']))->format('c'), |
|
| 286 | - 'changefreq' => 'never', |
|
| 287 | - 'priority' => .5, |
|
| 288 | - ], |
|
| 289 | - ]; |
|
| 282 | + $entryKey = "/{$streamActivity['type']}/{$streamActivity['id']}/"; |
|
| 283 | + $entryArray += [ |
|
| 284 | + $entryKey => [ |
|
| 285 | + 'lastmod' => (new DateTime($streamActivity['datetime']))->format('c'), |
|
| 286 | + 'changefreq' => 'never', |
|
| 287 | + 'priority' => .5, |
|
| 288 | + ], |
|
| 289 | + ]; |
|
| 290 | 290 | } |
| 291 | 291 | |
| 292 | 292 | $entryArray += [ |
| 293 | - '/about/' => [ |
|
| 294 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 295 | - 'changefreq' => 'monthly', |
|
| 296 | - 'priority' => .7, |
|
| 297 | - ] |
|
| 293 | + '/about/' => [ |
|
| 294 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 295 | + 'changefreq' => 'monthly', |
|
| 296 | + 'priority' => .7, |
|
| 297 | + ] |
|
| 298 | 298 | ]; |
| 299 | 299 | |
| 300 | 300 | $buildSitemap($entryArray, 'http://lifestream.jacobemerick.com', 'lifestream'); |
@@ -307,43 +307,43 @@ discard block |
||
| 307 | 307 | $portfolioPieces = $portfolioRepository->getPieces(); |
| 308 | 308 | |
| 309 | 309 | $entryArray = [ |
| 310 | - '/' => [ |
|
| 311 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 312 | - 'changefreq' => 'weekly', |
|
| 313 | - 'priority' => 1, |
|
| 314 | - ], |
|
| 315 | - '/print/' => [ |
|
| 316 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 317 | - 'changefreq' => 'never', |
|
| 318 | - 'priority' => .1, |
|
| 319 | - ], |
|
| 320 | - '/web/' => [ |
|
| 321 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 322 | - 'changefreq' => 'never', |
|
| 323 | - 'priority' => .1, |
|
| 324 | - ], |
|
| 325 | - '/contact/' => [ |
|
| 326 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 327 | - 'changefreq' => 'never', |
|
| 328 | - 'priority' => .4, |
|
| 329 | - ], |
|
| 330 | - '/resume/' => [ |
|
| 331 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 332 | - 'changefreq' => 'yearly', |
|
| 333 | - 'priority' => .9, |
|
| 334 | - ], |
|
| 310 | + '/' => [ |
|
| 311 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 312 | + 'changefreq' => 'weekly', |
|
| 313 | + 'priority' => 1, |
|
| 314 | + ], |
|
| 315 | + '/print/' => [ |
|
| 316 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 317 | + 'changefreq' => 'never', |
|
| 318 | + 'priority' => .1, |
|
| 319 | + ], |
|
| 320 | + '/web/' => [ |
|
| 321 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 322 | + 'changefreq' => 'never', |
|
| 323 | + 'priority' => .1, |
|
| 324 | + ], |
|
| 325 | + '/contact/' => [ |
|
| 326 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 327 | + 'changefreq' => 'never', |
|
| 328 | + 'priority' => .4, |
|
| 329 | + ], |
|
| 330 | + '/resume/' => [ |
|
| 331 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 332 | + 'changefreq' => 'yearly', |
|
| 333 | + 'priority' => .9, |
|
| 334 | + ], |
|
| 335 | 335 | ]; |
| 336 | 336 | |
| 337 | 337 | foreach ($portfolioPieces as $portfolioPiece) { |
| 338 | - $portfolioCategory = ($portfolioPiece['category'] == 1) ? 'web' : 'print'; |
|
| 339 | - $entryKey = "/{$portfolioCategory}/{$portfolioPiece['title_url']}/"; |
|
| 340 | - $entryArray += [ |
|
| 341 | - $entryKey => [ |
|
| 342 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 343 | - 'changefreq' => 'never', |
|
| 344 | - 'priority' => .7, |
|
| 345 | - ], |
|
| 346 | - ]; |
|
| 338 | + $portfolioCategory = ($portfolioPiece['category'] == 1) ? 'web' : 'print'; |
|
| 339 | + $entryKey = "/{$portfolioCategory}/{$portfolioPiece['title_url']}/"; |
|
| 340 | + $entryArray += [ |
|
| 341 | + $entryKey => [ |
|
| 342 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 343 | + 'changefreq' => 'never', |
|
| 344 | + 'priority' => .7, |
|
| 345 | + ], |
|
| 346 | + ]; |
|
| 347 | 347 | } |
| 348 | 348 | |
| 349 | 349 | $buildSitemap($entryArray, 'http://portfolio.jacobemerick.com', 'portfolio'); |
@@ -357,26 +357,26 @@ discard block |
||
| 357 | 357 | $mostRecentChange = current($mostRecentChange); |
| 358 | 358 | |
| 359 | 359 | $entryArray = [ |
| 360 | - '/' => [ |
|
| 361 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 362 | - 'changefreq' => 'weekly', |
|
| 363 | - 'priority' => 1, |
|
| 364 | - ], |
|
| 365 | - '/terms/' => [ |
|
| 366 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 367 | - 'changefreq' => 'weekly', |
|
| 368 | - 'priority' => .3, |
|
| 369 | - ], |
|
| 370 | - '/change-log/' => [ |
|
| 371 | - 'lastmod' => (new DateTime($mostRecentChange['datetime']))->format('c'), |
|
| 372 | - 'changefreq' => 'daily', |
|
| 373 | - 'priority' => .1, |
|
| 374 | - ], |
|
| 375 | - '/contact/' => [ |
|
| 376 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 377 | - 'changefreq' => 'weekly', |
|
| 378 | - 'priority' => .6, |
|
| 379 | - ], |
|
| 360 | + '/' => [ |
|
| 361 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 362 | + 'changefreq' => 'weekly', |
|
| 363 | + 'priority' => 1, |
|
| 364 | + ], |
|
| 365 | + '/terms/' => [ |
|
| 366 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 367 | + 'changefreq' => 'weekly', |
|
| 368 | + 'priority' => .3, |
|
| 369 | + ], |
|
| 370 | + '/change-log/' => [ |
|
| 371 | + 'lastmod' => (new DateTime($mostRecentChange['datetime']))->format('c'), |
|
| 372 | + 'changefreq' => 'daily', |
|
| 373 | + 'priority' => .1, |
|
| 374 | + ], |
|
| 375 | + '/contact/' => [ |
|
| 376 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 377 | + 'changefreq' => 'weekly', |
|
| 378 | + 'priority' => .6, |
|
| 379 | + ], |
|
| 380 | 380 | ]; |
| 381 | 381 | |
| 382 | 382 | $buildSitemap($entryArray, 'http://site.jacobemerick.com', 'site'); |
@@ -386,108 +386,108 @@ discard block |
||
| 386 | 386 | * www.waterfallofthekeweenaw.com |
| 387 | 387 | *********************************************/ |
| 388 | 388 | $reduceToMostRecentJournalLog = function ($recentLog, $log) { |
| 389 | - if (is_null($recentLog)) { |
|
| 390 | - return $log; |
|
| 391 | - } |
|
| 392 | - $logDate = new DateTime($log['publish_date']); |
|
| 393 | - $recentLogDate = new DateTime($recentLog['publish_date']); |
|
| 394 | - return ($logDate > $recentLogDate) ? log: $recentLog; |
|
| 389 | + if (is_null($recentLog)) { |
|
| 390 | + return $log; |
|
| 391 | + } |
|
| 392 | + $logDate = new DateTime($log['publish_date']); |
|
| 393 | + $recentLogDate = new DateTime($recentLog['publish_date']); |
|
| 394 | + return ($logDate > $recentLogDate) ? log: $recentLog; |
|
| 395 | 395 | }; |
| 396 | 396 | |
| 397 | 397 | $waterfallRepository = new WaterfallRepository($container['db_connection_locator']); |
| 398 | 398 | $waterfallList = $waterfallRepository->getWaterfalls(); |
| 399 | 399 | |
| 400 | 400 | $entryArray = [ |
| 401 | - '/' => [ |
|
| 402 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 403 | - 'changefreq' => 'daily', |
|
| 404 | - 'priority' => 1, |
|
| 405 | - ], |
|
| 406 | - '/falls/' => [ |
|
| 407 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 408 | - 'changefreq' => 'weekly', |
|
| 409 | - 'priority' => .3, |
|
| 410 | - ], |
|
| 401 | + '/' => [ |
|
| 402 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 403 | + 'changefreq' => 'daily', |
|
| 404 | + 'priority' => 1, |
|
| 405 | + ], |
|
| 406 | + '/falls/' => [ |
|
| 407 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 408 | + 'changefreq' => 'weekly', |
|
| 409 | + 'priority' => .3, |
|
| 410 | + ], |
|
| 411 | 411 | ]; |
| 412 | 412 | |
| 413 | 413 | for ($i = 2; (($i - 1) * 24) < count($waterfallList); $i++) { |
| 414 | - $entryKey = "/falls/{$i}/"; |
|
| 415 | - $entryArray += [ |
|
| 416 | - $entryKey => [ |
|
| 417 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 418 | - 'changefreq' => 'weekly', |
|
| 419 | - 'priority' => .1, |
|
| 420 | - ] |
|
| 421 | - ]; |
|
| 414 | + $entryKey = "/falls/{$i}/"; |
|
| 415 | + $entryArray += [ |
|
| 416 | + $entryKey => [ |
|
| 417 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 418 | + 'changefreq' => 'weekly', |
|
| 419 | + 'priority' => .1, |
|
| 420 | + ] |
|
| 421 | + ]; |
|
| 422 | 422 | } |
| 423 | 423 | |
| 424 | 424 | $waterfallCountyRepository = new WaterfallCountyRepository($container['db_connection_locator']); |
| 425 | 425 | $waterfallCountyList = $waterfallCountyRepository->getCountyList(); |
| 426 | 426 | |
| 427 | 427 | foreach ($waterfallCountyList as $waterfallCounty) { |
| 428 | - $entryKey = "/{$waterfallCounty['alias']}/"; |
|
| 429 | - $entryArray += [ |
|
| 430 | - $entryKey => [ |
|
| 431 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 432 | - 'changefreq' => 'monthly', |
|
| 433 | - 'priority' => .6 |
|
| 434 | - ] |
|
| 435 | - ]; |
|
| 436 | - |
|
| 437 | - for ($i = 2; (($i - 1) * 12) < $waterfallCounty['count']; $i++) { |
|
| 438 | - $entryKey = "/{$waterfallCounty['alias']}/{$i}/"; |
|
| 439 | - $entryArray += [ |
|
| 440 | - $entryKey => [ |
|
| 441 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 442 | - 'changefreq' => 'monthly', |
|
| 443 | - 'priority' => .1 |
|
| 444 | - ] |
|
| 445 | - ]; |
|
| 446 | - } |
|
| 428 | + $entryKey = "/{$waterfallCounty['alias']}/"; |
|
| 429 | + $entryArray += [ |
|
| 430 | + $entryKey => [ |
|
| 431 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 432 | + 'changefreq' => 'monthly', |
|
| 433 | + 'priority' => .6 |
|
| 434 | + ] |
|
| 435 | + ]; |
|
| 436 | + |
|
| 437 | + for ($i = 2; (($i - 1) * 12) < $waterfallCounty['count']; $i++) { |
|
| 438 | + $entryKey = "/{$waterfallCounty['alias']}/{$i}/"; |
|
| 439 | + $entryArray += [ |
|
| 440 | + $entryKey => [ |
|
| 441 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 442 | + 'changefreq' => 'monthly', |
|
| 443 | + 'priority' => .1 |
|
| 444 | + ] |
|
| 445 | + ]; |
|
| 446 | + } |
|
| 447 | 447 | } |
| 448 | 448 | |
| 449 | 449 | $waterfallWatercourseRepository = new WaterfallWatercourseRepository($container['db_connection_locator']); |
| 450 | 450 | $waterfallWatercourseList = $waterfallWatercourseRepository->getWatercourseList(); |
| 451 | 451 | |
| 452 | 452 | foreach ($waterfallWatercourseList as $waterfallWatercourse) { |
| 453 | - $entryKey = "/{$waterfallWatercourse['alias']}/"; |
|
| 454 | - $entryArray += [ |
|
| 455 | - $entryKey => [ |
|
| 456 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 457 | - 'changefreq' => 'monthly', |
|
| 458 | - 'priority' => .6 |
|
| 459 | - ] |
|
| 460 | - ]; |
|
| 461 | - |
|
| 462 | - for ($i = 2; (($i - 1) * 12) < $waterfallWatercourse['count']; $i++) { |
|
| 463 | - $entryKey = "/{$waterfallWatercourse['alias']}/{$i}/"; |
|
| 464 | - $entryArray += [ |
|
| 465 | - $entryKey => [ |
|
| 466 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 467 | - 'changefreq' => 'monthly', |
|
| 468 | - 'priority' => .1 |
|
| 469 | - ] |
|
| 470 | - ]; |
|
| 471 | - } |
|
| 453 | + $entryKey = "/{$waterfallWatercourse['alias']}/"; |
|
| 454 | + $entryArray += [ |
|
| 455 | + $entryKey => [ |
|
| 456 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 457 | + 'changefreq' => 'monthly', |
|
| 458 | + 'priority' => .6 |
|
| 459 | + ] |
|
| 460 | + ]; |
|
| 461 | + |
|
| 462 | + for ($i = 2; (($i - 1) * 12) < $waterfallWatercourse['count']; $i++) { |
|
| 463 | + $entryKey = "/{$waterfallWatercourse['alias']}/{$i}/"; |
|
| 464 | + $entryArray += [ |
|
| 465 | + $entryKey => [ |
|
| 466 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 467 | + 'changefreq' => 'monthly', |
|
| 468 | + 'priority' => .1 |
|
| 469 | + ] |
|
| 470 | + ]; |
|
| 471 | + } |
|
| 472 | 472 | } |
| 473 | 473 | |
| 474 | 474 | foreach ($waterfallList as $waterfall) { |
| 475 | - $entryKey = "/{$waterfall['watercourse_alias']}/{$waterfall['alias']}/"; |
|
| 476 | - $entryArray += [ |
|
| 477 | - $entryKey => [ |
|
| 478 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 479 | - 'changefreq' => 'weekly', |
|
| 480 | - 'priority' => .8, |
|
| 481 | - ], |
|
| 482 | - ]; |
|
| 475 | + $entryKey = "/{$waterfall['watercourse_alias']}/{$waterfall['alias']}/"; |
|
| 476 | + $entryArray += [ |
|
| 477 | + $entryKey => [ |
|
| 478 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 479 | + 'changefreq' => 'weekly', |
|
| 480 | + 'priority' => .8, |
|
| 481 | + ], |
|
| 482 | + ]; |
|
| 483 | 483 | } |
| 484 | 484 | |
| 485 | 485 | $entryArray += [ |
| 486 | - '/map/' => [ |
|
| 487 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 488 | - 'changefreq' => 'monthly', |
|
| 489 | - 'priority' => .6, |
|
| 490 | - ] |
|
| 486 | + '/map/' => [ |
|
| 487 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 488 | + 'changefreq' => 'monthly', |
|
| 489 | + 'priority' => .6, |
|
| 490 | + ] |
|
| 491 | 491 | ]; |
| 492 | 492 | |
| 493 | 493 | $waterfallLogRepository = new WaterfallLogRepository($container['db_connection_locator']); |
@@ -496,91 +496,91 @@ discard block |
||
| 496 | 496 | $mostRecentWaterfallLog = array_reduce($activeWaterfallLogs, $reduceToMostRecentJournalLog); |
| 497 | 497 | |
| 498 | 498 | $entryArray += [ |
| 499 | - '/journal/' => [ |
|
| 500 | - 'lastmod' => (new DateTime($mostRecentWaterfallLog['publish_date']))->format('c'), |
|
| 501 | - 'changefreq' => 'weekly', |
|
| 502 | - 'priority' => .3, |
|
| 503 | - ], |
|
| 499 | + '/journal/' => [ |
|
| 500 | + 'lastmod' => (new DateTime($mostRecentWaterfallLog['publish_date']))->format('c'), |
|
| 501 | + 'changefreq' => 'weekly', |
|
| 502 | + 'priority' => .3, |
|
| 503 | + ], |
|
| 504 | 504 | ]; |
| 505 | 505 | |
| 506 | 506 | for ($i = 2; (($i - 1) * 10) < count($activeWaterfallLogs); $i++) { |
| 507 | - $entryKey = "/journal/{$i}/"; |
|
| 508 | - $entryArray += [ |
|
| 509 | - $entryKey => [ |
|
| 510 | - 'lastmod' => (new DateTime($mostRecentWaterfallLog['publish_date']))->format('c'), |
|
| 511 | - 'changefreq' => 'weekly', |
|
| 512 | - 'priority' => .1, |
|
| 513 | - ] |
|
| 514 | - ]; |
|
| 507 | + $entryKey = "/journal/{$i}/"; |
|
| 508 | + $entryArray += [ |
|
| 509 | + $entryKey => [ |
|
| 510 | + 'lastmod' => (new DateTime($mostRecentWaterfallLog['publish_date']))->format('c'), |
|
| 511 | + 'changefreq' => 'weekly', |
|
| 512 | + 'priority' => .1, |
|
| 513 | + ] |
|
| 514 | + ]; |
|
| 515 | 515 | } |
| 516 | 516 | |
| 517 | 517 | $waterfallCompanionRepository = new WaterfallCompanionRepository($container['db_connection_locator']); |
| 518 | 518 | $waterfallCompanionList = $waterfallCompanionRepository->getCompanionList(); |
| 519 | 519 | |
| 520 | 520 | foreach ($waterfallCompanionList as $waterfallCompanion) { |
| 521 | - $entryKey = "/companion/{$waterfallCompanion['alias']}/"; |
|
| 522 | - $entryArray += [ |
|
| 523 | - $entryKey => [ |
|
| 524 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), // todo based on log |
|
| 525 | - 'changefreq' => 'monthly', |
|
| 526 | - 'priority' => .2 |
|
| 527 | - ] |
|
| 528 | - ]; |
|
| 529 | - |
|
| 530 | - for ($i = 2; (($i - 1) * 10) < $waterfallCompanion['count']; $i++) { |
|
| 531 | - $entryKey = "/companion/{$waterfallCompanion['alias']}/{$i}/"; |
|
| 532 | - $entryArray += [ |
|
| 533 | - $entryKey => [ |
|
| 534 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 535 | - 'changefreq' => 'monthly', |
|
| 536 | - 'priority' => .1 |
|
| 537 | - ] |
|
| 538 | - ]; |
|
| 539 | - } |
|
| 521 | + $entryKey = "/companion/{$waterfallCompanion['alias']}/"; |
|
| 522 | + $entryArray += [ |
|
| 523 | + $entryKey => [ |
|
| 524 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), // todo based on log |
|
| 525 | + 'changefreq' => 'monthly', |
|
| 526 | + 'priority' => .2 |
|
| 527 | + ] |
|
| 528 | + ]; |
|
| 529 | + |
|
| 530 | + for ($i = 2; (($i - 1) * 10) < $waterfallCompanion['count']; $i++) { |
|
| 531 | + $entryKey = "/companion/{$waterfallCompanion['alias']}/{$i}/"; |
|
| 532 | + $entryArray += [ |
|
| 533 | + $entryKey => [ |
|
| 534 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 535 | + 'changefreq' => 'monthly', |
|
| 536 | + 'priority' => .1 |
|
| 537 | + ] |
|
| 538 | + ]; |
|
| 539 | + } |
|
| 540 | 540 | } |
| 541 | 541 | |
| 542 | 542 | $waterfallPeriodRepository = new WaterfallPeriodRepository($container['db_connection_locator']); |
| 543 | 543 | $waterfallPeriodList = $waterfallPeriodRepository->getPeriodList(); |
| 544 | 544 | |
| 545 | 545 | foreach ($waterfallPeriodList as $waterfallPeriod) { |
| 546 | - $entryKey = "/period/{$waterfallPeriod['alias']}/"; |
|
| 547 | - $entryArray += [ |
|
| 548 | - $entryKey => [ |
|
| 549 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), // todo based on log |
|
| 550 | - 'changefreq' => 'monthly', |
|
| 551 | - 'priority' => .2 |
|
| 552 | - ] |
|
| 553 | - ]; |
|
| 554 | - |
|
| 555 | - for ($i = 2; (($i - 1) * 10) < $waterfallPeriod['count']; $i++) { |
|
| 556 | - $entryKey = "/period/{$waterfallPeriod['alias']}/{$i}/"; |
|
| 557 | - $entryArray += [ |
|
| 558 | - $entryKey => [ |
|
| 559 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 560 | - 'changefreq' => 'monthly', |
|
| 561 | - 'priority' => .1 |
|
| 562 | - ] |
|
| 563 | - ]; |
|
| 564 | - } |
|
| 546 | + $entryKey = "/period/{$waterfallPeriod['alias']}/"; |
|
| 547 | + $entryArray += [ |
|
| 548 | + $entryKey => [ |
|
| 549 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), // todo based on log |
|
| 550 | + 'changefreq' => 'monthly', |
|
| 551 | + 'priority' => .2 |
|
| 552 | + ] |
|
| 553 | + ]; |
|
| 554 | + |
|
| 555 | + for ($i = 2; (($i - 1) * 10) < $waterfallPeriod['count']; $i++) { |
|
| 556 | + $entryKey = "/period/{$waterfallPeriod['alias']}/{$i}/"; |
|
| 557 | + $entryArray += [ |
|
| 558 | + $entryKey => [ |
|
| 559 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 560 | + 'changefreq' => 'monthly', |
|
| 561 | + 'priority' => .1 |
|
| 562 | + ] |
|
| 563 | + ]; |
|
| 564 | + } |
|
| 565 | 565 | } |
| 566 | 566 | |
| 567 | 567 | foreach ($activeWaterfallLogs as $waterfallLog) { |
| 568 | - $entryKey = "/journal/{$waterfallLog['alias']}/"; |
|
| 569 | - $entryArray += [ |
|
| 570 | - $entryKey => [ |
|
| 571 | - 'lastmod' => (new DateTime($waterfallLog['publish_date']))->format('c'), |
|
| 572 | - 'changefreq' => 'weekly', |
|
| 573 | - 'priority' => .4, |
|
| 574 | - ], |
|
| 575 | - ]; |
|
| 568 | + $entryKey = "/journal/{$waterfallLog['alias']}/"; |
|
| 569 | + $entryArray += [ |
|
| 570 | + $entryKey => [ |
|
| 571 | + 'lastmod' => (new DateTime($waterfallLog['publish_date']))->format('c'), |
|
| 572 | + 'changefreq' => 'weekly', |
|
| 573 | + 'priority' => .4, |
|
| 574 | + ], |
|
| 575 | + ]; |
|
| 576 | 576 | } |
| 577 | 577 | |
| 578 | 578 | $entryArray += [ |
| 579 | - '/about/' => [ |
|
| 580 | - 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 581 | - 'changefreq' => 'monthly', |
|
| 582 | - 'priority' => .6, |
|
| 583 | - ] |
|
| 579 | + '/about/' => [ |
|
| 580 | + 'lastmod' => (new DateTime('December 20, 2015'))->format('Y-m-d'), |
|
| 581 | + 'changefreq' => 'monthly', |
|
| 582 | + 'priority' => .6, |
|
| 583 | + ] |
|
| 584 | 584 | ]; |
| 585 | 585 | |
| 586 | 586 | $buildSitemap($entryArray, 'http://www.waterfallsofthekeweenaw.com', 'waterfalls'); |
@@ -8,85 +8,85 @@ |
||
| 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 @@ |
||
| 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 @@ |
||
| 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 | } |
@@ -57,9 +57,9 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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; |