ci-bonfire / Sprint

build/build.php

Spacing +14 added lines, -14 removed lines

@@ -49,20 +49,20 @@ 
 ini_set('display_errors', 1);
 
 // Load our autoloader
-require __DIR__ .'/../vendor/autoload.php';
+require __DIR__.'/../vendor/autoload.php';
 
 // Load configuration
 require 'build_config.php';
 
 // Folder definitions
-define('BUILDBASE', __DIR__ .'/');
+define('BUILDBASE', __DIR__.'/');
 
 // Don't stop script exectuion on 404...
 function show_404($page = '', $log_error = TRUE) {}
 
 // Make sure we have access to CI() object.
 ob_start();
-	require( BUILDBASE .'../index.php' );
+	require(BUILDBASE.'../index.php');
 ob_end_clean();
 
 //--------------------------------------------------------------------
@@ -73,12 +73,12 @@ 
 
 if (empty($release))
 {
-	$release = CLI::prompt("Which script", array_keys($config['builds']) );
+	$release = CLI::prompt("Which script", array_keys($config['builds']));
 }
 
-if (! array_key_exists($release, $config['builds']))
+if ( ! array_key_exists($release, $config['builds']))
 {
-	CLI::error('Invalid build specified: '. $release);
+	CLI::error('Invalid build specified: '.$release);
 	exit(1);
 }
 
@@ -89,20 +89,20 @@ 
 $class_name = $config['builds'][$release];
 
 
-if (! file_exists(BUILDBASE ."scripts/{$class_name}.php"))
+if ( ! file_exists(BUILDBASE."scripts/{$class_name}.php"))
 {
-	CLI::error('Unable to find build script: '. $class_name .'.php');
+	CLI::error('Unable to find build script: '.$class_name.'.php');
 	exit(1);
 }
 
-require BUILDBASE ."lib/BaseBuilder.php";
-require BUILDBASE ."scripts/{$class_name}.php";
+require BUILDBASE."lib/BaseBuilder.php";
+require BUILDBASE."scripts/{$class_name}.php";
 
-$builder = new $class_name( $config['destinations'][$release], get_instance() );
+$builder = new $class_name($config['destinations'][$release], get_instance());
 
-if (! is_object($builder))
+if ( ! is_object($builder))
 {
-	CLI::error('Unable to make new class: '. $class_name);
+	CLI::error('Unable to make new class: '.$class_name);
 	exit(1);
 }
 
@@ -118,4 +118,4 @@ 
 $end_time = microtime(true);
 $elapsed_time = number_format($end_time - $start_time, 4);
 
-CLI::write('Done in '. $elapsed_time .' seconds', 'green');
\ No newline at end of file
+CLI::write('Done in '.$elapsed_time.' seconds', 'green');
\ No newline at end of file

build/lib/BaseBuilder.php

Spacing +20 added lines, -20 removed lines

@@ -10,9 +10,9 @@ 
 
 	//--------------------------------------------------------------------
 
-	public function __construct($ci=null)
+	public function __construct($ci = null)
 	{
-	    $this->ci =& $ci;
+	    $this->ci = & $ci;
 	}
 
 	//--------------------------------------------------------------------
@@ -30,16 +30,16 @@ 
 
 		@$this->ensureFolder($destination);
 
-		while (false !== ( $file = readdir($dir)) )
+		while (false !== ($file = readdir($dir)))
 		{
-			if ( ! in_array($file, $this->ignore_files) )
+			if ( ! in_array($file, $this->ignore_files))
 			{
-				if ( is_dir($source .'/'. $file) )
+				if (is_dir($source.'/'.$file))
 				{
-					$this->copyFolder($source .'/'. $file, $destination .'/'. $file);
+					$this->copyFolder($source.'/'.$file, $destination.'/'.$file);
 				}
 				else {
-					copy($source .'/'. $file, $destination .'/'. $file);
+					copy($source.'/'.$file, $destination.'/'.$file);
 				}
 			}
 		}
@@ -74,7 +74,7 @@ 
 	 * @param $path
 	 * @param array $leave_files
 	 */
-	public function cleanFolder($path, $leave_files=[])
+	public function cleanFolder($path, $leave_files = [])
 	{
 		foreach (glob("{$path}/*") as $file)
 		{
@@ -97,25 +97,25 @@ 
 
 	//--------------------------------------------------------------------
 
-	public function compressFolder($source, $destination, $include_dir=false)
+	public function compressFolder($source, $destination, $include_dir = false)
 	{
-		if (! extension_loaded('zip') ) {
+		if ( ! extension_loaded('zip')) {
 			CLI::error('ZipArchive extension is required.');
 			exit(1);
 		}
 
-		if (! file_exists($source)) {
+		if ( ! file_exists($source)) {
 			CLI::error('Source folder not found for zipping.');
 			exit(1);
 		}
 
 		if (file_exists($destination))
 		{
-			unlink ($destination);
+			unlink($destination);
 		}
 
 		$zip = new ZipArchive();
-		if (! $zip->open($destination, ZIPARCHIVE::CREATE))
+		if ( ! $zip->open($destination, ZIPARCHIVE::CREATE))
 		{
 			CLI::error('Unknown error opening zip file.');
 			exit(1);
@@ -129,12 +129,12 @@ 
 
 			if ($include_dir) {
 
-				$arr = explode("/",$source);
-				$maindir = $arr[count($arr)- 1];
+				$arr = explode("/", $source);
+				$maindir = $arr[count($arr) - 1];
 
 				$source = "";
-				for ($i=0; $i < count($arr) - 1; $i++) {
-					$source .= '/' . $arr[$i];
+				for ($i = 0; $i < count($arr) - 1; $i++) {
+					$source .= '/'.$arr[$i];
 				}
 
 				$source = substr($source, 1);
@@ -147,18 +147,18 @@ 
 				$file = str_replace('\\', '/', $file);
 
 				// Ignore "." and ".." folders
-				if( in_array(substr($file, strrpos($file, '/')+1), array('.', '..', '.DS_Store')) )
+				if (in_array(substr($file, strrpos($file, '/') + 1), array('.', '..', '.DS_Store')))
 					continue;
 
 				$file = realpath($file);
 
 				if (is_dir($file) === true)
 				{
-					$zip->addEmptyDir(str_replace($source . '/', '', $file . '/'));
+					$zip->addEmptyDir(str_replace($source.'/', '', $file.'/'));
 				}
 				else if (is_file($file) === true)
 				{
-					$zip->addFromString(str_replace($source . '/', '', $file), file_get_contents($file));
+					$zip->addFromString(str_replace($source.'/', '', $file), file_get_contents($file));
 				}
 			}
 		}

build/scripts/InitialCleanup.php

Spacing +12 added lines, -12 removed lines

@@ -16,11 +16,11 @@ 
 
 	protected $ignore_files = ['.', '..', '.git', 'vendor', '.idea', '.travis.yml', 'build'];
 
-	public function __construct($destination, $ci=null)
+	public function __construct($destination, $ci = null)
 	{
 		parent::__construct($ci);
 
-	    $this->source_path = realpath(BUILDBASE .'../');
+	    $this->source_path = realpath(BUILDBASE.'../');
 
 		if (empty($this->source_path))
 		{
@@ -46,7 +46,7 @@ 
 		$this->cleanTestsFolder();
 
 		CLI::write("\tRemoving application modules...");
-		$this->cleanFolder($this->dest_path .'/application/modules', ['index.html', '.htaccess']);
+		$this->cleanFolder($this->dest_path.'/application/modules', ['index.html', '.htaccess']);
 
 		CLI::write("\tGenerating default encryption key for config file...");
 		$this->generateEncryptionKey();
@@ -61,10 +61,10 @@ 
 	private function cleanTempFiles()
 	{
 		// Remove Log Files
-		$this->cleanFolder($this->dest_path .'/application/logs', ['index.html', '.htaccess']);
+		$this->cleanFolder($this->dest_path.'/application/logs', ['index.html', '.htaccess']);
 
 		// Cache Files
-		$this->cleanFolder($this->dest_path .'/application/cache', ['index.html', '.htaccess']);
+		$this->cleanFolder($this->dest_path.'/application/cache', ['index.html', '.htaccess']);
 	}
 
 	//--------------------------------------------------------------------
@@ -72,15 +72,15 @@ 
 	public function cleanTestsFolder()
 	{
 		// Remove coverage Files
-		$this->cleanFolder($this->dest_path .'/tests/_output', ['.gitignore']);
+		$this->cleanFolder($this->dest_path.'/tests/_output', ['.gitignore']);
 
 		// Remove our Acceptance tests
-		$this->cleanFolder($this->dest_path .'/tests/acceptance/myth');
-		rmdir($this->dest_path .'/tests/acceptance/myth');
+		$this->cleanFolder($this->dest_path.'/tests/acceptance/myth');
+		rmdir($this->dest_path.'/tests/acceptance/myth');
 
 		// Remove our Unit tests
-		$this->cleanFolder($this->dest_path .'/tests/unit/myth');
-		rmdir($this->dest_path .'/tests/unit/myth');
+		$this->cleanFolder($this->dest_path.'/tests/unit/myth');
+		rmdir($this->dest_path.'/tests/unit/myth');
 	}
 
 	//--------------------------------------------------------------------
@@ -94,13 +94,13 @@ 
 		$length = 16;
 
 		$this->ci->load->library('Encryption');
-		$key = bin2hex( $this->ci->encryption->create_key( $length ) );
+		$key = bin2hex($this->ci->encryption->create_key($length));
 
 		$replace = "hex2bin( '$key' )";
 
 		$kit = new FileKit();
 
-		$kit->replaceIn(BUILDBASE .'../application/config/config.php', "'PLEASE_CHANGE_ME!'", $replace);
+		$kit->replaceIn(BUILDBASE.'../application/config/config.php', "'PLEASE_CHANGE_ME!'", $replace);
 	}
 
 	//--------------------------------------------------------------------

build/scripts/SprintRelease.php

Spacing +12 added lines, -12 removed lines

@@ -17,7 +17,7 @@ 
 
 	public function __construct($destination)
 	{
-	    $this->source_path = realpath(BUILDBASE .'../');
+	    $this->source_path = realpath(BUILDBASE.'../');
 
 		if (empty($this->source_path))
 		{
@@ -25,8 +25,8 @@ 
 			exit(1);
 		}
 
-		$this->dest_path = BUILDBASE . $destination;
-		$this->dest_path = rtrim($this->dest_path, '/ ') .'/'. date('Y-m-d');
+		$this->dest_path = BUILDBASE.$destination;
+		$this->dest_path = rtrim($this->dest_path, '/ ').'/'.date('Y-m-d');
 	}
 
 	//--------------------------------------------------------------------
@@ -51,10 +51,10 @@ 
 		$this->cleanTestsFolder();
 
 		CLI::write("\tRemoving application modules...");
-		$this->cleanFolder($this->dest_path .'/application/modules', ['index.html', '.htaccess']);
+		$this->cleanFolder($this->dest_path.'/application/modules', ['index.html', '.htaccess']);
 
 		CLI::write("\tCompressing files...");
-		$this->compressFolder($this->dest_path, $this->dest_path .'/Sprint_'. date('Y-m-d') .'.zip');
+		$this->compressFolder($this->dest_path, $this->dest_path.'/Sprint_'.date('Y-m-d').'.zip');
 	}
 
 	//--------------------------------------------------------------------
@@ -66,10 +66,10 @@ 
 	private function cleanTempFiles()
 	{
 		// Remove Log Files
-		$this->cleanFolder($this->dest_path .'/application/logs', ['index.html', '.htaccess']);
+		$this->cleanFolder($this->dest_path.'/application/logs', ['index.html', '.htaccess']);
 
 		// Cache Files
-		$this->cleanFolder($this->dest_path .'/application/cache', ['index.html', '.htaccess']);
+		$this->cleanFolder($this->dest_path.'/application/cache', ['index.html', '.htaccess']);
 	}
 
 	//--------------------------------------------------------------------
@@ -77,15 +77,15 @@ 
 	public function cleanTestsFolder()
 	{
 		// Remove coverage Files
-		$this->cleanFolder($this->dest_path .'/tests/_output', ['.gitignore']);
+		$this->cleanFolder($this->dest_path.'/tests/_output', ['.gitignore']);
 
 		// Remove our Acceptance tests
-		$this->cleanFolder($this->dest_path .'/tests/acceptance/myth');
-		rmdir($this->dest_path .'/tests/acceptance/myth');
+		$this->cleanFolder($this->dest_path.'/tests/acceptance/myth');
+		rmdir($this->dest_path.'/tests/acceptance/myth');
 
 		// Remove our Unit tests
-		$this->cleanFolder($this->dest_path .'/tests/unit/myth');
-		rmdir($this->dest_path .'/tests/unit/myth');
+		$this->cleanFolder($this->dest_path.'/tests/unit/myth');
+		rmdir($this->dest_path.'/tests/unit/myth');
 	}
 
 	//--------------------------------------------------------------------

index.php

Spacing +1 added lines, -1 removed lines

@@ -268,7 +268,7 @@
 	define('SYSDIR', trim(strrchr(trim(BASEPATH, '/'), '/'), '/'));
 
     // Path to the myth folder
-    define('MYTHPATH', rtrim( str_replace('\\', '/', $myth_folder), '/ ') .'/' );
+    define('MYTHPATH', rtrim(str_replace('\\', '/', $myth_folder), '/ ').'/');
 
 	// The path to the "application" folder
 	if (is_dir($application_folder))

myth/Api/Auth/APIAuthentication.php

Spacing +22 added lines, -22 removed lines

@@ -41,7 +41,7 @@ 
 
 	//--------------------------------------------------------------------
 
-	public function __construct($ci=null)
+	public function __construct($ci = null)
 	{
 		parent::__construct($ci);
 
@@ -107,7 +107,7 @@ 
 		// so request authorization by the client.
 		if (empty($username) || empty($password))
 		{
-			$this->ci->output->set_header('WWW-Authenticate: Basic realm="'. config_item('api.realm') .'"');
+			$this->ci->output->set_header('WWW-Authenticate: Basic realm="'.config_item('api.realm').'"');
 			return false;
 		}
 
@@ -157,7 +157,7 @@ 
 		// No digest string? Then you're done. Go home.
 		if (empty($digest_string))
 		{
-			$this->ci->output->set_header( sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque) );
+			$this->ci->output->set_header(sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque));
 			return false;
 		}
 
@@ -167,18 +167,18 @@ 
 		preg_match_all('@(username|nonce|uri|nc|cnonce|qop|response)=[\'"]?([^\'",]+)@', $digest_string, $matches);
 		$digest = (empty($matches[1]) || empty($matches[2])) ? array() : array_combine($matches[1], $matches[2]);
 
-		if (! array_key_exists('username', $digest))
+		if ( ! array_key_exists('username', $digest))
 		{
-			$this->ci->output->set_header( sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque) );
+			$this->ci->output->set_header(sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque));
 			return false;
 		}
 
 		// Grab the user that corresponds to that "username"
 		// exact field determined in the api config file - api.auth_field setting.
-		$user = $this->user_model->as_array()->find_by( config_item('api.auth_field'), $digest['username'] );
-		if (!  $user)
+		$user = $this->user_model->as_array()->find_by(config_item('api.auth_field'), $digest['username']);
+		if ( ! $user)
 		{
-			$this->ci->output->set_header( sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque) );
+			$this->ci->output->set_header(sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque));
 			return false;
 		}
 
@@ -187,16 +187,16 @@ 
 
 		if ($digest['qop'] == 'auth')
 		{
-			$A2 = md5( strtoupper( $_SERVER['REQUEST_METHOD'] ) .':'. $digest['uri'] );
+			$A2 = md5(strtoupper($_SERVER['REQUEST_METHOD']).':'.$digest['uri']);
 		} else {
 			$body = file_get_contents('php://input');
-			$A2 = md5( strtoupper( $_SERVER['REQUEST_METHOD'] ) .':'. $digest['uri'] .':'. md5($body) );
+			$A2 = md5(strtoupper($_SERVER['REQUEST_METHOD']).':'.$digest['uri'].':'.md5($body));
 		}
-		$valid_response = md5($A1 .':'. $digest['nonce'].':'. $digest['nc'] .':'. $digest['cnonce'] .':'. $digest['qop'] .':'. $A2);
+		$valid_response = md5($A1.':'.$digest['nonce'].':'.$digest['nc'].':'.$digest['cnonce'].':'.$digest['qop'].':'.$A2);
 
 		if ($digest['response'] != $valid_response)
 		{
-			$this->ci->output->set_header( sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque) );
+			$this->ci->output->set_header(sprintf('WWW-Authenticate: Digest realm="%s", nonce="%s", opaque="%s"', config_item('api.realm'), $nonce, $opaque));
 			return false;
 		}
 
@@ -233,7 +233,7 @@ 
 				break;
 		}
 
-		if (! $user)
+		if ( ! $user)
 		{
 			$this->user = null;
 			return $user;
@@ -246,7 +246,7 @@ 
 
 		// If throttling time is above zero, we can't allow
 		// logins now.
-		if ($time = (int)$this->isThrottled($user['email']) > 0)
+		if ($time = (int) $this->isThrottled($user['email']) > 0)
 		{
 			$this->error = sprintf(lang('api.throttled'), $time);
 			return false;
@@ -274,13 +274,13 @@ 
 	{
 	    $blacklist = explode(',', config_item('api.ip_blacklist'));
 
-		array_walk($blacklist, function (&$item, $key) {
+		array_walk($blacklist, function(&$item, $key) {
 			$item = trim($item);
 		});
 
 		if (in_array($this->ci->input->ip_address(), $blacklist))
 		{
-			throw new \Exception( lang('api.ip_denied'), 401);
+			throw new \Exception(lang('api.ip_denied'), 401);
 		}
 
 		return true;
@@ -299,13 +299,13 @@ 
 
 		array_push($whitelist, '127.0.0.1', '0.0.0.0');
 
-		array_walk($whitelist, function (&$item, $key) {
+		array_walk($whitelist, function(&$item, $key) {
 			$item = trim($item);
 		});
 
-		if (! in_array($this->ci->input->ip_address(), $whitelist))
+		if ( ! in_array($this->ci->input->ip_address(), $whitelist))
 		{
-			throw new \Exception( lang('api.ip_denied'), 401);
+			throw new \Exception(lang('api.ip_denied'), 401);
 		}
 
 		return true;
@@ -362,9 +362,9 @@ 
 	 *
 	 * @return bool|mixed|void
 	 */
-	public function login($credentials, $remember=false)
+	public function login($credentials, $remember = false)
 	{
-		throw new \BadMethodCallException( lang('api.unused_method') );
+		throw new \BadMethodCallException(lang('api.unused_method'));
 	}
 
 	//--------------------------------------------------------------------
@@ -379,7 +379,7 @@ 
 	 */
 	public function logout()
 	{
-		throw new \BadMethodCallException( lang('api.unused_method') );
+		throw new \BadMethodCallException(lang('api.unused_method'));
 	}
 
 	//--------------------------------------------------------------------

myth/Api/Server/ApiController.php

Spacing +36 added lines, -36 removed lines

@@ -214,7 +214,7 @@ 
 		$this->request->lang    = $this->detectLanguage();
 
 		// Load our language, requested.
-		if (! empty($this->request->lang))
+		if ( ! empty($this->request->lang))
 		{
 			$file = ! empty($this->language_file) ? $this->language_file : 'application';
 
@@ -233,20 +233,20 @@ 
 		$this->config->load('api');
 
 		// Gather config defaults when a value isn't set for this controller
-		if ( empty($this->enable_logging) ) $this->enable_logging = config_item('api.enable_logging');
-		if ( empty($this->enable_rate_limits) ) $this->enable_rate_limits = config_item('api.enable_rate_limits');
-		if ( empty($this->rate_limits) ) $this->rate_limits = config_item('api.rate_limits');
+		if (empty($this->enable_logging)) $this->enable_logging = config_item('api.enable_logging');
+		if (empty($this->enable_rate_limits)) $this->enable_rate_limits = config_item('api.enable_rate_limits');
+		if (empty($this->rate_limits)) $this->rate_limits = config_item('api.rate_limits');
 
 		// Should we restrict to SSL requests?
 		if (config_item('api.require_ssl') === true && ! $this->request->ssl)
 		{
-			$this->failForbidden( lang('api.ssl_required') );
+			$this->failForbidden(lang('api.ssl_required'));
 		}
 
 		// Should we restrict to only allow AJAX requests?
-		if (config_item('api.ajax_only') === true && ! $this->input->is_ajax_request() )
+		if (config_item('api.ajax_only') === true && ! $this->input->is_ajax_request())
 		{
-			$this->failForbidden( lang('api.ajax_required') );
+			$this->failForbidden(lang('api.ajax_required'));
 		}
 
 		$this->detectPage();
@@ -258,17 +258,17 @@ 
 			// in a single codebase.
 			get_instance()->config->set_item('api.authenticate_lib', $this->authenticate_class);
 
-			if (! $this->restrict(null, true) )
+			if ( ! $this->restrict(null, true))
 			{
 				$this->logTime();
-				$this->failUnauthorized( lang('api.unauthorized') );
+				$this->failUnauthorized(lang('api.unauthorized'));
 			}
 		}
 
 		// Has the user hit rate limits for this hour?
 		if ($this->enable_rate_limits && ! $this->isWithinLimits())
 		{
-			$this->failTooManyRequests( sprintf( lang('api.too_many_requests'), $this->rate_limits) );
+			$this->failTooManyRequests(sprintf(lang('api.too_many_requests'), $this->rate_limits));
 		}
 
 		// NEVER allow profiling via API.
@@ -302,7 +302,7 @@ 
 		}
 		else
 		{
-			return $this->fail( lang('api.unknown_endpoint'), 'not_implemented');
+			return $this->fail(lang('api.unknown_endpoint'), 'not_implemented');
 		}
 	}
 
@@ -323,7 +323,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function respond ($data = null, $status_code = 200)
+	public function respond($data = null, $status_code = 200)
 	{
 		// If data is null and not code provide, error and bail
 		if ($data === null && $status_code === null)
@@ -349,7 +349,7 @@ 
 
 		set_status_header($status_code);
 
-		header('Content-Length: ' . strlen($output));
+		header('Content-Length: '.strlen($output));
 
 		exit($output);
 	}
@@ -366,7 +366,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	protected function fail ($description, $status_code, $error_code = 'invalid_request')
+	protected function fail($description, $status_code, $error_code = 'invalid_request')
 	{
 		if (is_string($status_code))
 		{
@@ -577,26 +577,26 @@ 
 
 		$params['page'] = ($this->page > 1 ? $this->page + 1 : 2);
 
-		if (! $clean_get)
+		if ( ! $clean_get)
 		{
-			if ( ! isset($_GET) || ! is_array($_GET) )
+			if ( ! isset($_GET) || ! is_array($_GET))
 			{
 				$_GET = [];
 			}
 
-			foreach ( $_GET as $key => $value )
+			foreach ($_GET as $key => $value)
 			{
-				$params[ $key ] = $value;
+				$params[$key] = $value;
 			}
 
 			// Ensure we get a correct per_page value
-			if (! array_key_exists('per_page', $params))
+			if ( ! array_key_exists('per_page', $params))
 			{
 				$params['per_page'] = $this->per_page;
 			}
 		}
 
-		return site_url($path) .'?'. http_build_query($params);
+		return site_url($path).'?'.http_build_query($params);
 	}
 
 	//--------------------------------------------------------------------
@@ -617,7 +617,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function prevURL ($path, $clean_get = false)
+	public function prevURL($path, $clean_get = false)
 	{
 		// If paging is turned off, get out of here
 		if ($this->per_page == 0)
@@ -629,26 +629,26 @@ 
 
 		$params['page'] = ($this->page > 1 ? $this->page - 1 : 1);
 
-		if (! $clean_get)
+		if ( ! $clean_get)
 		{
-			if ( ! isset($_GET) || ! is_array($_GET) )
+			if ( ! isset($_GET) || ! is_array($_GET))
 			{
 				$_GET = [];
 			}
 
-			foreach ( $_GET as $key => $value )
+			foreach ($_GET as $key => $value)
 			{
 				$params[$key] = $value;
 			}
 
 			// Ensure we get a correct per_page value
-			if (! array_key_exists('per_page', $params))
+			if ( ! array_key_exists('per_page', $params))
 			{
 				$params['per_page'] = $this->per_page;
 			}
 		}
 
-		return site_url($path) .'?'. http_build_query($params);
+		return site_url($path).'?'.http_build_query($params);
 	}
 
 	//--------------------------------------------------------------------
@@ -667,11 +667,11 @@ 
 	protected function detectPage( )
 	{
 		// Is a per-page limit being set?
-		$this->per_page = isset($_GET['per_page']) ? (int)$_GET['per_page'] : $this->per_page;
+		$this->per_page = isset($_GET['per_page']) ? (int) $_GET['per_page'] : $this->per_page;
 
-		$page = (int)$this->input->get('page');
+		$page = (int) $this->input->get('page');
 
-		if (! $page || $page == 1)
+		if ( ! $page || $page == 1)
 		{
 			$offset = 0;
 		}
@@ -685,7 +685,7 @@ 
 
 		// If they've specifically passed in page=0, then we need
 		// to ignore paging...
-		if ((int)$this->input->get('page') === 0 && ! is_null($this->input->get('page')) )
+		if ((int) $this->input->get('page') === 0 && ! is_null($this->input->get('page')))
 		{
 			$this->per_page = 0;
 		}
@@ -707,7 +707,7 @@ 
 		$method = strtolower($this->input->server('REQUEST_METHOD'));
 
 		// If it's not an allowed method, let's default to a GET
-		if (! in_array($method, $this->allowed_http_methods))
+		if ( ! in_array($method, $this->allowed_http_methods))
 		{
 			$method = 'get';
 		}
@@ -782,14 +782,14 @@ 
 	 */
 	public function detectFields()
 	{
-	    if (! array_key_exists('fields', $_GET))
+	    if ( ! array_key_exists('fields', $_GET))
 	    {
 		    return;
 	    }
 
 		$fields = explode(',', $_GET['fields']);
 
-		if (! is_array($fields))
+		if ( ! is_array($fields))
 		{
 			return;
 		}
@@ -809,7 +809,7 @@ 
 	 */
 	public function logTime()
 	{
-		if (! $this->enable_logging)
+		if ( ! $this->enable_logging)
 		{
 			return;
 		}
@@ -820,7 +820,7 @@ 
 			'duration' => microtime(true) - $this->start_time,
 			'user_id'  => $this->authenticate->id(),
 			'ip_address' => $this->input->ip_address(),
-			'request'  => $this->uri->uri_string() .'?'. $_SERVER['QUERY_STRING'],
+			'request'  => $this->uri->uri_string().'?'.$_SERVER['QUERY_STRING'],
 			'method'   => $this->request->method
 		];
 
@@ -841,7 +841,7 @@ 
 	{
 		$model = new LogModel();
 
-		if ($model->requestsThisHourForUser( $this->authenticate->id() ) > $this->rate_limits)
+		if ($model->requestsThisHourForUser($this->authenticate->id()) > $this->rate_limits)
 		{
 			return false;
 		}

myth/Api/Server/LogModel.php

Spacing +2 added lines, -2 removed lines

@@ -55,11 +55,11 @@
 		$time = date('Y-m-d H:00:00');
 
 		$query = $this->db->select('id')
-						  ->where('user_id', (int)$user_id)
+						  ->where('user_id', (int) $user_id)
 						  ->where('created_on >=', $time)
 						  ->get($this->table_name);
 
-		return (int)$query->num_rows();
+		return (int) $query->num_rows();
 	}
 
 	//--------------------------------------------------------------------

myth/Auth/AuthTrait.php

Spacing +18 added lines, -18 removed lines

@@ -56,7 +56,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function restrict($uri=null, $return_only=false)
+	public function restrict($uri = null, $return_only = false)
 	{
 	    $this->setupAuthClasses();
 
@@ -67,7 +67,7 @@ 
 
 		if (method_exists($this, 'setMessage'))
 		{
-			$this->setMessage( lang('auth.not_logged_in') );
+			$this->setMessage(lang('auth.not_logged_in'));
 		}
 
 		if ($return_only)
@@ -77,7 +77,7 @@ 
 
 		if (empty($uri))
 		{
-			redirect( \Myth\Route::named('login') );
+			redirect(\Myth\Route::named('login'));
 		}
 
 		redirect($uri);
@@ -106,13 +106,13 @@ 
 	 *
 	 * @return bool
 	 */
-	public function restrictToGroups($groups, $uri='')
+	public function restrictToGroups($groups, $uri = '')
 	{
 	    $this->setupAuthClasses();
 
 		if ($this->authenticate->isLoggedIn())
 		{
-			if ($this->authorize->inGroup($groups, $this->authenticate->id() ) )
+			if ($this->authorize->inGroup($groups, $this->authenticate->id()))
 			{
 				return true;
 			}
@@ -120,15 +120,15 @@ 
 
 		if (method_exists($this, 'setMessage'))
 		{
-			$this->setMessage( lang('auth.not_enough_privilege') );
+			$this->setMessage(lang('auth.not_enough_privilege'));
 		}
 
 		if (empty($uri))
 		{
-			redirect( \Myth\Route::named('login') .'?request_uri='. current_url() );
+			redirect(\Myth\Route::named('login').'?request_uri='.current_url());
 		}
 
-		redirect($uri .'?request_uri='. current_url());
+		redirect($uri.'?request_uri='.current_url());
 	}
 
 	//--------------------------------------------------------------------
@@ -147,13 +147,13 @@ 
 	 *
 	 * @return bool
 	 */
-	public function restrictWithPermissions($permissions, $uri='')
+	public function restrictWithPermissions($permissions, $uri = '')
 	{
 	    $this->setupAuthClasses();
 
 		if ($this->authenticate->isLoggedIn())
 		{
-			if ($this->authorize->hasPermission($permissions, $this->authenticate->id() ) )
+			if ($this->authorize->hasPermission($permissions, $this->authenticate->id()))
 			{
 				return true;
 			}
@@ -161,15 +161,15 @@ 
 
 		if (method_exists($this, 'setMessage'))
 		{
-			$this->setMessage( lang('auth.not_enough_privilege') );
+			$this->setMessage(lang('auth.not_enough_privilege'));
 		}
 
 		if (empty($uri))
 		{
-			redirect( \Myth\Route::named('login') .'?request_uri='. current_url() );
+			redirect(\Myth\Route::named('login').'?request_uri='.current_url());
 		}
 
-		redirect($uri .'?request_uri='. current_url());
+		redirect($uri.'?request_uri='.current_url());
 	}
 
 	//--------------------------------------------------------------------
@@ -198,16 +198,16 @@ 
 		$auth = config_item('auth.authenticate_lib');
 
 		if (empty($auth)) {
-			throw new \RuntimeException( lang('auth.no_authenticate') );
+			throw new \RuntimeException(lang('auth.no_authenticate'));
 		}
 
-		$this->authenticate = new $auth( get_instance() );
+		$this->authenticate = new $auth(get_instance());
 
 		get_instance()->load->model('auth/user_model', 'user_model', true);
-		$this->authenticate->useModel( get_instance()->user_model );
+		$this->authenticate->useModel(get_instance()->user_model);
 
 		// Try to log us in automatically.
-		if (! $this->authenticate->isLoggedIn())
+		if ( ! $this->authenticate->isLoggedIn())
 		{
 			$this->authenticate->viaRemember();
 		}
@@ -218,7 +218,7 @@ 
 		$auth = config_item('auth.authorize_lib');
 
 		if (empty($auth)) {
-			throw new \RuntimeException( lang('auth.no_authenticate') );
+			throw new \RuntimeException(lang('auth.no_authenticate'));
 		}
 
 		$this->authorize = new $auth();