ci-bonfire / Sprint

myth/UIKits/Foundation.php

Spacing +30 added lines, -30 removed lines

@@ -58,7 +58,7 @@ 
      * @param array $options
      * @return mixed
      */
-    public function row($options=[], \Closure $c)
+    public function row($options = [], \Closure $c)
     {
         list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'row', true);
 
@@ -90,7 +90,7 @@ 
      * @param array $attributes
      * @return mixed
      */
-    public function column($options=[], \Closure $c)
+    public function column($options = [], \Closure $c)
     {
         // Build our classes
         $classes = '';
@@ -100,33 +100,33 @@ 
             switch ($size)
             {
                 case 's':
-                    $classes .= ' small-'. $value;
+                    $classes .= ' small-'.$value;
                     break;
                 case 'm':
-                    $classes .= ' medium-'. $value;
+                    $classes .= ' medium-'.$value;
                     break;
                 case 'l':
-                    $classes .= ' large-'. $value;
+                    $classes .= ' large-'.$value;
                     break;
                 case 'xl':
-                    $classes .= ' large-'. $value;
+                    $classes .= ' large-'.$value;
                     break;
                 case 's-offset':
-                    $classes .= ' small-offset-'. $value;
+                    $classes .= ' small-offset-'.$value;
                     break;
                 case 'm-offset':
-                    $classes .= ' medium-offset-'. $value;
+                    $classes .= ' medium-offset-'.$value;
                     break;
                 case 'l-offset':
-                    $classes .= ' large-offset-'. $value;
+                    $classes .= ' large-offset-'.$value;
                     break;
                 case 'xl-offset':
-                    $classes .= ' large-offset-'. $value;
+                    $classes .= ' large-offset-'.$value;
                     break;
             }
         }
 
-        $classes = $this->buildClassString($classes .' columns', $options, true);
+        $classes = $this->buildClassString($classes.' columns', $options, true);
 
         $id = $this->buildIdFromOptions($options);
 
@@ -155,7 +155,7 @@ 
      * @param callable $c
      * @return string
      */
-    public function navbar($options=[], \Closure $c)
+    public function navbar($options = [], \Closure $c)
     {
         $output = '';
 
@@ -205,7 +205,7 @@ 
      * @param string $url
      * @return string
      */
-    public function navbarTitle($title, $url='#')
+    public function navbarTitle($title, $url = '#')
     {
         return "<ul class='title-area'>
     <li class='name'>
@@ -227,11 +227,11 @@ 
      * @param callable $c
      * @return string
      */
-    public function navbarRight($options=[], \Closure $c)
+    public function navbarRight($options = [], \Closure $c)
     {
         $output = '';
 
-        if (! isset($this->states['nav-section-open']))
+        if ( ! isset($this->states['nav-section-open']))
         {
             $output .= "<section class='top-bar-section'>\n";
             $this->states['nav-section-open'] = true;
@@ -266,11 +266,11 @@ 
      * @param callable $c
      * @return string
      */
-    public function navbarLeft($options=[], \Closure $c)
+    public function navbarLeft($options = [], \Closure $c)
     {
         $output = '';
 
-        if (! isset($this->states['nav-section-open']))
+        if ( ! isset($this->states['nav-section-open']))
         {
             $output .= "<section class='top-bar-section'>\n";
             $this->states['nav-section-open'] = true;
@@ -311,7 +311,7 @@ 
      * @param array $options
      * @return string
      */
-    public function navItem($title, $url='#', $options=[], $active=false)
+    public function navItem($title, $url = '#', $options = [], $active = false)
     {
         $options['active'] = $active;
 
@@ -333,7 +333,7 @@ 
      * @param array    $options
      * @param callable $c
      */
-    public function navDropdown($title,$options=[], \Closure $c)
+    public function navDropdown($title, $options = [], \Closure $c)
     {
         $classes = $this->buildClassString('has-dropdown', $options, true);
 
@@ -366,7 +366,7 @@ 
 
     //--------------------------------------------------------------------
 
-    public function sideNav($options=[], \Closure $c)
+    public function sideNav($options = [], \Closure $c)
     {
         $classes = $this->buildClassString('side-nav', $options, true);
 
@@ -392,7 +392,7 @@ 
      * @param callable $c
      * @return mixed
      */
-    public function breadcrumb($options=[], \Closure $c)
+    public function breadcrumb($options = [], \Closure $c)
     {
         list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'breadcrumbs', true);
 
@@ -433,9 +433,9 @@ 
      * @param array $options
      * @return mixed
      */
-    public function button($title, $style='default', $size='default', $options=[])
+    public function button($title, $style = 'default', $size = 'default', $options = [])
     {
-        $tag= "<button type='button' {classes} {id} {attributes}>{$title}</button>";
+        $tag = "<button type='button' {classes} {id} {attributes}>{$title}</button>";
 
         return $this->renderButtonElement($title, $style, $size, $options, $tag);
     }
@@ -454,9 +454,9 @@ 
      * @param array $options
      * @return mixed
      */
-    public function buttonLink($title, $url='#', $style='default', $size='default', $options=[])
+    public function buttonLink($title, $url = '#', $style = 'default', $size = 'default', $options = [])
     {
-        $class = isset($options['class']) ? $options['class'] .' button' : 'button';
+        $class = isset($options['class']) ? $options['class'].' button' : 'button';
         $options['class'] = $class;
 
         $tag = "<a {classes} {id} {attributes} role='button'>{$title}</a>";
@@ -479,7 +479,7 @@ 
         $valid_styles = ['default', 'primary', 'success', 'info', 'warning', 'danger'];
         $valid_sizes  = ['default', 'small', 'xsmall', 'large'];
 
-        if (! in_array($style, $valid_styles))
+        if ( ! in_array($style, $valid_styles))
         {
             $style = 'default';
             $options['attributes'][] = 'data-error="Invalid Style passed to button method."';
@@ -488,7 +488,7 @@ 
         $classes = 'btn ';
 
         // Sizes
-        switch($size)
+        switch ($size)
         {
             case 'small':
                 $classes .= 'small ';
@@ -536,7 +536,7 @@ 
         // If we're in a button group we need to wrap each item in li tags.
         if (isset($this->states['inButtonGroup']))
         {
-            $tag = '<li>'. $tag .'</li>';
+            $tag = '<li>'.$tag.'</li>';
         }
         return $tag;
     }
@@ -602,7 +602,7 @@ 
      * @param callable $c
      * @return mixed
      */
-    public function buttonDropdown($title, $style='default', $size='default', $options=[], \Closure $c)
+    public function buttonDropdown($title, $style = 'default', $size = 'default', $options = [], \Closure $c)
     {
         list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'button split', true);
 
@@ -632,7 +632,7 @@ 
      * @param bool $closable
      * @return mixed
      */
-    public function notice($content, $style='success', $closable=true, $options=[])
+    public function notice($content, $style = 'success', $closable = true, $options = [])
     {
         list($classes, $id, $attributes) = $this->parseStandardOptions($options, 'alert-box ', false);
 

myth/_generators/Api/ApiGenerator.php

Spacing +53 added lines, -53 removed lines

@@ -56,7 +56,7 @@ 
 	 * @param array $segments
 	 * @param bool $quiet
 	 */
-	public function run($segments=[], $quiet=false)
+	public function run($segments = [], $quiet = false)
 	{
 		// Show an index?
 		if (empty($segments[0]))
@@ -75,7 +75,7 @@ 
 				$this->scaffold($segments, $quiet);
 				break;
 			default:
-				if (! $quiet)
+				if ( ! $quiet)
 				{
 					CLI::write('Nothing to do.', 'green');
 				}
@@ -89,8 +89,8 @@ 
 	{
 		CLI::write("\nAvailable API Generators");
 
-		CLI::write( CLI::color('install', 'yellow') .'   install        Creates migrations, alters config file for desired authentication' );
-		CLI::write( CLI::color('scaffold', 'yellow') .'  scaffold <name>  Creates basic CRUD controller, routes, and optionally API Blueprint files' );
+		CLI::write(CLI::color('install', 'yellow').'   install        Creates migrations, alters config file for desired authentication');
+		CLI::write(CLI::color('scaffold', 'yellow').'  scaffold <name>  Creates basic CRUD controller, routes, and optionally API Blueprint files');
 	}
 
 	//--------------------------------------------------------------------
@@ -105,7 +105,7 @@ 
 	 * @param $segments
 	 * @param $quiet
 	 */
-	private function scaffold( $segments, $quiet )
+	private function scaffold($segments, $quiet)
 	{
 		$this->load->helper('inflector');
 
@@ -118,7 +118,7 @@ 
 
 		if (empty($resource))
 		{
-			$resource = strtolower( CLI::prompt('Resource name') );
+			$resource = strtolower(CLI::prompt('Resource name'));
 		}
 
 		// Resources should be plural, but we'll need a singular name also.
@@ -138,27 +138,27 @@ 
 
 		if (empty($model))
 		{
-			$model = $this->detectModel( $resource_single );
+			$model = $this->detectModel($resource_single);
 		}
 
 		/*
 		 * Start Building
 		 */
-		$this->destination = APPPATH .'controllers/';
-		if (! empty($version))
+		$this->destination = APPPATH.'controllers/';
+		if ( ! empty($version))
 		{
-			$this->destination .= $version .'/';
+			$this->destination .= $version.'/';
 		}
 
 		// Controller
-		if (! $this->createController($resource_single, $resource_plural, $version) )
+		if ( ! $this->createController($resource_single, $resource_plural, $version))
 		{
 			CLI::error('Unknown error creating Controller.');
 			exit(1);
 		}
 
 		// Language Files
-		if (! $this->createLanguage($resource_single, $resource_plural, $version, $model) )
+		if ( ! $this->createLanguage($resource_single, $resource_plural, $version, $model))
 		{
 			CLI::error('Unknown error creating Language File.');
 			exit(1);
@@ -167,7 +167,7 @@ 
 		// Blueprint File
 		if ($blueprint)
 		{
-			if (! $this->createBlueprint($resource_single, $resource_plural, $version, $model) )
+			if ( ! $this->createBlueprint($resource_single, $resource_plural, $version, $model))
 			{
 				CLI::error('Unknown error creating Blueprint file.');
 				exit(1);
@@ -175,7 +175,7 @@ 
 		}
 
 		// Modify Routes
-		if (! $this->addRoutes($resource_plural, $version) )
+		if ( ! $this->addRoutes($resource_plural, $version))
 		{
 			CLI::error('Unknown error adding Routes.');
 			exit(1);
@@ -195,7 +195,7 @@ 
 		CLI::write("\nVersions are simply controller folders (i.e. controllers/v1/...)");
 		CLI::write("(Enter 'na' for no version folder)");
 
-		$version = strtolower( CLI::prompt('Version name', 'v1') );
+		$version = strtolower(CLI::prompt('Version name', 'v1'));
 		$version = $version == 'na' ? '' : $version;
 
 		return $version;
@@ -211,7 +211,7 @@ 
 	private function askBlueprint()
 	{
 		CLI::write("\nAPI Blueprint is a plain-text API documentation starter.");
-		CLI::write("See: ". CLI::color('https://apiblueprint.org', 'light_blue'));
+		CLI::write("See: ".CLI::color('https://apiblueprint.org', 'light_blue'));
 
 		$make_blueprint = CLI::prompt('Create Blueprint file?', ['y', 'n']);
 
@@ -222,16 +222,16 @@ 
 
 	private function detectModel($name)
 	{
-		$model_name = ucfirst($name) .'_model.php';
+		$model_name = ucfirst($name).'_model.php';
 
-		if (! file_exists(APPPATH .'models/'. $model_name))
+		if ( ! file_exists(APPPATH.'models/'.$model_name))
 		{
 			CLI::write("\nUnable to find model named: {$model_name}");
 			$model_name = CLI::prompt('Model filename');
 		}
 		else
 		{
-			CLI::write("Using model: ". CLI::color($model_name, 'yellow') );
+			CLI::write("Using model: ".CLI::color($model_name, 'yellow'));
 		}
 
 		return $model_name;
@@ -250,20 +250,20 @@ 
      * @internal param $name
      *
      */
-	private function createController( $single, $plural, $version )
+	private function createController($single, $plural, $version)
 	{
 		$data = [
-			'today'             => date( 'Y-m-d H:ia' ),
-			'model_name'        => strtolower($single) .'_model',
+			'today'             => date('Y-m-d H:ia'),
+			'model_name'        => strtolower($single).'_model',
 			'plural'            => $plural,
 			'single'            => $single,
 			'class_name'        => ucfirst($plural),
 			'version'           => $version
 		];
 
-		$destination = $this->destination . ucfirst($plural) .'.php';
+		$destination = $this->destination.ucfirst($plural).'.php';
 
-		return $this->copyTemplate( 'controller', $destination, $data, $this->overwrite );
+		return $this->copyTemplate('controller', $destination, $data, $this->overwrite);
 	}
 
 	//--------------------------------------------------------------------
@@ -277,7 +277,7 @@ 
      *
      * @return $this
      */
-	private function createLanguage( $single, $plural, $version )
+	private function createLanguage($single, $plural, $version)
 	{
         $data = [
             'plural'            => $plural,
@@ -286,9 +286,9 @@ 
             'uc_plural'         => ucfirst($plural),
         ];
 
-        $destination = APPPATH ."language/english/api_{$plural}_lang.php";
+        $destination = APPPATH."language/english/api_{$plural}_lang.php";
 
-        return $this->copyTemplate( 'lang', $destination, $data, $this->overwrite );
+        return $this->copyTemplate('lang', $destination, $data, $this->overwrite);
 	}
 
 	//--------------------------------------------------------------------
@@ -306,17 +306,17 @@ 
      * @internal param $name
      *
      */
-	private function createBlueprint( $single, $plural, $version, $model )
+	private function createBlueprint($single, $plural, $version, $model)
 	{
 		$version = rtrim($version, '/');
-		if (! empty($version))
+		if ( ! empty($version))
 		{
 			$version .= '/';
 		}
 
 		// Load the model so we can use the correct table to use
-        $model = strtolower( str_replace('.php', '', $model) );
-		$this->load->model( $model, $model, true );
+        $model = strtolower(str_replace('.php', '', $model));
+		$this->load->model($model, $model, true);
 
         $obj = $this->formatObject($model);
 
@@ -331,11 +331,11 @@ 
             'formatted'         => $obj
 		];
 
-		$destination = APPPATH .'docs/api/'. $version . $plural .'.md';
+		$destination = APPPATH.'docs/api/'.$version.$plural.'.md';
 
-		$success = $this->copyTemplate( 'blueprint', $destination, $data, $this->overwrite );
+		$success = $this->copyTemplate('blueprint', $destination, $data, $this->overwrite);
 
-        if (! $this->updateTOC($plural, $version))
+        if ( ! $this->updateTOC($plural, $version))
         {
             CLI::write("\tUnable to modify the toc file.", 'light_red');
         }
@@ -353,21 +353,21 @@ 
      *
      * @return $this|bool
      */
-    private function updateTOC( $plural, $version )
+    private function updateTOC($plural, $version)
     {
-        $path = APPPATH .'docs/_toc.ini';
+        $path = APPPATH.'docs/_toc.ini';
 
         // We need a TOC file to exist if we're going to modify it silly.
-        if (! file_exists($path))
+        if ( ! file_exists($path))
         {
-            if (! $this->copyTemplate('toc', $path))
+            if ( ! $this->copyTemplate('toc', $path))
             {
                 return false;
             }
         }
 
         $version = rtrim($version, '/ ');
-        if (! empty($version))
+        if ( ! empty($version))
         {
             $version .= '/';
         }
@@ -389,7 +389,7 @@ 
      *
      * @return string
      */
-    private function formatObject( $model )
+    private function formatObject($model)
     {
         $fields = $this->db->field_data($this->$model->table_name);
 
@@ -448,14 +448,14 @@ 
      *
      * @return $this
      */
-	private function addRoutes( $plural, $version )
+	private function addRoutes($plural, $version)
 	{
-        $path = APPPATH .'config/routes.php';
+        $path = APPPATH.'config/routes.php';
 
         $version = rtrim($version, ', ');
-        if (! empty($version))
+        if ( ! empty($version))
         {
-            $version .='/';
+            $version .= '/';
         }
 
         $content = "\$routes->resources('{$version}{$plural}');\n";
@@ -476,9 +476,9 @@ 
 	 */
 	private function install( )
 	{
-		CLI::write("Available Auth Types: ". CLI::color('basic, digest, none', 'yellow') );
+		CLI::write("Available Auth Types: ".CLI::color('basic, digest, none', 'yellow'));
 
-		$this->auth_type = trim( CLI::prompt('Auth type') );
+		$this->auth_type = trim(CLI::prompt('Auth type'));
 
 		switch ($this->auth_type)
 		{
@@ -531,24 +531,24 @@ 
 
 		// Update the config setting
 		$content = "config['api.enable_logging']    = true;";
-		$this->injectIntoFile(APPPATH .'config/api.php', $content, ['regex' => "/config\['api.enable_logging']\s+=\s+[a-zA-Z]+;/u"] );
+		$this->injectIntoFile(APPPATH.'config/api.php', $content, ['regex' => "/config\['api.enable_logging']\s+=\s+[a-zA-Z]+;/u"]);
 	}
 
 	//--------------------------------------------------------------------
 
 
-	private function makeMigration( $tpl, $name )
+	private function makeMigration($tpl, $name)
 	{
 		// Create the migration
 		$this->load->library('migration');
 
 		$destination = $this->migration->determine_migration_path('app', true);
 
-		$file = $this->migration->make_name( $name );
+		$file = $this->migration->make_name($name);
 
-		$destination = rtrim($destination, '/') .'/'. $file;
+		$destination = rtrim($destination, '/').'/'.$file;
 
-		if (! $this->copyTemplate( $tpl, $destination, [], true) )
+		if ( ! $this->copyTemplate($tpl, $destination, [], true))
 		{
 			CLI::error('Error creating migration file.');
 		}
@@ -563,11 +563,11 @@ 
 	 *
 	 * @param $type
 	 */
-	private function setAuthType( $type )
+	private function setAuthType($type)
 	{
 		$content = "config['api.auth_type']    = '{$type}';";
 
-		$this->injectIntoFile(APPPATH .'config/api.php', $content, ['regex' => "/config\['api.auth_type']\s+=\s+'[a-zA-Z]+';/u"] );
+		$this->injectIntoFile(APPPATH.'config/api.php', $content, ['regex' => "/config\['api.auth_type']\s+=\s+'[a-zA-Z]+';/u"]);
 	}
 
 	//--------------------------------------------------------------------

myth/_generators/Controller/ControllerGenerator.php

Spacing +58 added lines, -60 removed lines

@@ -47,49 +47,49 @@ 
 
 	//--------------------------------------------------------------------
 
-	public function run( $segments = [ ], $quiet = FALSE )
+	public function run($segments = [], $quiet = FALSE)
 	{
-		$name = array_shift( $segments );
+		$name = array_shift($segments);
 
-		if ( empty( $name ) )
+		if (empty($name))
 		{
-			$name = CLI::prompt( 'Controller name' );
+			$name = CLI::prompt('Controller name');
 		}
 
 		// Format to CI Standards
-		$name = ucfirst( $name );
+		$name = ucfirst($name);
 
-		if ( $quiet === FALSE )
+		if ($quiet === FALSE)
 		{
-			$this->collectOptions( $name );
+			$this->collectOptions($name);
 		}
 		else
 		{
-			$this->quietSetOptions( $name );
+			$this->quietSetOptions($name);
 		}
 
 		$data = [
 			'controller_name' => $name,
-			'today'           => date( 'Y-m-d H:ia' )
+			'today'           => date('Y-m-d H:ia')
 		];
 
-		$data = array_merge( $data, $this->options );
+		$data = array_merge($data, $this->options);
 
 		if ($data['themed'] == 'y' || $data['themed'] === true)
 		{
 			$data['base_class'] = 'ThemedController';
 		}
 
-		$destination = $this->determineOutputPath( 'controllers' ) . $name . '.php';
+		$destination = $this->determineOutputPath('controllers').$name.'.php';
 
-		if ( ! $this->copyTemplate( 'controller', $destination, $data, $this->overwrite ) )
+		if ( ! $this->copyTemplate('controller', $destination, $data, $this->overwrite))
 		{
-			CLI::error( 'Error creating new files' );
+			CLI::error('Error creating new files');
 		}
 
-		if ( CLI::option( 'create_views' ) && $this->options['themed'] == 'y' )
+		if (CLI::option('create_views') && $this->options['themed'] == 'y')
 		{
-			$this->createViews( $name );
+			$this->createViews($name);
 		}
 
 		return TRUE;
@@ -97,20 +97,20 @@ 
 
 	//--------------------------------------------------------------------
 
-	protected function quietSetOptions( $name )
+	protected function quietSetOptions($name)
 	{
 		$options = CLI::getOptions();
 
-		if ( ! empty( $options['model'] ) )
+		if ( ! empty($options['model']))
 		{
 			$this->options['model'] = $options['model'];
 
 			// Format per CI
-			if ( ! empty( $this->options['model'] ) && substr( $this->options['model'], - 6 ) !== '_model' )
+			if ( ! empty($this->options['model']) && substr($this->options['model'], - 6) !== '_model')
 			{
 				$this->options['model'] .= '_model';
 			}
-			$this->options['model'] = ! empty( $this->options['model'] ) ? ucfirst( $this->options['model'] ) : NULL;
+			$this->options['model'] = ! empty($this->options['model']) ? ucfirst($this->options['model']) : NULL;
 
 			$this->options['themed'] = 'y';
 		}
@@ -120,36 +120,34 @@ 
 
 	//--------------------------------------------------------------------
 
-	protected function collectOptions( $name )
+	protected function collectOptions($name)
 	{
 		$options = CLI::getOptions();
 
 		// Model?
-		$this->options['model'] = empty( $options['model'] ) ?
-			CLI::prompt( 'Model Name? (empty is fine)' ) :
-			$options['model'];
+		$this->options['model'] = empty($options['model']) ?
+			CLI::prompt('Model Name? (empty is fine)') : $options['model'];
 
 		// Format per CI
-		if ( ! empty( $this->options['model'] ) && substr( $this->options['model'], - 6 ) !== '_model' )
+		if ( ! empty($this->options['model']) && substr($this->options['model'], - 6) !== '_model')
 		{
 			$this->options['model'] .= '_model';
 		}
-		$this->options['model'] = ! empty( $this->options['model'] ) ? ucfirst( $this->options['model'] ) : NULL;
+		$this->options['model'] = ! empty($this->options['model']) ? ucfirst($this->options['model']) : NULL;
 
 		// If we're using a model, then force the use of a themed controller.
-		if ( ! empty( $this->options['model'] ) )
+		if ( ! empty($this->options['model']))
 		{
 			$options['themed'] = 'y';
 		}
 
 		// Themed Controller?
-		$this->options['themed'] = empty( $options['themed'] ) ?
-			CLI::prompt( 'Is a Themed Controller?', [ 'y', 'n' ] ) :
-			$options['themed'];
+		$this->options['themed'] = empty($options['themed']) ?
+			CLI::prompt('Is a Themed Controller?', ['y', 'n']) : $options['themed'];
 
 		$this->options['themed'] = $this->options['themed'] == 'y' ? TRUE : FALSE;
 
-		if ( $this->options['themed'] )
+		if ($this->options['themed'])
 		{
 			$this->options['base_class'] = 'ThemedController';
 		}
@@ -160,35 +158,35 @@ 
 	/**
 	 * Generates the standard views for our CRUD methods.
 	 */
-	protected function createViews( $name )
+	protected function createViews($name)
 	{
-		$this->load->helper( 'inflector' );
+		$this->load->helper('inflector');
 
 		$data = [
 			'name'        => $name,
 			'lower_name'  => strtolower($name),
-			'single_name' => singular( $name ),
-			'plural_name' => plural( $name ),
+			'single_name' => singular($name),
+			'plural_name' => plural($name),
 			'fields'      => $this->prepareFields()
 		];
 
-		$subfolder = empty( $this->module ) ? '/' . strtolower($name) : '/'. $data['lower_name'];
+		$subfolder = empty($this->module) ? '/'.strtolower($name) : '/'.$data['lower_name'];
 
 		// Index
-		$destination = $this->determineOutputPath( 'views' . $subfolder ) . 'index.php';
-		$this->copyTemplate( 'view_index', $destination, $data, $this->overwrite );
+		$destination = $this->determineOutputPath('views'.$subfolder).'index.php';
+		$this->copyTemplate('view_index', $destination, $data, $this->overwrite);
 
 		// Create
-		$destination = $this->determineOutputPath( 'views' . $subfolder ) . 'create.php';
-		$this->copyTemplate( 'view_create', $destination, $data, $this->overwrite );
+		$destination = $this->determineOutputPath('views'.$subfolder).'create.php';
+		$this->copyTemplate('view_create', $destination, $data, $this->overwrite);
 
 		// Show
-		$destination = $this->determineOutputPath( 'views' . $subfolder ) . 'show.php';
-		$this->copyTemplate( 'view_show', $destination, $data, $this->overwrite );
+		$destination = $this->determineOutputPath('views'.$subfolder).'show.php';
+		$this->copyTemplate('view_show', $destination, $data, $this->overwrite);
 
 		// Index
-		$destination = $this->determineOutputPath( 'views' . $subfolder ) . 'update.php';
-		$this->copyTemplate( 'view_update', $destination, $data, $this->overwrite );
+		$destination = $this->determineOutputPath('views'.$subfolder).'update.php';
+		$this->copyTemplate('view_update', $destination, $data, $this->overwrite);
 	}
 
 	//--------------------------------------------------------------------
@@ -199,14 +197,14 @@ 
 	 */
 	protected function prepareFields()
 	{
-		$fields = CLI::option( 'fields' );
+		$fields = CLI::option('fields');
 
-		if ( empty( $fields ) )
+		if (empty($fields))
 		{
             // If we have a model, we can get our fields from there
-            if (! empty($this->options['model']))
+            if ( ! empty($this->options['model']))
             {
-                $fields = $this->getFieldsFromModel( $this->options['model'] );
+                $fields = $this->getFieldsFromModel($this->options['model']);
 
                 if (empty($fields))
                 {
@@ -219,15 +217,15 @@ 
             }
 		}
 
-		$fields = explode( ' ', $fields );
+		$fields = explode(' ', $fields);
 
-		$new_fields = [ ];
+		$new_fields = [];
 
-		foreach ( $fields as $field )
+		foreach ($fields as $field)
 		{
-			$pop = [ NULL, NULL, NULL ];
-			list( $field, $type, $size ) = array_merge( explode( ':', $field ), $pop );
-			$type = strtolower( $type );
+			$pop = [NULL, NULL, NULL];
+			list($field, $type, $size) = array_merge(explode(':', $field), $pop);
+			$type = strtolower($type);
 
 			// Ignore list
 			if (in_array($field, ['created_on', 'modified_on']))
@@ -277,16 +275,16 @@ 
 
 	//--------------------------------------------------------------------
 
-    private function getFieldsFromModel( $model )
+    private function getFieldsFromModel($model)
     {
         $this->load->model($model);
 
-        if (! $this->db->table_exists( $this->$model->table() ))
+        if ( ! $this->db->table_exists($this->$model->table()))
         {
             return '';
         }
 
-        $fields = $this->db->field_data( $this->$model->table() );
+        $fields = $this->db->field_data($this->$model->table());
 
         $return = '';
 
@@ -294,14 +292,14 @@ 
         // it would have been passed on the CLI
         foreach ($fields as $field)
         {
-            $temp = $field->name .':'. $field->type;
+            $temp = $field->name.':'.$field->type;
 
-            if (! empty($field->max_length))
+            if ( ! empty($field->max_length))
             {
-                $temp .= ':'. $field->max_length;
+                $temp .= ':'.$field->max_length;
             }
 
-            $return .= ' '. $temp;
+            $return .= ' '.$temp;
         }
 
         return $return;

myth/_generators/Controller/controller.tpl.php

Spacing +7 added lines, -7 removed lines

@@ -5,9 +5,9 @@ 
 //--------------------------------------------------------------------
 
 $model_string = $model ? "'{$model}'" : 'null';
-$lower_model  = trim( strtolower($model_string), "' " );
+$lower_model  = trim(strtolower($model_string), "' ");
 $lower_model_esc = strpos($lower_model, 'null') !== false ? 'null' : "'{$lower_model}'";
-$lower_controller   = strtolower($controller_name);
+$lower_controller = strtolower($controller_name);
 
 //--------------------------------------------------------------------
 // Build our Methods
@@ -21,7 +21,7 @@ 
  */
 $index_method = '';
 
-if (! empty($model) )
+if ( ! empty($model))
 {
     $index_method = <<<EOD
 \$this->load->library('table');
@@ -42,7 +42,7 @@ 
  */
 $create_method = '';
 
-if (! empty($model))
+if ( ! empty($model))
 {
     $create_method = <<<EOD
 \$this->load->helper('form');
@@ -70,7 +70,7 @@ 
  */
 $show_method = '';
 
-if (! empty($model))
+if ( ! empty($model))
 {
     $show_method = <<<EOD
 \$item = \$this->{$lower_model}->find(\$id);
@@ -92,7 +92,7 @@ 
  */
 $update_method = '';
 
-if (! empty($model))
+if ( ! empty($model))
 {
     $update_method = <<<EOD
 \$this->load->helper('form');
@@ -123,7 +123,7 @@ 
  */
 $delete_method = '';
 
-if (! empty($model))
+if ( ! empty($model))
 {
     $delete_method = <<<EOD
 if (\$this->{$lower_model}->delete(\$id))

myth/_generators/Controller/view_create.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 
         foreach ($fields as $field)
         {
-            echo $uikit->inputWrap( humanize($field['name']), null, function() use($uikit, $field) {
+            echo $uikit->inputWrap(humanize($field['name']), null, function() use($uikit, $field) {
 
                 switch ($field['type'])
                 {

myth/_generators/Migration/MigrationGenerator.php

Spacing +34 added lines, -35 removed lines

@@ -92,27 +92,27 @@ 
 
 	//--------------------------------------------------------------------
 
-	public function run($segments=[], $quiet=false)
+	public function run($segments = [], $quiet = false)
 	{
-		$name = array_shift( $segments );
+		$name = array_shift($segments);
 
-		if ( empty( $name ) )
+		if (empty($name))
 		{
-			$name = CLI::prompt( 'Migration name' );
+			$name = CLI::prompt('Migration name');
 		}
 
 		// Format to CI Standards
-		$name = str_replace('.php', '', strtolower( $name ) );
+		$name = str_replace('.php', '', strtolower($name));
 
 		$this->detectAction($name);
 
-		$this->collectOptions( $name, $quiet );
+		$this->collectOptions($name, $quiet);
 
 		$data = [
 			'name'              => $name,
 			'clean_name'        => ucwords(str_replace('_', ' ', $name)),
-			'today'             => date( 'Y-m-d H:ia' ),
-			'fields'            => trim( $this->stringify( $this->fields ), ', '),
+			'today'             => date('Y-m-d H:ia'),
+			'fields'            => trim($this->stringify($this->fields), ', '),
 			'raw_fields'        => $this->fields,
 			'action'            => $this->action,
 			'table'             => $this->table,
@@ -120,9 +120,9 @@ 
 			'column'            => $this->column
 		];
 
-		if (! empty($this->column) && array_key_exists($this->column, $this->fields))
+		if ( ! empty($this->column) && array_key_exists($this->column, $this->fields))
 		{
-			$data['column_string'] = trim( $this->stringify($this->fields[$this->column]), ', ');
+			$data['column_string'] = trim($this->stringify($this->fields[$this->column]), ', ');
 		}
 
 		$this->load->library('migration');
@@ -130,17 +130,17 @@ 
 		// todo Allow different migration "types"
 		$type = 'app';
 
-		if (! empty($this->module))
+		if ( ! empty($this->module))
 		{
-			$type = 'mod:'. $this->module;
+			$type = 'mod:'.$this->module;
 		}
 		$destination = $this->migration->determine_migration_path($type, true);
 
 		$file = $this->migration->make_name($name);
 
-		$destination = rtrim($destination, '/') .'/'. $file;
+		$destination = rtrim($destination, '/').'/'.$file;
 
-		if (! $this->copyTemplate( 'migration', $destination, $data, true) )
+		if ( ! $this->copyTemplate('migration', $destination, $data, true))
 		{
 			CLI::error('Error creating seed file.');
 		}
@@ -173,7 +173,7 @@ 
 			$action = $this->actionMap[$action];
 		}
 
-		if (! in_array($action, $this->allowedActions))
+		if ( ! in_array($action, $this->allowedActions))
 		{
 			return;
 		}
@@ -187,7 +187,7 @@ 
 
 			// The name of the table is assumed to be the one
 			// prior to the $index found.
-			$this->table = plural( implode('_', array_slice($segments, 0, $index) ) );
+			$this->table = plural(implode('_', array_slice($segments, 0, $index)));
 		}
 
 		// Are we referencing a column?
@@ -199,12 +199,12 @@ 
 
 	//--------------------------------------------------------------------
 
-	public function collectOptions($name, $quiet=false)
+	public function collectOptions($name, $quiet = false)
 	{
 		$options = CLI::getOptions();
 
 		// Use existing db table?
-		if (array_key_exists('fromdb', $options) )
+		if (array_key_exists('fromdb', $options))
 		{
 			$this->readTable($this->table);
 		}
@@ -217,10 +217,9 @@ 
 				return;
 			}
 
-			$fields = empty( $fields ) ?
-				CLI::prompt( 'Fields? (name:type)' ) :
-				$options['fields'];
-			$this->fields = $this->parseFields( $fields );
+			$fields = empty($fields) ?
+				CLI::prompt('Fields? (name:type)') : $options['fields'];
+			$this->fields = $this->parseFields($fields);
 		}
 	}
 
@@ -244,7 +243,7 @@ 
 		$fields = [];
 		$segments = explode(' ', $str);
 
-		if (! count($segments))
+		if ( ! count($segments))
 		{
 			return $fields;
 		}
@@ -252,7 +251,7 @@ 
 		foreach ($segments as $segment)
 		{
 			$pop = [null, null, null];
-			list($field, $type, $size) = array_merge( explode(':', $segment), $pop);
+			list($field, $type, $size) = array_merge(explode(':', $segment), $pop);
 			$type = strtolower($type);
 
 			// Is type one of our convenience mapped items?
@@ -261,7 +260,7 @@ 
 				$type = $this->map[$type];
 			}
 
-			$f = [ 'type' => $type ];
+			$f = ['type' => $type];
 
 			// Creating a primary key?
 			if ($type == 'id')
@@ -275,9 +274,9 @@ 
 			}
 
 			// Constraint?
-			if (! empty($size))
+			if ( ! empty($size))
 			{
-				$f['constraint'] = (int)$size;
+				$f['constraint'] = (int) $size;
 			}
 			else if (array_key_exists($type, $this->defaultSizes))
 			{
@@ -319,7 +318,7 @@ 
 		}
 
 		// Table exists?
-		if (! $this->db->table_exists($table))
+		if ( ! $this->db->table_exists($table))
 		{
 			return false;
 		}
@@ -327,7 +326,7 @@ 
 		$fields = $this->db->field_data($table);
 
 		// Any fields?
-		if (! is_array($fields) || ! count($fields))
+		if ( ! is_array($fields) || ! count($fields))
 		{
 			return false;
 		}
@@ -336,30 +335,30 @@ 
 
 		foreach ($fields as $field)
 		{
-			$f = [ 'type' => $field->type ];
+			$f = ['type' => $field->type];
 
 			// Constraint
-			if (! empty($field->max_length))
+			if ( ! empty($field->max_length))
 			{
 				$f['constraint'] = $field->max_length;
 			}
 			else if (array_key_exists($field->type, $this->defaultSizes))
 			{
-				$f['constraint'] = $this->defaultSizes[ $field->type ];
+				$f['constraint'] = $this->defaultSizes[$field->type];
 			}
 
 			// Default
-			if (! empty($field->default)) $f['default'] = $field->default;
+			if ( ! empty($field->default)) $f['default'] = $field->default;
 
 			// Primary Key?
-			if (! empty($field->primary_key) && $field->primary_key == 1)
+			if ( ! empty($field->primary_key) && $field->primary_key == 1)
 			{
 				$this->primary_key = $field->name;
 				$f['auto_increment'] = true;
 				$f['unsigned'] = true;
 			}
 
-			$new_fields[ $field->name ] = $f;
+			$new_fields[$field->name] = $f;
 		}
 
 		$this->fields = $new_fields;

myth/_generators/Migration/migration.tpl.php

Spacing +2 added lines, -2 removed lines

@@ -17,13 +17,13 @@
         \$this->dbforge->add_field(\$fields);
 ";
 
-    if (! empty($primary_key))
+    if ( ! empty($primary_key))
     {
         $up .= "        \$this->dbforge->add_key('{$primary_key}', true);
 ";
     }
 
-    $up .="	    \$this->dbforge->create_table('{$table}', true, config_item('migration_create_table_attr') );
+    $up .= "	    \$this->dbforge->create_table('{$table}', true, config_item('migration_create_table_attr') );
     ";
 
     $down = "\$this->dbforge->drop_table('{$table}');";

myth/_generators/Model/ModelGenerator.php

Spacing +61 added lines, -64 removed lines

@@ -56,47 +56,47 @@ 
 
 	//--------------------------------------------------------------------
 
-	public function run( $segments = [ ], $quiet = false )
+	public function run($segments = [], $quiet = false)
 	{
-		$name = array_shift( $segments );
+		$name = array_shift($segments);
 
         $options = CLI::getOptions();
 
-		$this->options['table_name'] = array_shift( $segments );
+		$this->options['table_name'] = array_shift($segments);
 
-		if ( empty( $name ) )
+		if (empty($name))
 		{
-			$name = CLI::prompt( 'Model name' );
+			$name = CLI::prompt('Model name');
 		}
 
 		// Format to CI Standards
-		if ( substr( $name, - 6 ) !== '_model' )
+		if (substr($name, - 6) !== '_model')
 		{
 			$name .= '_model';
 		}
-		$name = ucfirst( $name );
+		$name = ucfirst($name);
 
-		if ( $quiet === false )
+		if ($quiet === false)
 		{
-			$this->collectOptions( $name, $options );
+			$this->collectOptions($name, $options);
 		}
 		else
 		{
-			$this->quietSetOptions( $name, $options );
+			$this->quietSetOptions($name, $options);
 		}
 
 		$data = [
 			'model_name' => $name,
-			'today'      => date( 'Y-m-d H:ia' )
+			'today'      => date('Y-m-d H:ia')
 		];
 
-		$data = array_merge( $data, $this->options );
+		$data = array_merge($data, $this->options);
 
-		$destination = $this->determineOutputPath( 'models' ) . $name . '.php';
+		$destination = $this->determineOutputPath('models').$name.'.php';
 
-		if ( ! $this->copyTemplate( 'model', $destination, $data, $this->overwrite ) )
+		if ( ! $this->copyTemplate('model', $destination, $data, $this->overwrite))
 		{
-			CLI::error( 'Error creating new files' );
+			CLI::error('Error creating new files');
 		}
 
 		return TRUE;
@@ -107,70 +107,67 @@ 
 	/*
 	 * Customizes our settings
 	 */
-	protected function collectOptions( $model_name, $options=[] )
+	protected function collectOptions($model_name, $options = [])
 	{
-		$this->load->helper( 'inflector' );
+		$this->load->helper('inflector');
 
 		// Table Name?
-		if ( empty( $this->options['table_name'] ) )
+		if (empty($this->options['table_name']))
 		{
-			$this->options['table_name'] = empty( $options['table'] ) ?
-				CLI::prompt( 'Table name', plural( strtolower( str_replace( '_model', '', $model_name ) ) ) ) :
-				$options['table'];
+			$this->options['table_name'] = empty($options['table']) ?
+				CLI::prompt('Table name', plural(strtolower(str_replace('_model', '', $model_name)))) : $options['table'];
 		}
 
-		$this->options['fields'] = $this->table_info( $this->options['table_name'], $options );
+		$this->options['fields'] = $this->table_info($this->options['table_name'], $options);
 
 		// Primary Key
 		if (empty($this->options['primary_key']))
 		{
-			$this->options['primary_key'] = empty( $options['primary_key'] ) ?
-				CLI::prompt( 'Primary Key', 'id' ) :
-				$options['primary_key'];
+			$this->options['primary_key'] = empty($options['primary_key']) ?
+				CLI::prompt('Primary Key', 'id') : $options['primary_key'];
 		}
 
-		$this->options['protected'] = [ $this->options['primary_key'] ];
+		$this->options['protected'] = [$this->options['primary_key']];
 
 		// Set Created?
-		if ( empty( $options['set_created'] ) )
+		if (empty($options['set_created']))
 		{
-			$ans = CLI::prompt( 'Set Created date?', [ 'y', 'n' ] );
-			if ( $ans == 'n' )
+			$ans = CLI::prompt('Set Created date?', ['y', 'n']);
+			if ($ans == 'n')
 			{
 				$this->options['set_created'] = FALSE;
 			}
 		}
 
 		// Set Modified?
-		if ( empty( $options['set_modified'] ) )
+		if (empty($options['set_modified']))
 		{
-			$ans = CLI::prompt( 'Set Modified date?', [ 'y', 'n' ] );
-			if ( $ans == 'n' )
+			$ans = CLI::prompt('Set Modified date?', ['y', 'n']);
+			if ($ans == 'n')
 			{
 				$this->options['set_modified'] = FALSE;
 			}
 		}
 
 		// Date Format
-		$this->options['date_format'] = empty( $options['date_format'] ) ?
-			CLI::prompt( 'Date Format?', [ 'datetime', 'date', 'int' ] ) :
-			$options['date_format'];
+		$this->options['date_format'] = empty($options['date_format']) ?
+			CLI::prompt('Date Format?', ['datetime', 'date', 'int']) : $options['date_format'];
 
 		// Log User?
-		if ( empty( $options['log_user'] ) )
+		if (empty($options['log_user']))
 		{
-			$ans = CLI::prompt( 'Log User actions?', [ 'y', 'n' ] );
-			if ( $ans == 'y' )
+			$ans = CLI::prompt('Log User actions?', ['y', 'n']);
+			if ($ans == 'y')
 			{
 				$this->options['log_user'] = TRUE;
 			}
 		}
 
 		// Soft Deletes
-		if ( empty( $options['soft_delete'] ) )
+		if (empty($options['soft_delete']))
 		{
-			$ans = CLI::prompt( 'Use Soft Deletes?', [ 'y', 'n' ] );
-			if ( $ans == 'n' )
+			$ans = CLI::prompt('Use Soft Deletes?', ['y', 'n']);
+			if ($ans == 'n')
 			{
 				$this->options['soft_delete'] = false;
 			}
@@ -180,21 +177,21 @@ 
 
 	//--------------------------------------------------------------------
 
-	protected function quietSetOptions( $model_name, $options=[] )
+	protected function quietSetOptions($model_name, $options = [])
 	{
-		$this->load->helper( 'inflector' );
+		$this->load->helper('inflector');
 
 		if (empty($this->options['table_name']))
 		{
-			$this->options['table_name'] = plural( strtolower( str_replace( '_model', '', $model_name ) ) );
+			$this->options['table_name'] = plural(strtolower(str_replace('_model', '', $model_name)));
 		}
 
 		// Try to set it from the database first,
 		// otherwise, try to pull from fields
-		$this->options['fields'] = $this->table_info( $this->options['table_name'], $options );
+		$this->options['fields'] = $this->table_info($this->options['table_name'], $options);
 
-		$this->options['primary_key'] = ! empty( $this->options['primary_key'] ) ? $this->options['primary_key'] : 'id';
-		$this->options['protected']   = [ $this->options['primary_key'] ];
+		$this->options['primary_key'] = ! empty($this->options['primary_key']) ? $this->options['primary_key'] : 'id';
+		$this->options['protected']   = [$this->options['primary_key']];
 	}
 
 	//--------------------------------------------------------------------
@@ -206,12 +203,12 @@ 
 	 *
 	 * @return mixed An array of fields or false if the table does not exist
 	 */
-	protected function table_info( $table_name, $options=[] )
+	protected function table_info($table_name, $options = [])
 	{
 		$this->load->database();
 
 		// Check whether the table exists in this database
-		if ( ! $this->db->table_exists( $table_name ) )
+		if ( ! $this->db->table_exists($table_name))
 		{
             if (empty($options['fields']))
             {
@@ -222,12 +219,12 @@ 
 		}
         else
         {
-            $fields = $this->db->field_data( $table_name );
+            $fields = $this->db->field_data($table_name);
         }
 
 		// There may be something wrong or the database driver may not return
 		// field data
-		if ( empty( $fields ) )
+		if (empty($fields))
 		{
 			return FALSE;
 		}
@@ -237,9 +234,9 @@ 
         $this->options['use_soft_deletes']  = false;
 
 		// Use the primary key if the table has one already set.
-		foreach ( $fields as $field )
+		foreach ($fields as $field)
 		{
-			if ( ! empty( $field->primary_key ) && $field->primary_key == 1 )
+			if ( ! empty($field->primary_key) && $field->primary_key == 1)
 			{
 				$this->options['primary_key'] = $field->name;
 			}
@@ -261,7 +258,7 @@ 
 		}
 
 		// Set our validation rules based on these fields
-		$this->options['rules'] = $this->buildValidationRules( $fields );
+		$this->options['rules'] = $this->buildValidationRules($fields);
 
 		return $fields;
 	}
@@ -274,20 +271,20 @@ 
      */
     protected function parseFieldString($fields)
     {
-        if ( empty( $fields ) )
+        if (empty($fields))
         {
             return NULL;
         }
 
-        $fields = explode( ' ', $fields );
+        $fields = explode(' ', $fields);
 
-        $new_fields = [ ];
+        $new_fields = [];
 
-        foreach ( $fields as $field )
+        foreach ($fields as $field)
         {
-            $pop = [ NULL, NULL, NULL ];
-            list( $field, $type, $size ) = array_merge( explode( ':', $field ), $pop );
-            $type = strtolower( $type );
+            $pop = [NULL, NULL, NULL];
+            list($field, $type, $size) = array_merge(explode(':', $field), $pop);
+            $type = strtolower($type);
 
             // Strings
             if (in_array($type, ['char', 'varchar', 'string']))
@@ -328,7 +325,7 @@ 
 
         // Convert to objects
         array_walk($new_fields, function(&$item, $key) {
-            $item = (object)$item;
+            $item = (object) $item;
         });
 
         return $new_fields;
@@ -345,7 +342,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function buildValidationrules($fields=[])
+	public function buildValidationrules($fields = [])
 	{
 		if (empty($fields) || ! is_array($fields) || ! count($fields))
 		{
@@ -390,7 +387,7 @@ 
 					break;
 			}
 
-			if (! empty($field->max_length))
+			if ( ! empty($field->max_length))
 			{
 				$rule[] = "max_length[{$field->max_length}]";
 			}

myth/_generators/Model/model.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     protected \$deleted_by_field    = 'deleted_by';
 ";
 
-$protect = "'". implode("', '", $protected) . "'";
+$protect = "'".implode("', '", $protected)."'";
 
 //--------------------------------------------------------------------
 // Create the full model