Completed
Push — master ( ae2f82...cdbc89 )
by Angus
03:30
created
public/index.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -210,10 +210,10 @@
 block discarded – undo
210 210
 {
211 211
 	// Ensure there's a trailing slash
212 212
 	$system_path = strtr(
213
-		               rtrim($system_path, '/\\'),
214
-		               '/\\',
215
-		               DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
216
-	               ).DIRECTORY_SEPARATOR;
213
+					   rtrim($system_path, '/\\'),
214
+					   '/\\',
215
+					   DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR
216
+				   ).DIRECTORY_SEPARATOR;
217 217
 }
218 218
 
219 219
 // Is the system path correct?
Please login to merge, or discard this patch.
application/tests_codeception/_support/UnitTester.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
 */
19 19
 class UnitTester extends \Codeception\Actor
20 20
 {
21
-    use _generated\UnitTesterActions;
21
+	use _generated\UnitTesterActions;
22 22
 
23 23
    /**
24 24
     * Define custom actions here
Please login to merge, or discard this patch.
application/tests_codeception/_support/AcceptanceTester.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
 */
19 19
 class AcceptanceTester extends \Codeception\Actor
20 20
 {
21
-    use _generated\AcceptanceTesterActions;
21
+	use _generated\AcceptanceTesterActions;
22 22
 
23 23
    /**
24 24
     * Define custom actions here
Please login to merge, or discard this patch.
application/tests_codeception/_support/FunctionalTester.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
 */
19 19
 class FunctionalTester extends \Codeception\Actor
20 20
 {
21
-    use _generated\FunctionalTesterActions;
21
+	use _generated\FunctionalTesterActions;
22 22
 
23 23
    /**
24 24
     * Define custom actions here
Please login to merge, or discard this patch.
application/libraries/MY_DB_cache.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -245,7 +245,7 @@
 block discarded – undo
245 245
 	}
246 246
 
247 247
 	/**
248
-	 * @param $md5
248
+	 * @param string $md5
249 249
 	 *
250 250
 	 * @return array
251 251
 	 */
Please login to merge, or discard this patch.
application/models/Tracker/Tracker_Tag_Model.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -9,9 +9,9 @@
 block discarded – undo
9 9
 		$success = FALSE;
10 10
 		if(preg_match("/^[a-z0-9\\-_,:]{0,255}$/", $tag_string)) {
11 11
 			$success = (bool) $this->db->set(['tags' => $tag_string, 'active' => 'Y', 'last_updated' => NULL])
12
-			                           ->where('user_id', $userID)
13
-			                           ->where('id', $chapterID)
14
-			                           ->update('tracker_chapters');
12
+									   ->where('user_id', $userID)
13
+									   ->where('id', $chapterID)
14
+									   ->update('tracker_chapters');
15 15
 		}
16 16
 
17 17
 		if($success) {
Please login to merge, or discard this patch.
application/models/Tracker/Tracker_Category_Model.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -7,9 +7,9 @@  discard block
 block discarded – undo
7 7
 
8 8
 	public function setByID(int $userID, int $chapterID, string $category) : bool {
9 9
 		$success = $this->db->set(['category' => $category, 'active' => 'Y', 'last_updated' => NULL])
10
-		                    ->where('user_id', $userID)
11
-		                    ->where('id', $chapterID)
12
-		                    ->update('tracker_chapters');
10
+							->where('user_id', $userID)
11
+							->where('id', $chapterID)
12
+							->update('tracker_chapters');
13 13
 
14 14
 		return (bool) $success;
15 15
 	}
@@ -40,11 +40,11 @@  discard block
 block discarded – undo
40 40
 
41 41
 	public function getUsed(int $userID) : array {
42 42
 		$query = $this->db->distinct()
43
-		                  ->select('category')
44
-		                  ->from('tracker_chapters')
45
-		                  ->where('tracker_chapters.active', 'Y')
46
-		                  ->where('user_id', $userID)
47
-		                  ->get();
43
+						  ->select('category')
44
+						  ->from('tracker_chapters')
45
+						  ->where('tracker_chapters.active', 'Y')
46
+						  ->where('user_id', $userID)
47
+						  ->get();
48 48
 
49 49
 		return array_column($query->result_array(), 'category');
50 50
 	}
Please login to merge, or discard this patch.
application/models/User_Options_Model.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@
 block discarded – undo
114 114
 	 * @param string   $option
115 115
 	 * @param int|null $userID
116 116
 	 *
117
-	 * @return mixed Returns option value as STRING, or FALSE if option does not exist.
117
+	 * @return string Returns option value as STRING, or FALSE if option does not exist.
118 118
 	 */
119 119
 	public function get(string $option, ?int $userID = NULL) {
120 120
 		$userID = (is_null($userID) ? (int) $this->User->id : $userID);
Please login to merge, or discard this patch.
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -188,18 +188,18 @@
 block discarded – undo
188 188
 		//FIXME: Query duplication.
189 189
 		if($this->User->id !== $userID) {
190 190
 			$query = $this->db->select('value_str, value_int')
191
-			                  ->from('user_options')
192
-			                  ->where('user_id', $userID)
193
-			                  ->where('name',    $option)
194
-			                  ->limit(1);
191
+							  ->from('user_options')
192
+							  ->where('user_id', $userID)
193
+							  ->where('name',    $option)
194
+							  ->limit(1);
195 195
 			$data = $query->get()->row_array();
196 196
 		} else {
197 197
 			if(!($data = $this->session->tempdata("option_{$option}"))) {
198 198
 				$query = $this->db->select('value_str, value_int')
199
-				                  ->from('user_options')
200
-				                  ->where('user_id', $userID)
201
-				                  ->where('name',    $option)
202
-				                  ->limit(1);
199
+								  ->from('user_options')
200
+								  ->where('user_id', $userID)
201
+								  ->where('name',    $option)
202
+								  ->limit(1);
203 203
 				$data = $query->get()->row_array();
204 204
 				$this->session->set_tempdata("option_{$option}", $data, 3600);
205 205
 			}
Please login to merge, or discard this patch.
application/models/Tracker/Tracker_Title_Model.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@
 block discarded – undo
122 122
 	/**
123 123
 	 * @param string $site_url
124 124
 	 *
125
-	 * @return stdClass|object|null
125
+	 * @return string
126 126
 	 */
127 127
 	public function getSiteDataFromURL(string $site_url) {
128 128
 		$query = $this->db->select('*')
Please login to merge, or discard this patch.
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -17,11 +17,11 @@  discard block
 block discarded – undo
17 17
 	 */
18 18
 	public function getID(string $titleURL, int $siteID, bool $create = TRUE, bool $returnData = FALSE) {
19 19
 		$query = $this->db->select('tracker_titles.id, tracker_titles.title, tracker_titles.title_url, tracker_titles.latest_chapter, tracker_titles.status, tracker_sites.site_class, (tracker_titles.last_checked > DATE_SUB(NOW(), INTERVAL 3 DAY)) AS active', FALSE)
20
-		                  ->from('tracker_titles')
21
-		                  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
22
-		                  ->where('tracker_titles.title_url', $titleURL)
23
-		                  ->where('tracker_titles.site_id', $siteID)
24
-		                  ->get();
20
+						  ->from('tracker_titles')
21
+						  ->join('tracker_sites', 'tracker_sites.id = tracker_titles.site_id', 'left')
22
+						  ->where('tracker_titles.title_url', $titleURL)
23
+						  ->where('tracker_titles.site_id', $siteID)
24
+						  ->get();
25 25
 
26 26
 		if($query->num_rows() > 0) {
27 27
 			$id = (int) $query->row('id');
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
35 35
 						//Make sure last_checked is always updated on successful run.
36 36
 						//CHECK: Is there a reason we aren't just doing this in updateTitleById?
37 37
 						$this->db->set('last_checked', 'CURRENT_TIMESTAMP', FALSE)
38
-						         ->where('id', $id)
39
-						         ->update('tracker_titles');
38
+								 ->where('id', $id)
39
+								 ->update('tracker_titles');
40 40
 					}
41 41
 				} else {
42 42
 					log_message('error', "{$siteClass} | {$query->row('title')} ({$query->row('title_url')}) | Failed to update.");
@@ -76,9 +76,9 @@  discard block
 block discarded – undo
76 76
 	 */
77 77
 	private function addTitle(string $titleURL, int $siteID) : int {
78 78
 		$query = $this->db->select('site, site_class')
79
-		                  ->from('tracker_sites')
80
-		                  ->where('id', $siteID)
81
-		                  ->get();
79
+						  ->from('tracker_sites')
80
+						  ->where('id', $siteID)
81
+						  ->get();
82 82
 
83 83
 		$titleData = $this->sites->{$query->row()->site_class}->getTitleData($titleURL, TRUE);
84 84
 
@@ -104,21 +104,21 @@  discard block
 block discarded – undo
104 104
 	public function updateByID(int $titleID, ?string $latestChapter) : bool {
105 105
 		//FIXME: Really not too happy with how we're doing history stuff here, it just feels messy.
106 106
 		$query = $this->db->select('latest_chapter AS current_chapter')
107
-		                  ->from('tracker_titles')
108
-		                  ->where('id', $titleID)
109
-		                  ->get();
107
+						  ->from('tracker_titles')
108
+						  ->where('id', $titleID)
109
+						  ->get();
110 110
 		$row = $query->row();
111 111
 
112 112
 		//TODO (CHECK): If failed_checks changes won't that trigger affected_rows?
113 113
 		$success = $this->db->set(['latest_chapter' => $latestChapter, 'failed_checks' => 0]) //last_updated gets updated via a trigger if something changes
114
-		                    ->where('id', $titleID)
115
-		                    ->update('tracker_titles');
114
+							->where('id', $titleID)
115
+							->update('tracker_titles');
116 116
 
117 117
 		if($this->db->affected_rows() > 0) {
118 118
 			//Clear hidden latest chapter
119 119
 			$this->db->set(['ignore_chapter' => 'NULL', 'last_updated' => 'last_updated'], NULL, FALSE)
120
-			         ->where('title_id', $titleID)
121
-			         ->update('tracker_chapters');
120
+					 ->where('title_id', $titleID)
121
+					 ->update('tracker_chapters');
122 122
 		}
123 123
 
124 124
 		//Update History
@@ -135,20 +135,20 @@  discard block
 block discarded – undo
135 135
 		if(!array_diff(array_keys($data), TITLEDATA_COLUMNS)) {
136 136
 			$newData = array_merge($data, ['failed_checks' => 0]);
137 137
 			$oldData = $this->db->select('latest_chapter AS current_chapter')
138
-			                    ->from('tracker_titles')
139
-			                    ->where('id', $titleID)
140
-			                    ->get()->row_array();
138
+								->from('tracker_titles')
139
+								->where('id', $titleID)
140
+								->get()->row_array();
141 141
 
142 142
 
143 143
 			$success = $this->db->set($newData) //last_updated gets updated via a trigger if something changes
144
-			                    ->set('last_checked', 'CURRENT_TIMESTAMP', FALSE)
145
-			                    ->where('id', $titleID)
146
-			                    ->update('tracker_titles');
144
+								->set('last_checked', 'CURRENT_TIMESTAMP', FALSE)
145
+								->where('id', $titleID)
146
+								->update('tracker_titles');
147 147
 			if(in_array('latest_chapter', $newData, TRUE) && $newData['latest_chapter'] !== $oldData['current_chapter'] && $this->db->affected_rows() > 0) {
148 148
 				//Clear hidden latest chapter
149 149
 				$this->db->set(['ignore_chapter' => 'NULL', 'last_updated' => 'last_updated'], NULL, FALSE)
150
-				         ->where('title_id', $titleID)
151
-				         ->update('tracker_chapters');
150
+						 ->where('title_id', $titleID)
151
+						 ->update('tracker_chapters');
152 152
 			}
153 153
 
154 154
 			//Update History
@@ -164,8 +164,8 @@  discard block
 block discarded – undo
164 164
 
165 165
 	public function updateFailedChecksByID(int $titleID) : bool {
166 166
 		$success = $this->db->set('failed_checks', 'failed_checks + 1', FALSE)
167
-		                    ->where('id', $titleID)
168
-		                    ->update('tracker_titles');
167
+							->where('id', $titleID)
168
+							->update('tracker_titles');
169 169
 
170 170
 		return $success;
171 171
 	}
@@ -177,9 +177,9 @@  discard block
 block discarded – undo
177 177
 	 */
178 178
 	public function getSiteDataFromURL(string $site_url) {
179 179
 		$query = $this->db->select('*')
180
-		                  ->from('tracker_sites')
181
-		                  ->where('site', $site_url)
182
-		                  ->get();
180
+						  ->from('tracker_sites')
181
+						  ->where('site', $site_url)
182
+						  ->get();
183 183
 
184 184
 		return $query->row();
185 185
 	}
Please login to merge, or discard this patch.