DakuTree / manga-tracker

application/models/Auth_Model.php

Doc Comments +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 
 	/**
 	 * @param string $verificationCode
-	 * @return mixed
+	 * @return string
 	 */
 	public function verification_check(string $verificationCode) {
 		//user is trying to validate their email for signup, check if verification code is still valid/exists

Spacing +3 added lines, -3 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare(strict_types=1); defined('BASEPATH') or exit('No direct script access allowed');
+<?php declare(strict_types = 1); defined('BASEPATH') or exit('No direct script access allowed');
 
 class Auth_Model extends CI_Model {
 	public function __construct() {
@@ -60,7 +60,7 @@ 
 			}
 
 			$success = TRUE;
-		} catch (Exception $e) {
+		} catch(Exception $e) {
 			//echo 'Caught exception: ',  $e->getMessage(), "\n";
 
 			//revert verification
@@ -91,7 +91,7 @@ 
 				//TODO: Remove from DB, send user error that verification expired.
 			} else {
 				//not expired, verification is valid, return email
-				$return =  $result->email;
+				$return = $result->email;
 			}
 		}
 		return $return;

application/models/Tracker_Model.php

Doc Comments +3 added lines

@@ -88,6 +88,9 @@
 		return $arr;
 	}
 
+	/**
+	 * @return string
+	 */
 	public function getSiteDataFromURL(string $site_url) {
 		$query = $this->db->select('id, site_class')
 		                  ->from('tracker_sites')

Spacing +7 added lines, -7 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare(strict_types=1); defined('BASEPATH') OR exit('No direct script access allowed');
+<?php declare(strict_types = 1); defined('BASEPATH') OR exit('No direct script access allowed');
 
 class Tracker_Model extends CI_Model {
 	public $sites;
@@ -49,8 +49,8 @@ 
 			];
 		}
 		if($query->num_rows() > 0) {
-			foreach ($query->result() as $row) {
-				$is_unread     = intval($row->latest_chapter == $row->current_chapter ? '1' : '0');
+			foreach($query->result() as $row) {
+				$is_unread = intval($row->latest_chapter == $row->current_chapter ? '1' : '0');
 				$arr[$row->category]['unread_count'] = (($arr[$row->category]['unread_count'] ?? 0) + !$is_unread);
 				$arr[$row->category]['manga'][] = [
 					'id' => $row->id,
@@ -79,8 +79,8 @@ 
 			}
 
 			//NOTE: This does not sort in the same way as tablesorter, but it works better.
-			foreach (array_keys($arr) as $category) {
-				usort($arr[$category]['manga'], function ($a, $b) {
+			foreach(array_keys($arr) as $category) {
+				usort($arr[$category]['manga'], function($a, $b) {
 					return strtolower("{$a['new_chapter_exists']} - {$a['title_data']['title']}") <=> strtolower("{$b['new_chapter_exists']} - {$b['title_data']['title']}");
 				});
 			}
@@ -226,7 +226,7 @@ 
 		                  ->get();
 
 		if($query->num_rows() > 0) {
-			foreach ($query->result() as $row) {
+			foreach($query->result() as $row) {
 				print "> {$row->title} <{$row->site_class}>"; //Print this prior to doing anything so we can more easily find out if something went wrong
 				$titleData = $this->sites->{$row->site_class}->getTitleData($row->title_url);
 				if(!is_null($titleData['latest_chapter'])) {
@@ -261,7 +261,7 @@ 
 
 		$arr = [];
 		if($query->num_rows() > 0) {
-			foreach ($query->result() as $row) {
+			foreach($query->result() as $row) {
 				$arr[$row->category][] = [
 					'site'            => $row->site,
 					'title_url'       => $row->title_url,

application/tests/libraries/MY_Form_validation_test.php

Doc Comments +4 added lines

@@ -144,6 +144,10 @@
 	}
 
 	//utility functions
+
+	/**
+	 * @param string $field
+	 */
 	function get_error_message(/*str*/$field, /*obj*/ $customObj = FALSE) {
 		$obj = $customObj ?: $this->form_validation;
 		$error_messages = ReflectionHelper::getPrivateProperty(

public/index.php

Spacing +12 added lines, -12 removed lines

@@ -63,7 +63,7 @@ 
  * Different environments will require different levels of error reporting.
  * By default development will show errors but testing and live will hide them.
  */
-switch (ENVIRONMENT)
+switch(ENVIRONMENT)
 {
 	case 'development':
 		error_reporting(-1);
@@ -79,7 +79,7 @@ 
 	case 'testing':
 	case 'production':
 		ini_set('display_errors', 0);
-		if (version_compare(PHP_VERSION, '5.3', '>='))
+		if(version_compare(PHP_VERSION, '5.3', '>='))
 		{
 			error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
 		}
@@ -197,12 +197,12 @@ 
  */
 
 // Set the current directory correctly for CLI requests
-if (defined('STDIN'))
+if(defined('STDIN'))
 {
 	chdir(dirname(__FILE__));
 }
 
-if (($_temp = realpath($system_path)) !== FALSE)
+if(($_temp = realpath($system_path)) !== FALSE)
 {
 	$system_path = $_temp.DIRECTORY_SEPARATOR;
 }
@@ -217,7 +217,7 @@ 
 }
 
 // Is the system path correct?
-if ( ! is_dir($system_path))
+if(!is_dir($system_path))
 {
 	header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
 	echo 'Your system folder path does not appear to be set correctly. Please open the following file and correct this: '.pathinfo(__FILE__, PATHINFO_BASENAME);
@@ -242,9 +242,9 @@ 
 define('SYSDIR', basename(BASEPATH));
 
 // The path to the "application" directory
-if (is_dir($application_folder))
+if(is_dir($application_folder))
 {
-	if (($_temp = realpath($application_folder)) !== FALSE)
+	if(($_temp = realpath($application_folder)) !== FALSE)
 	{
 		$application_folder = $_temp;
 	}
@@ -257,7 +257,7 @@ 
 		);
 	}
 }
-elseif (is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
+elseif(is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
 {
 	$application_folder = BASEPATH.strtr(
 			trim($application_folder, '/\\'),
@@ -275,13 +275,13 @@ 
 define('APPPATH', $application_folder.DIRECTORY_SEPARATOR);
 
 // The path to the "views" directory
-if ( ! isset($view_folder[0]) && is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
+if(!isset($view_folder[0]) && is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
 {
 	$view_folder = APPPATH.'views';
 }
-elseif (is_dir($view_folder))
+elseif(is_dir($view_folder))
 {
-	if (($_temp = realpath($view_folder)) !== FALSE)
+	if(($_temp = realpath($view_folder)) !== FALSE)
 	{
 		$view_folder = $_temp;
 	}
@@ -294,7 +294,7 @@ 
 		);
 	}
 }
-elseif (is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
+elseif(is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
 {
 	$view_folder = APPPATH.strtr(
 			trim($view_folder, '/\\'),

application/tests/controllers/User/Auth/Login_test.php

Spacing +10 added lines, -10 removed lines

@@ -9,7 +9,7 @@ 
 	public function test_index_logged_in() {
 		//user is already logged in, redirect to dashboard
 		$this->request->setCallablePreConstructor(
-			function () {
+			function() {
 				$ion_auth = $this->getMock_ion_auth_logged_in();
 				load_class_instance('ion_auth', $ion_auth);
 			}
@@ -30,7 +30,7 @@ 
 		$this->markTestIncomplete('This test is broken for now.');
 
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$validation = $this->getDouble(
 					'CI_Form_validation',
 					['set_rules' => NULL, 'run' => TRUE]
@@ -44,7 +44,7 @@ 
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$user = $this->getDouble(
 					'User_Model',
 					['find_email_from_identity' => 'foobar']
@@ -56,7 +56,7 @@ 
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble(
 					'Ion_auth_model',
 					['login' => TRUE]
@@ -77,7 +77,7 @@ 
 		$this->markTestIncomplete('This test is broken for now.');
 
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$validation = $this->getDouble(
 					'CI_Form_validation',
 					['set_rules' => NULL, 'run' => TRUE]
@@ -91,7 +91,7 @@ 
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$user = $this->getDouble(
 					'User_Model',
 					['find_email_from_identity' => 'foobar']
@@ -103,7 +103,7 @@ 
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble(
 					'Ion_auth_model',
 					['login' => TRUE]
@@ -115,7 +115,7 @@ 
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				// Get mock object
 				$session = $this->getDouble(
 					'CI_Session',
@@ -134,7 +134,7 @@ 
 	public function test_login_validation_fail() {
 		//user isn't logged in, validation failed, this is happens on the first time loading the page
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				// Get mock object
 				$validation = $this->getDouble(
 					'CI_Form_validation',
@@ -156,7 +156,7 @@ 
 	public function test_login_validation_pass_but_login_fail() {
 		//user isn't logged in, tried to login, validation succeeded but login failed
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				// Get mock object
 				$validation = $this->getDouble(
 					'CI_Form_validation',

application/tests/controllers/User/Auth/Signup_test.php

Spacing +16 added lines, -16 removed lines

@@ -6,7 +6,7 @@ 
 		$this->assertResponseCode(200);
 
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble('Auth_Model', ['verification_check' => 'foobar']);
 				$this->verifyInvokedOnce($auth, 'verification_check');
 				$CI->Auth = $auth;
@@ -19,7 +19,7 @@ 
 	public function test_index_logged_in() {
 		//user is already logged in, redirect to dashboard
 		$this->request->setCallablePreConstructor(
-			function () {
+			function() {
 				$ion_auth = $this->getMock_ion_auth_logged_in();
 				load_class_instance('ion_auth', $ion_auth);
 			}
@@ -37,7 +37,7 @@ 
 
 	public function test_signup_p1_validation_pass_verification_pass() {
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$validation = $this->getDouble(
 					'CI_Form_validation',
 					['set_rules' => NULL, 'run' => TRUE]
@@ -51,7 +51,7 @@ 
 			}
 		);
 		$this->request->addCallable(
-				function ($CI) {
+				function($CI) {
 					$auth = $this->getDouble('Auth_Model', ['verification_start' => TRUE]);
 					$this->verifyInvokedOnce($auth, 'verification_start');
 					$CI->Auth = $auth;
@@ -65,7 +65,7 @@ 
 	}
 	public function test_signup_p1_validation_pass_verification_fail() {
 		$this->request->setCallable(
-				function ($CI) {
+				function($CI) {
 					$validation = $this->getDouble(
 							'CI_Form_validation',
 							['set_rules' => NULL, 'run' => TRUE]
@@ -79,7 +79,7 @@ 
 				}
 		);
 		$this->request->addCallable(
-				function ($CI) {
+				function($CI) {
 					$auth = $this->getDouble('Auth_Model', ['verification_start' => FALSE]);
 					$this->verifyInvokedOnce($auth, 'verification_start');
 					$CI->Auth = $auth;
@@ -93,7 +93,7 @@ 
 	}
 	public function test_signup_p1_validation_fail() {
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$validation = $this->getDouble(
 					'CI_Form_validation',
 					['set_rules' => NULL, 'run' => FALSE, 'set_value' => '']
@@ -115,14 +115,14 @@ 
 		//form was valid, and register was successful, user is redirected to dashboard
 
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble('Auth_Model', ['verification_check' => 'foo@bar.com']);
 				$this->verifyInvokedOnce($auth, 'verification_check');
 				$CI->Auth = $auth;
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$validation = $this->getDouble(
 					'CI_Form_validation',
 					['set_rules' => NULL, 'run' => TRUE]
@@ -136,7 +136,7 @@ 
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble(
 					'Ion_auth_model',
 					['register' => TRUE]
@@ -154,14 +154,14 @@ 
 	public function test_signup_p2_verification_pass_validation_pass_register_fail() {
 		//form was valid, and register was unsuccessful, reshow form
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble('Auth_Model', ['verification_check' => 'foo@bar.com']);
 				$this->verifyInvokedOnce($auth, 'verification_check');
 				$CI->Auth = $auth;
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$validation = $this->getDouble(
 					'CI_Form_validation',
 					['set_rules' => NULL, 'run' => TRUE, 'set_value' => 'foobar']
@@ -176,7 +176,7 @@ 
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble(
 					'Ion_auth_model',
 					['register' => FALSE, 'errors' => FALSE, 'logged_in' => FALSE]
@@ -194,14 +194,14 @@ 
 	public function test_signup_p2_verification_pass_validation_fail() {
 		//validation failed, this is probably the first time the user visits the page, show form
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble('Auth_Model', ['verification_check' => 'foo@bar.com']);
 				$this->verifyInvokedOnce($auth, 'verification_check');
 				$CI->Auth = $auth;
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$validation = $this->getDouble(
 					'CI_Form_validation',
 					['set_rules' => NULL, 'run' => FALSE, 'set_value' => '']
@@ -222,7 +222,7 @@ 
 	public function test_signup_p2_verification_fail() {
 		//validation failed, this is probably the first time the user visits the page, show form
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble('Auth_Model', ['verification_check' => FALSE]);
 				$this->verifyInvokedOnce($auth, 'verification_check');
 				$CI->Auth = $auth;

application/tests/controllers/User/Auth/Forgot_Password_test.php

Spacing +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
 
 
 		$this->request->setCallablePreConstructor(
-			function () {
+			function() {
 				$ion_auth = $this->getMock_ion_auth_logged_in();
 				load_class_instance('ion_auth', $ion_auth);
 			}
@@ -38,7 +38,7 @@ 
 	public function test_forgot_password_validation_pass() {
 		//user isn't logged in, form is valid, user is shown success page regardless of if email is used
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$validation = $this->getDouble(
 					'CI_Form_validation',
 					['set_rules' => NULL, 'run' => TRUE]
@@ -52,7 +52,7 @@ 
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble(
 					'Ion_auth_model',
 					['forgotten_password' => TRUE, 'row' => (object) ['email' => 'foo@bar.com'], 'logged_in' => FALSE]
@@ -72,7 +72,7 @@ 
 	public function test_forgot_password_validation_fail() {
 		//user isn't logged in, form is invalid, this is usually the case when first viewing the page
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$validation = $this->getDouble(
 					'CI_Form_validation',
 					['set_rules' => NULL, 'run' => FALSE]
@@ -93,7 +93,7 @@ 
 	public function test_reset_password_user_pass_validation_pass_change_fail() {
 		//reset code is valid, form is invalid (or new)
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble(
 					'Ion_auth_model',
 					['forgotten_password_check' => TRUE, 'reset_password' => FALSE]
@@ -105,7 +105,7 @@ 
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$validation = $this->getDouble(
 					'CI_Form_validation',
 					['set_rules' => NULL, 'run' => TRUE]
@@ -126,7 +126,7 @@ 
 	public function test_reset_password_user_pass_validation_pass_change_pass() {
 		//reset code is valid, form is valid, password change was successful, redirect to login
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble(
 					'Ion_auth_model',
 					['forgotten_password_check' => TRUE, 'reset_password' => TRUE]
@@ -138,7 +138,7 @@ 
 			}
 		);
 		$this->request->addCallable(
-			function ($CI) {
+			function($CI) {
 				$validation = $this->getDouble(
 					'CI_Form_validation',
 					['set_rules' => NULL, 'run' => TRUE]
@@ -159,7 +159,7 @@ 
 	public function test_reset_password_user_pass_validation_fail() {
 		//reset code is valid, form is valid, password change was unsuccessful, send back to reset_password page
 		$this->request->setCallable(
-			function ($CI) {
+			function($CI) {
 				$auth = $this->getDouble(
 					'Ion_auth_model',
 					['forgotten_password_check' => TRUE, 'logged_in' => FALSE]

application/tests/controllers/IndexC_test.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 
 	public function test_APPPATH() {
 		$actual   = realpath(APPPATH);
-		$expected = realpath(__DIR__ . '/../..');
+		$expected = realpath(__DIR__.'/../..');
 		$this->assertEquals(
 			$expected,
 			$actual,

application/tests/TestCase.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 		                  ->disableOriginalConstructor()
 		                  ->getMock();
 
-		foreach ($methods as $method => $return) {
+		foreach($methods as $method => $return) {
 			$db_result->method($method)->willReturn($return);
 		}
 		return $db_result;