ci-bonfire / Sprint

myth/Themers/escape.php

Indentation +69 added lines, -69 removed lines

@@ -4,79 +4,79 @@
 
 if (! function_exists('esc'))
 {
-    /**
-     * Escapes strings to make them safe for use
-     * within HTML templates. Used by the auto-escaping
-     * functionality in setVar() and available to
-     * use within your views.
-     *
-     * Uses ZendFramework's Escaper to handle the actual escaping,
-     * based on context. Valid contexts are:
-     *      - html
-     *      - htmlAttr
-     *      - js
-     *      - css
-     *      - url
-     *
-     * References:
-     *  - https://www.owasp.org/index.php/XSS_(Cross_Site_Scripting)_Prevention_Cheat_Sheet
-     *  - http://framework.zend.com/manual/current/en/modules/zend.escaper.introduction.html
-     *
-     * @param $data
-     * @param $context
-     * @param escaper   // An instance of ZF's Escaper to avoid repeated class instantiation.
-     *
-     * @return string
-     */
-    function esc($data, $context='html', $escaper=null)
-    {
-        if (is_array($data))
-        {
-            foreach ($data as $key => &$value)
-            {
-                $value = esc($value, $context);
-            }
-        }
+	/**
+	 * Escapes strings to make them safe for use
+	 * within HTML templates. Used by the auto-escaping
+	 * functionality in setVar() and available to
+	 * use within your views.
+	 *
+	 * Uses ZendFramework's Escaper to handle the actual escaping,
+	 * based on context. Valid contexts are:
+	 *      - html
+	 *      - htmlAttr
+	 *      - js
+	 *      - css
+	 *      - url
+	 *
+	 * References:
+	 *  - https://www.owasp.org/index.php/XSS_(Cross_Site_Scripting)_Prevention_Cheat_Sheet
+	 *  - http://framework.zend.com/manual/current/en/modules/zend.escaper.introduction.html
+	 *
+	 * @param $data
+	 * @param $context
+	 * @param escaper   // An instance of ZF's Escaper to avoid repeated class instantiation.
+	 *
+	 * @return string
+	 */
+	function esc($data, $context='html', $escaper=null)
+	{
+		if (is_array($data))
+		{
+			foreach ($data as $key => &$value)
+			{
+				$value = esc($value, $context);
+			}
+		}
 
-        $context = strtolower($context);
+		$context = strtolower($context);
 
-        if (! is_object($escaper))
-        {
-            $escaper = new Escaper(config_item('charset'));
-        }
+		if (! is_object($escaper))
+		{
+			$escaper = new Escaper(config_item('charset'));
+		}
 
-        // Valid context?
-        if (! in_array($context, ['html', 'htmlattr', 'js', 'css', 'url']))
-        {
-            throw new \InvalidArgumentException('Invalid Context type: '. $context);
-        }
+		// Valid context?
+		if (! in_array($context, ['html', 'htmlattr', 'js', 'css', 'url']))
+		{
+			throw new \InvalidArgumentException('Invalid Context type: '. $context);
+		}
 
-        if (! is_string($data))
-        {
-            return $data;
-        }
+		if (! is_string($data))
+		{
+			return $data;
+		}
 
-        switch ($context)
-        {
-            case 'html':
-                $data = $escaper->escapeHtml($data);
-                break;
-            case 'htmlattr':
-                $data = $escaper->escapeHtmlAttr($data);
-                break;
-            case 'js':
-                $data = $escaper->escapeJs($data);
-                break;
-            case 'css':
-                $data = $escaper->escapeCss($data);
-                break;
-            case 'url':
-                $data = $escaper->escapeUrl($data);
-                break;
-            default:
-                break;
-        }
+		switch ($context)
+		{
+			case 'html':
+				$data = $escaper->escapeHtml($data);
+				break;
+			case 'htmlattr':
+				$data = $escaper->escapeHtmlAttr($data);
+				break;
+			case 'js':
+				$data = $escaper->escapeJs($data);
+				break;
+			case 'css':
+				$data = $escaper->escapeCss($data);
+				break;
+			case 'url':
+				$data = $escaper->escapeUrl($data);
+				break;
+			default:
+				break;
+		}
 
-        return $data;
-    }
+		return $data;
+	}
 }
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -2,7 +2,7 @@ 
 
 use Zend\Escaper\Escaper;
 
-if (! function_exists('esc'))
+if ( ! function_exists('esc'))
 {
     /**
      * Escapes strings to make them safe for use
@@ -28,7 +28,7 @@ 
      *
      * @return string
      */
-    function esc($data, $context='html', $escaper=null)
+    function esc($data, $context = 'html', $escaper = null)
     {
         if (is_array($data))
         {
@@ -40,18 +40,18 @@ 
 
         $context = strtolower($context);
 
-        if (! is_object($escaper))
+        if ( ! is_object($escaper))
         {
             $escaper = new Escaper(config_item('charset'));
         }
 
         // Valid context?
-        if (! in_array($context, ['html', 'htmlattr', 'js', 'css', 'url']))
+        if ( ! in_array($context, ['html', 'htmlattr', 'js', 'css', 'url']))
         {
-            throw new \InvalidArgumentException('Invalid Context type: '. $context);
+            throw new \InvalidArgumentException('Invalid Context type: '.$context);
         }
 
-        if (! is_string($data))
+        if ( ! is_string($data))
         {
             return $data;
         }

myth/_generators/Controller/controller.tpl.php

Indentation +10 added lines, -10 removed lines

@@ -23,7 +23,7 @@ 
 
 if (! empty($model) )
 {
-    $index_method = <<<EOD
+	$index_method = <<<EOD
 \$this->load->library('table');
 
         \$offset = \$this->uri->segment( \$this->uri->total_segments() );
@@ -44,7 +44,7 @@ 
 
 if (! empty($model))
 {
-    $create_method = <<<EOD
+	$create_method = <<<EOD
 \$this->load->helper('form');
         \$this->load->helper('inflector');
 
@@ -72,7 +72,7 @@ 
 
 if (! empty($model))
 {
-    $show_method = <<<EOD
+	$show_method = <<<EOD
 \$item = \$this->{$lower_model}->find(\$id);
 
         if (! \$item)
@@ -94,7 +94,7 @@ 
 
 if (! empty($model))
 {
-    $update_method = <<<EOD
+	$update_method = <<<EOD
 \$this->load->helper('form');
         \$this->load->helper('inflector');
 
@@ -125,7 +125,7 @@ 
 
 if (! empty($model))
 {
-    $delete_method = <<<EOD
+	$delete_method = <<<EOD
 if (\$this->{$lower_model}->delete(\$id))
         {
             \$this->setMessage('Successfully deleted item.', 'success');
@@ -145,12 +145,12 @@ 
 
 if ($themed)
 {
-    $index_method   .= "\$this->render();";
-    $create_method  .= "\$this->render();";
-    $show_method    .= "\$this->render();";
-    $update_method  .= "\$this->render();";
+	$index_method   .= "\$this->render();";
+	$create_method  .= "\$this->render();";
+	$show_method    .= "\$this->render();";
+	$update_method  .= "\$this->render();";
 
-    $fields = "
+	$fields = "
     /**
      * Allows per-controller override of theme.
      * @var null

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/forge.php

Indentation +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
  */
 
 $descriptions = [
-    'controller' => ['controller <name> [<base>]', 'Creates a new controller file that extends from <base> or BaseController.']
+	'controller' => ['controller <name> [<base>]', 'Creates a new controller file that extends from <base> or BaseController.']
 ];
 
 $long_description = <<<EOT

myth/_generators/Controller/view_create.tpl.php

Indentation +37 added lines, -37 removed lines

@@ -4,43 +4,43 @@
 
 <?= $uikit->row([], function() use($uikit, $fields) {
 
-    $sizes = [
-        's' => 12,
-        'm' => 6,
-        'l' => 4
-    ];
-    echo $uikit->column(['sizes' => $sizes], function() use($uikit, $fields) {
-
-        foreach ($fields as $field)
-        {
-            echo $uikit->inputWrap( humanize($field['name']), null, function() use($uikit, $field) {
-
-                switch ($field['type'])
-                {
-                    case 'text':
-                        echo "            <input type='text' class='form-control' name='{$field['name']}' />\n";
-                        break;
-                    case 'number':
-                        echo "            <input type='number' class='form-control' name='{$field['name']}' />\n";
-                        break;
-                    case 'date':
-                        echo "            <input type='date' class='form-control' name='{$field['name']}' />\n";
-                        break;
-                    case 'datetime':
-                        echo "            <input type='datetime' class='form-control' name='{$field['name']}' />\n";
-                        break;
-                    case 'time':
-                        echo "            <input type='time' class='form-control' name='{$field['name']}' />\n";
-                        break;
-                    case 'textarea':
-                        echo "            <textarea name='{$field['name']}' class='form-control'></textarea>\n";
-                        break;
-                }
-
-            } );
-        }
-
-    });
+	$sizes = [
+		's' => 12,
+		'm' => 6,
+		'l' => 4
+	];
+	echo $uikit->column(['sizes' => $sizes], function() use($uikit, $fields) {
+
+		foreach ($fields as $field)
+		{
+			echo $uikit->inputWrap( humanize($field['name']), null, function() use($uikit, $field) {
+
+				switch ($field['type'])
+				{
+					case 'text':
+						echo "            <input type='text' class='form-control' name='{$field['name']}' />\n";
+						break;
+					case 'number':
+						echo "            <input type='number' class='form-control' name='{$field['name']}' />\n";
+						break;
+					case 'date':
+						echo "            <input type='date' class='form-control' name='{$field['name']}' />\n";
+						break;
+					case 'datetime':
+						echo "            <input type='datetime' class='form-control' name='{$field['name']}' />\n";
+						break;
+					case 'time':
+						echo "            <input type='time' class='form-control' name='{$field['name']}' />\n";
+						break;
+					case 'textarea':
+						echo "            <textarea name='{$field['name']}' class='form-control'></textarea>\n";
+						break;
+				}
+
+			} );
+		}
+
+	});
 
 }); ?>
 

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/migration.tpl.php

Indentation +11 added lines, -11 removed lines

@@ -12,21 +12,21 @@ 
  */
 if ($action == 'create')
 {
-    $up = "\$fields = {$fields};
+	$up = "\$fields = {$fields};
 
         \$this->dbforge->add_field(\$fields);
 ";
 
-    if (! empty($primary_key))
-    {
-        $up .= "        \$this->dbforge->add_key('{$primary_key}', true);
+	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}');";
+	$down = "\$this->dbforge->drop_table('{$table}');";
 }
 
 /*
@@ -34,10 +34,10 @@ 
  */
 if ($action == 'add' && ! empty($column))
 {
-    $up = "\$field = {$column_string};
+	$up = "\$field = {$column_string};
         \$this->dbforge->add_column('{$table}', \$field);";
 
-    $down = "\$this->dbforge->drop_column('{$table}', '{$column}');";
+	$down = "\$this->dbforge->drop_column('{$table}', '{$column}');";
 }
 
 /*
@@ -45,9 +45,9 @@ 
  */
 if ($action == 'remove' && ! empty($column))
 {
-    $up = "\$this->dbforge->drop_column('{$table}', '{$column}');";
+	$up = "\$this->dbforge->drop_column('{$table}', '{$column}');";
 
-    $down = "\$field = {$column_string};
+	$down = "\$field = {$column_string};
         \$this->dbforge->add_column('{$table}', \$field);";
 }
 

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/forge.php

Indentation +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
  */
 
 $descriptions = [
-    'model' => ['model <name>', 'Creates a new model file that extends from CIDbModel.']
+	'model' => ['model <name>', 'Creates a new model file that extends from CIDbModel.']
 ];
 
 $long_description = <<<EOT

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

myth/_generators/Scaffold/ScaffoldGenerator.php

Indentation +37 added lines, -37 removed lines

@@ -38,7 +38,7 @@ 
 
 	protected $model_name = '';
 
-    protected $table_exists = false;
+	protected $table_exists = false;
 
 	//--------------------------------------------------------------------
 
@@ -46,32 +46,32 @@ 
 	{
 		$name = array_shift( $segments );
 
-        // If a table already exists then we don't need a migration
-        $this->load->database();
-        if ($this->db->table_exists($name))
-        {
-            $this->table_exists = true;
-        }
+		// If a table already exists then we don't need a migration
+		$this->load->database();
+		if ($this->db->table_exists($name))
+		{
+			$this->table_exists = true;
+		}
 
 		// If we didn't attach any fields, then we
 		// need to generate the barebones here.
 		$this->fields = CLI::option('fields');
 
-        // If we don't have any fields, and no model
-        // exists, then we need to provide some default fields.
-        if (empty($this->fields))
-        {
-            if (! $this->table_exists)
-            {
-                $this->fields = "id:int id:id title:string created_on:datetime modified_on:datetime";
-            }
-        }
+		// If we don't have any fields, and no model
+		// exists, then we need to provide some default fields.
+		if (empty($this->fields))
+		{
+			if (! $this->table_exists)
+			{
+				$this->fields = "id:int id:id title:string created_on:datetime modified_on:datetime";
+			}
+		}
 
 		// Perform the steps.
-        if (! $this->table_exists)
-        {
-            $this->makeMigration( $name );
-        }
+		if (! $this->table_exists)
+		{
+			$this->makeMigration( $name );
+		}
 		$this->makeSeed($name);
 		$this->makeModel($name);
 		$this->makeController($name);
@@ -98,7 +98,7 @@ 
 
 	public function makeSeed($name)
 	{
-	    $this->generate("seed {$name}", null, true);
+		$this->generate("seed {$name}", null, true);
 	}
 
 	//--------------------------------------------------------------------
@@ -106,33 +106,33 @@ 
 
 	public function makeModel($name)
 	{
-	    $this->load->helper('inflector');
+		$this->load->helper('inflector');
 
 		$name = singular($name);
 		$this->model_name = $name;
 
-        // If a table exists, we can build it from that
-        if ($this->table_exists)
-        {
-            $this->generate( "model {$name}", "-table $name -primary_key id", TRUE );
-        }
-        // Otherwise, we need to provide the fields to make the model out of.
-        else
-        {
-            $this->generate( "model {$name}", "-fields '{$this->fields}'", TRUE );
-        }
+		// If a table exists, we can build it from that
+		if ($this->table_exists)
+		{
+			$this->generate( "model {$name}", "-table $name -primary_key id", TRUE );
+		}
+		// Otherwise, we need to provide the fields to make the model out of.
+		else
+		{
+			$this->generate( "model {$name}", "-fields '{$this->fields}'", TRUE );
+		}
 	}
 
 	//--------------------------------------------------------------------
 
 	public function makeController($name)
 	{
-        $options = "-model {$this->model_name} -create_views";
+		$options = "-model {$this->model_name} -create_views";
 
-        if (! empty($this->fields))
-        {
-            $options .= " -fields '{$this->fields}'";
-        }
+		if (! empty($this->fields))
+		{
+			$options .= " -fields '{$this->fields}'";
+		}
 
 		$this->generate("controller {$name}", $options, true);
 	}

Spacing +8 added lines, -8 removed lines

@@ -42,9 +42,9 @@ 
 
 	//--------------------------------------------------------------------
 
-	public function run($segments = [ ], $quiet = false)
+	public function run($segments = [], $quiet = false)
 	{
-		$name = array_shift( $segments );
+		$name = array_shift($segments);
 
         // If a table already exists then we don't need a migration
         $this->load->database();
@@ -61,16 +61,16 @@ 
         // exists, then we need to provide some default fields.
         if (empty($this->fields))
         {
-            if (! $this->table_exists)
+            if ( ! $this->table_exists)
             {
                 $this->fields = "id:int id:id title:string created_on:datetime modified_on:datetime";
             }
         }
 
 		// Perform the steps.
-        if (! $this->table_exists)
+        if ( ! $this->table_exists)
         {
-            $this->makeMigration( $name );
+            $this->makeMigration($name);
         }
 		$this->makeSeed($name);
 		$this->makeModel($name);
@@ -114,12 +114,12 @@ 
         // If a table exists, we can build it from that
         if ($this->table_exists)
         {
-            $this->generate( "model {$name}", "-table $name -primary_key id", TRUE );
+            $this->generate("model {$name}", "-table $name -primary_key id", TRUE);
         }
         // Otherwise, we need to provide the fields to make the model out of.
         else
         {
-            $this->generate( "model {$name}", "-fields '{$this->fields}'", TRUE );
+            $this->generate("model {$name}", "-fields '{$this->fields}'", TRUE);
         }
 	}
 
@@ -129,7 +129,7 @@ 
 	{
         $options = "-model {$this->model_name} -create_views";
 
-        if (! empty($this->fields))
+        if ( ! empty($this->fields))
         {
             $options .= " -fields '{$this->fields}'";
         }

myth/_generators/Seed/SeedGenerator.php

Spacing +10 added lines, -10 removed lines

@@ -34,36 +34,36 @@
 
 class SeedGenerator extends \Myth\Forge\BaseGenerator {
 
-	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( 'Seed name' );
+			$name = CLI::prompt('Seed name');
 		}
 
 		// Format to CI Standards
-		$name = str_replace('.php', '', strtolower( $name ) );
-		if (substr( $name, -4) == 'seed')
+		$name = str_replace('.php', '', strtolower($name));
+		if (substr($name, -4) == 'seed')
 		{
 			$name = substr($name, 0, strlen($name) - 4);
 		}
-		$name = ucfirst($name) .'Seeder';
+		$name = ucfirst($name).'Seeder';
 
 		$data = [
 			'seed_name' => $name,
-			'today'     => date( 'Y-m-d H:ia' )
+			'today'     => date('Y-m-d H:ia')
 		];
 
-		$destination = $this->determineOutputPath( 'database/seeds' ) . $name . '.php';
+		$destination = $this->determineOutputPath('database/seeds').$name.'.php';
 
 		if (strpos($destination, 'modules') !== false)
 		{
 			$destination = str_replace('database/', '', $destination);
 		}
 
-		if (! $this->copyTemplate( 'seed', $destination, $data, $this->overwrite) )
+		if ( ! $this->copyTemplate('seed', $destination, $data, $this->overwrite))
 		{
 			CLI::error('Error creating seed file.');
 		}