@@ -6,40 +6,40 @@ |
||
6 | 6 | use Jacobemerick\Web\Domain\Stream\Twitter\MysqlTwitterRepository as TwitterRepository; |
7 | 7 | |
8 | 8 | $client = new TwitterOAuth( |
9 | - $config->twitter->consumer_key, |
|
10 | - $config->twitter->consumer_secret, |
|
11 | - $config->twitter->access_token, |
|
12 | - $config->twitter->access_token_secret |
|
9 | + $config->twitter->consumer_key, |
|
10 | + $config->twitter->consumer_secret, |
|
11 | + $config->twitter->access_token, |
|
12 | + $config->twitter->access_token_secret |
|
13 | 13 | ); |
14 | 14 | $client->setDecodeJsonAsArray(true); |
15 | 15 | |
16 | 16 | $twitterRepository = new TwitterRepository($container['db_connection_locator']); |
17 | 17 | |
18 | 18 | $recentTweets = $client->get('statuses/user_timeline', [ |
19 | - 'screen_name' => 'jpemeric', |
|
20 | - 'count' => 50, |
|
21 | - 'trim_user' => true, |
|
19 | + 'screen_name' => 'jpemeric', |
|
20 | + 'count' => 50, |
|
21 | + 'trim_user' => true, |
|
22 | 22 | ]); |
23 | 23 | |
24 | 24 | if (isset($recentTweets['errors'])) { |
25 | - throw new Exception("Error encountered with twitter api {$recentTweets['errors'][0]['message']}"); |
|
25 | + throw new Exception("Error encountered with twitter api {$recentTweets['errors'][0]['message']}"); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | foreach ($recentTweets as $tweet) { |
29 | - $uniqueTweetCheck = $twitterRepository->getTwitterByTweetId($tweet['id_str']); |
|
30 | - if ($uniqueTweetCheck !== false) { |
|
31 | - $currentTweetHash = md5($uniqueTweetCheck['metadata']); |
|
32 | - $newTweetHash = md5(json_encode($tweet)); |
|
33 | - if ($uniqueTweetCheck['metadata'] != json_encode($tweet)) { |
|
34 | - $twitterRepository->updateTweetMetadata($tweet['id_str'], $tweet); |
|
35 | - } |
|
36 | - continue; |
|
37 | - } |
|
38 | - |
|
39 | - $twitterRepository->insertTweet( |
|
40 | - $tweet['id_str'], |
|
41 | - (new DateTime($tweet['created_at']))->setTimezone($container['default_timezone']), |
|
42 | - $tweet |
|
43 | - ); |
|
29 | + $uniqueTweetCheck = $twitterRepository->getTwitterByTweetId($tweet['id_str']); |
|
30 | + if ($uniqueTweetCheck !== false) { |
|
31 | + $currentTweetHash = md5($uniqueTweetCheck['metadata']); |
|
32 | + $newTweetHash = md5(json_encode($tweet)); |
|
33 | + if ($uniqueTweetCheck['metadata'] != json_encode($tweet)) { |
|
34 | + $twitterRepository->updateTweetMetadata($tweet['id_str'], $tweet); |
|
35 | + } |
|
36 | + continue; |
|
37 | + } |
|
38 | + |
|
39 | + $twitterRepository->insertTweet( |
|
40 | + $tweet['id_str'], |
|
41 | + (new DateTime($tweet['created_at']))->setTimezone($container['default_timezone']), |
|
42 | + $tweet |
|
43 | + ); |
|
44 | 44 | } |
45 | 45 |
@@ -8,48 +8,48 @@ |
||
8 | 8 | class MysqlBlogRepository implements BlogRepositoryInterface |
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 getBlogByPermalink($permalink) |
|
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 getBlogByPermalink($permalink) |
|
23 | + { |
|
24 | + $query = " |
|
25 | 25 | SELECT * |
26 | 26 | FROM `jpemeric_stream`.`blog` |
27 | 27 | WHERE `permalink` = :permalink |
28 | 28 | LIMIT 1"; |
29 | - $bindings = [ |
|
30 | - 'permalink' => $permalink, |
|
31 | - ]; |
|
32 | - |
|
33 | - return $this |
|
34 | - ->connections |
|
35 | - ->getRead() |
|
36 | - ->fetchOne($query, $bindings); |
|
37 | - } |
|
38 | - |
|
39 | - public function getBlogsUpdatedSince(DateTime $datetime) |
|
40 | - { |
|
41 | - $query = " |
|
29 | + $bindings = [ |
|
30 | + 'permalink' => $permalink, |
|
31 | + ]; |
|
32 | + |
|
33 | + return $this |
|
34 | + ->connections |
|
35 | + ->getRead() |
|
36 | + ->fetchOne($query, $bindings); |
|
37 | + } |
|
38 | + |
|
39 | + public function getBlogsUpdatedSince(DateTime $datetime) |
|
40 | + { |
|
41 | + $query = " |
|
42 | 42 | SELECT * |
43 | 43 | FROM `jpemeric_stream`.`blog` |
44 | 44 | WHERE `updated_at` >= :last_update"; |
45 | 45 | |
46 | - $bindings = [ |
|
47 | - 'last_update' => $datetime->format('Y-m-d H:i:s'), |
|
48 | - ]; |
|
46 | + $bindings = [ |
|
47 | + 'last_update' => $datetime->format('Y-m-d H:i:s'), |
|
48 | + ]; |
|
49 | 49 | |
50 | - return $this |
|
51 | - ->connections |
|
52 | - ->getRead() |
|
53 | - ->fetchAll($query, $bindings); |
|
54 | - } |
|
50 | + return $this |
|
51 | + ->connections |
|
52 | + ->getRead() |
|
53 | + ->fetchAll($query, $bindings); |
|
54 | + } |
|
55 | 55 | } |
@@ -8,60 +8,60 @@ |
||
8 | 8 | class MysqlBlogCommentRepository implements BlogCommentRepositoryInterface |
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 | - /** |
|
23 | - * @param integer $limit |
|
24 | - * @param integer $offset |
|
25 | - * |
|
26 | - * @return array|false |
|
27 | - */ |
|
28 | - public function getBlogComments($limit = null, $offset = 0) |
|
29 | - { |
|
30 | - $query = " |
|
22 | + /** |
|
23 | + * @param integer $limit |
|
24 | + * @param integer $offset |
|
25 | + * |
|
26 | + * @return array|false |
|
27 | + */ |
|
28 | + public function getBlogComments($limit = null, $offset = 0) |
|
29 | + { |
|
30 | + $query = " |
|
31 | 31 | SELECT `id`, `permalink`, `datetime` |
32 | 32 | FROM `jpemeric_stream`.`blog_comment` |
33 | 33 | ORDER BY `datetime` DESC"; |
34 | - if (!is_null($limit)) { |
|
35 | - $query .= " |
|
34 | + if (!is_null($limit)) { |
|
35 | + $query .= " |
|
36 | 36 | LIMIT {$offset}, {$limit}"; |
37 | - } |
|
37 | + } |
|
38 | 38 | |
39 | - return $this |
|
40 | - ->connections |
|
41 | - ->getRead() |
|
42 | - ->fetchAll($query); |
|
43 | - } |
|
39 | + return $this |
|
40 | + ->connections |
|
41 | + ->getRead() |
|
42 | + ->fetchAll($query); |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * @param string $permalink |
|
47 | - * |
|
48 | - * @return array|false |
|
49 | - */ |
|
50 | - public function getBlogCommentByPermalink($permalink) |
|
51 | - { |
|
52 | - $query = " |
|
45 | + /** |
|
46 | + * @param string $permalink |
|
47 | + * |
|
48 | + * @return array|false |
|
49 | + */ |
|
50 | + public function getBlogCommentByPermalink($permalink) |
|
51 | + { |
|
52 | + $query = " |
|
53 | 53 | SELECT * |
54 | 54 | FROM `jpemeric_stream`.`blog_comment` |
55 | 55 | WHERE `permalink` = :permalink |
56 | 56 | LIMIT 1"; |
57 | 57 | |
58 | - $bindings = [ |
|
59 | - 'permalink' => $permalink, |
|
60 | - ]; |
|
58 | + $bindings = [ |
|
59 | + 'permalink' => $permalink, |
|
60 | + ]; |
|
61 | 61 | |
62 | - return $this |
|
63 | - ->connections |
|
64 | - ->getRead() |
|
65 | - ->fetchOne($query, $bindings); |
|
66 | - } |
|
62 | + return $this |
|
63 | + ->connections |
|
64 | + ->getRead() |
|
65 | + ->fetchOne($query, $bindings); |
|
66 | + } |
|
67 | 67 | } |
@@ -8,31 +8,31 @@ |
||
8 | 8 | class MysqlDailyMileRepository implements DailyMileRepositoryInterface |
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 getDailyMilesUpdatedSince(DateTime $datetime) |
|
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 getDailyMilesUpdatedSince(DateTime $datetime) |
|
23 | + { |
|
24 | + $query = " |
|
25 | 25 | SELECT * |
26 | 26 | FROM `jpemeric_stream`.`dailymile` |
27 | 27 | WHERE `updated_at` >= :last_update"; |
28 | 28 | |
29 | - $bindings = [ |
|
30 | - 'last_update' => $datetime->format('Y-m-d H:i:s'), |
|
31 | - ]; |
|
29 | + $bindings = [ |
|
30 | + 'last_update' => $datetime->format('Y-m-d H:i:s'), |
|
31 | + ]; |
|
32 | 32 | |
33 | - return $this |
|
34 | - ->connections |
|
35 | - ->getRead() |
|
36 | - ->fetchAll($query, $bindings); |
|
37 | - } |
|
33 | + return $this |
|
34 | + ->connections |
|
35 | + ->getRead() |
|
36 | + ->fetchAll($query, $bindings); |
|
37 | + } |
|
38 | 38 | } |
@@ -25,37 +25,37 @@ |
||
25 | 25 | |
26 | 26 | private function get_sites() |
27 | 27 | { |
28 | - return [ |
|
29 | - [ |
|
30 | - 'url' => 'https://home.jacobemerick.com/', |
|
31 | - 'title' => "Jacob Emerick's Home", |
|
32 | - 'name' => 'Home' |
|
33 | - ], |
|
34 | - [ |
|
35 | - 'url' => 'https://blog.jacobemerick.com/', |
|
36 | - 'title' => "Jacob Emerick's Blog", |
|
37 | - 'name' => 'Blog' |
|
38 | - ], |
|
39 | - [ |
|
40 | - 'url' => 'https://lifestream.jacobemerick.com/', |
|
41 | - 'title' => "Jacob Emerick's Lifestream", |
|
42 | - 'name' => 'Lifestream' |
|
43 | - ], |
|
44 | - [ |
|
45 | - 'url' => 'https://map.jacobemerick.com/', |
|
46 | - 'title' => "Jacob Emerick's Hiking Map", |
|
47 | - 'name' => 'Map' |
|
48 | - ], |
|
49 | - [ |
|
50 | - 'url' => 'https://portfolio.jacobemerick.com/', |
|
51 | - 'title' => "Jacob Emerick's Portfolio", |
|
52 | - 'name' => 'Portfolio', |
|
53 | - ], |
|
54 | - [ |
|
55 | - 'url' => 'https://www.waterfallsofthekeweenaw.com/', |
|
56 | - 'title' => 'Waterfalls of the Keweenaw', |
|
57 | - 'name' => 'Waterfalls' |
|
58 | - ] |
|
28 | + return [ |
|
29 | + [ |
|
30 | + 'url' => 'https://home.jacobemerick.com/', |
|
31 | + 'title' => "Jacob Emerick's Home", |
|
32 | + 'name' => 'Home' |
|
33 | + ], |
|
34 | + [ |
|
35 | + 'url' => 'https://blog.jacobemerick.com/', |
|
36 | + 'title' => "Jacob Emerick's Blog", |
|
37 | + 'name' => 'Blog' |
|
38 | + ], |
|
39 | + [ |
|
40 | + 'url' => 'https://lifestream.jacobemerick.com/', |
|
41 | + 'title' => "Jacob Emerick's Lifestream", |
|
42 | + 'name' => 'Lifestream' |
|
43 | + ], |
|
44 | + [ |
|
45 | + 'url' => 'https://map.jacobemerick.com/', |
|
46 | + 'title' => "Jacob Emerick's Hiking Map", |
|
47 | + 'name' => 'Map' |
|
48 | + ], |
|
49 | + [ |
|
50 | + 'url' => 'https://portfolio.jacobemerick.com/', |
|
51 | + 'title' => "Jacob Emerick's Portfolio", |
|
52 | + 'name' => 'Portfolio', |
|
53 | + ], |
|
54 | + [ |
|
55 | + 'url' => 'https://www.waterfallsofthekeweenaw.com/', |
|
56 | + 'title' => 'Waterfalls of the Keweenaw', |
|
57 | + 'name' => 'Waterfalls' |
|
58 | + ] |
|
59 | 59 | ]; |
60 | 60 | } |
61 | 61 |
@@ -18,10 +18,10 @@ discard block |
||
18 | 18 | |
19 | 19 | private static function get_router_name() |
20 | 20 | { |
21 | - if(Request::isAJAX()) |
|
21 | + if (Request::isAJAX()) |
|
22 | 22 | return 'AJAXRouter'; |
23 | 23 | |
24 | - switch(URLDecode::getSite()) |
|
24 | + switch (URLDecode::getSite()) |
|
25 | 25 | { |
26 | 26 | case 'ajax' : |
27 | 27 | return 'AjaxRouter'; |
@@ -65,14 +65,14 @@ discard block |
||
65 | 65 | |
66 | 66 | final protected function check_for_redirect($redirect_uri) |
67 | 67 | { |
68 | - foreach($this->get_redirect_array() as $check) |
|
68 | + foreach ($this->get_redirect_array() as $check) |
|
69 | 69 | { |
70 | 70 | $redirect_uri = preg_replace($check->pattern, $check->replace, $redirect_uri); |
71 | 71 | } |
72 | 72 | |
73 | 73 | $redirect_uri = $this->check_for_special_redirect($redirect_uri); |
74 | 74 | |
75 | - if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') |
|
75 | + if ($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') |
|
76 | 76 | $redirect_uri .= '/'; |
77 | 77 | |
78 | 78 | if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') { |
@@ -80,23 +80,23 @@ discard block |
||
80 | 80 | $redirect_uri = $protocol . '://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri; |
81 | 81 | } |
82 | 82 | |
83 | - if($redirect_uri == URLDecode::getURI()) |
|
83 | + if ($redirect_uri == URLDecode::getURI()) |
|
84 | 84 | return; |
85 | 85 | |
86 | 86 | $controller_check = $redirect_uri; |
87 | - if(substr($redirect_uri, 0, 4) == 'http') { |
|
87 | + if (substr($redirect_uri, 0, 4) == 'http') { |
|
88 | 88 | $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http'; |
89 | 89 | $controller_check = preg_replace('@^' . $protocol . '://([a-z\.]+)@', '', $redirect_uri); |
90 | 90 | |
91 | 91 | $controller = $this->get_controller($controller_check); |
92 | - if($controller == '/Error404Controller') |
|
92 | + if ($controller == '/Error404Controller') |
|
93 | 93 | { |
94 | 94 | Loader::loadNew('controller', '/Error404Controller') |
95 | 95 | ->activate(); |
96 | 96 | exit; |
97 | 97 | } |
98 | 98 | |
99 | - if(substr($redirect_uri, 0, 4) != 'http') |
|
99 | + if (substr($redirect_uri, 0, 4) != 'http') |
|
100 | 100 | { |
101 | 101 | $redirect_uri = substr($redirect_uri, 1); |
102 | 102 | $redirect_uri = URLDecode::getBase() . $redirect_uri; |
@@ -113,12 +113,12 @@ discard block |
||
113 | 113 | |
114 | 114 | final private function get_controller($uri) |
115 | 115 | { |
116 | - foreach($this->get_direct_array() as $check) |
|
116 | + foreach ($this->get_direct_array() as $check) |
|
117 | 117 | { |
118 | - if($uri == $check->match) |
|
118 | + if ($uri == $check->match) |
|
119 | 119 | return "{$this->get_primary_folder()}/{$check->controller}"; |
120 | 120 | |
121 | - if(preg_match("@^{$check->match}$@", $uri)) |
|
121 | + if (preg_match("@^{$check->match}$@", $uri)) |
|
122 | 122 | return "{$this->get_primary_folder()}/{$check->controller}"; |
123 | 123 | } |
124 | 124 | |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | |
128 | 128 | final private function get_primary_folder() |
129 | 129 | { |
130 | - if(Request::isAjax()) |
|
130 | + if (Request::isAjax()) |
|
131 | 131 | return 'ajax'; |
132 | 132 | |
133 | 133 | return URLDecode::getSite(); |
@@ -18,8 +18,9 @@ discard block |
||
18 | 18 | |
19 | 19 | private static function get_router_name() |
20 | 20 | { |
21 | - if(Request::isAJAX()) |
|
22 | - return 'AJAXRouter'; |
|
21 | + if(Request::isAJAX()) { |
|
22 | + return 'AJAXRouter'; |
|
23 | + } |
|
23 | 24 | |
24 | 25 | switch(URLDecode::getSite()) |
25 | 26 | { |
@@ -72,16 +73,18 @@ discard block |
||
72 | 73 | |
73 | 74 | $redirect_uri = $this->check_for_special_redirect($redirect_uri); |
74 | 75 | |
75 | - if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') |
|
76 | - $redirect_uri .= '/'; |
|
76 | + if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') { |
|
77 | + $redirect_uri .= '/'; |
|
78 | + } |
|
77 | 79 | |
78 | 80 | if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') { |
79 | 81 | $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http'; |
80 | 82 | $redirect_uri = $protocol . '://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri; |
81 | 83 | } |
82 | 84 | |
83 | - if($redirect_uri == URLDecode::getURI()) |
|
84 | - return; |
|
85 | + if($redirect_uri == URLDecode::getURI()) { |
|
86 | + return; |
|
87 | + } |
|
85 | 88 | |
86 | 89 | $controller_check = $redirect_uri; |
87 | 90 | if(substr($redirect_uri, 0, 4) == 'http') { |
@@ -115,11 +118,13 @@ discard block |
||
115 | 118 | { |
116 | 119 | foreach($this->get_direct_array() as $check) |
117 | 120 | { |
118 | - if($uri == $check->match) |
|
119 | - return "{$this->get_primary_folder()}/{$check->controller}"; |
|
121 | + if($uri == $check->match) { |
|
122 | + return "{$this->get_primary_folder()}/{$check->controller}"; |
|
123 | + } |
|
120 | 124 | |
121 | - if(preg_match("@^{$check->match}$@", $uri)) |
|
122 | - return "{$this->get_primary_folder()}/{$check->controller}"; |
|
125 | + if(preg_match("@^{$check->match}$@", $uri)) { |
|
126 | + return "{$this->get_primary_folder()}/{$check->controller}"; |
|
127 | + } |
|
123 | 128 | } |
124 | 129 | |
125 | 130 | return '/Error404Controller'; |
@@ -127,8 +132,9 @@ discard block |
||
127 | 132 | |
128 | 133 | final private function get_primary_folder() |
129 | 134 | { |
130 | - if(Request::isAjax()) |
|
131 | - return 'ajax'; |
|
135 | + if(Request::isAjax()) { |
|
136 | + return 'ajax'; |
|
137 | + } |
|
132 | 138 | |
133 | 139 | return URLDecode::getSite(); |
134 | 140 | } |
@@ -75,19 +75,19 @@ discard block |
||
75 | 75 | if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') |
76 | 76 | $redirect_uri .= '/'; |
77 | 77 | |
78 | - if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') { |
|
79 | - $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http'; |
|
80 | - $redirect_uri = $protocol . '://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri; |
|
81 | - } |
|
78 | + if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') { |
|
79 | + $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http'; |
|
80 | + $redirect_uri = $protocol . '://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri; |
|
81 | + } |
|
82 | 82 | |
83 | 83 | if($redirect_uri == URLDecode::getURI()) |
84 | 84 | return; |
85 | 85 | |
86 | 86 | $controller_check = $redirect_uri; |
87 | 87 | if(substr($redirect_uri, 0, 4) == 'http') { |
88 | - $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http'; |
|
88 | + $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http'; |
|
89 | 89 | $controller_check = preg_replace('@^' . $protocol . '://([a-z\.]+)@', '', $redirect_uri); |
90 | - } |
|
90 | + } |
|
91 | 91 | |
92 | 92 | $controller = $this->get_controller($controller_check); |
93 | 93 | if($controller == '/Error404Controller') |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | { |
139 | 139 | return ( |
140 | 140 | URLDecode::getExtension() != 'json' && |
141 | - strstr(URLDecode::getURI(), '#') === false); |
|
141 | + strstr(URLDecode::getURI(), '#') === false); |
|
142 | 142 | } |
143 | 143 | |
144 | 144 | } |
@@ -8,31 +8,31 @@ |
||
8 | 8 | class MysqlGoodreadRepository implements GoodreadRepositoryInterface |
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 getGoodreadsUpdatedSince(DateTime $datetime) |
|
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 getGoodreadsUpdatedSince(DateTime $datetime) |
|
23 | + { |
|
24 | + $query = " |
|
25 | 25 | SELECT * |
26 | 26 | FROM `jpemeric_stream`.`goodread` |
27 | 27 | WHERE `updated_at` >= :last_update"; |
28 | 28 | |
29 | - $bindings = [ |
|
30 | - 'last_update' => $datetime->format('Y-m-d H:i:s'), |
|
31 | - ]; |
|
29 | + $bindings = [ |
|
30 | + 'last_update' => $datetime->format('Y-m-d H:i:s'), |
|
31 | + ]; |
|
32 | 32 | |
33 | - return $this |
|
34 | - ->connections |
|
35 | - ->getRead() |
|
36 | - ->fetchAll($query, $bindings); |
|
37 | - } |
|
33 | + return $this |
|
34 | + ->connections |
|
35 | + ->getRead() |
|
36 | + ->fetchAll($query, $bindings); |
|
37 | + } |
|
38 | 38 | } |