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/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();

myth/Auth/AuthenticateInterface.php

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
      * @param $credentials
      * @param bool $remember
      */
-    public function login($credentials, $remember=false);
+    public function login($credentials, $remember = false);
 
     //--------------------------------------------------------------------
 
@@ -65,7 +65,7 @@ 
      * @param bool $return_user
      * @return mixed
      */
-    public function validate($credentials, $return_user=false);
+    public function validate($credentials, $return_user = false);
 
     //--------------------------------------------------------------------
 
@@ -188,7 +188,7 @@ 
      * @param null $message
      * @return mixed
      */
-    public function changeStatus($newStatus, $message=null);
+    public function changeStatus($newStatus, $message = null);
 
     //--------------------------------------------------------------------
 

myth/Auth/AuthorizeInterface.php

Spacing +5 added lines, -5 removed lines

@@ -30,7 +30,7 @@ 
  * @since       Version 1.0
  */
 
-interface AuthorizeInterface  {
+interface AuthorizeInterface {
 
 	/**
 	 * Returns the latest error string.
@@ -150,7 +150,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function createGroup($name, $description='');
+	public function createGroup($name, $description = '');
 
 	//--------------------------------------------------------------------
 
@@ -174,7 +174,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function updateGroup($id, $name, $description='');
+	public function updateGroup($id, $name, $description = '');
 
 	//--------------------------------------------------------------------
 
@@ -210,7 +210,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function createPermission($name, $description='');
+	public function createPermission($name, $description = '');
 
 	//--------------------------------------------------------------------
 
@@ -234,7 +234,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function updatePermission($id, $name, $description='');
+	public function updatePermission($id, $name, $description = '');
 
 	//--------------------------------------------------------------------