luyadev / luya

core/console/commands/CrudController.php

Spacing +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
             
             if ($sqlTable == '?') {
                 foreach ($this->getSqlTablesArray() as $table) {
-                    $this->outputInfo("- " . $table);
+                    $this->outputInfo("- ".$table);
                 }
             }
             
@@ -153,8 +153,8 @@ 
                 case 'model':
 
                     if (!$extended) {
-                        $modelName = $modelName . 'NgRest';
-                        $item['file'] = $modelName . '.php';
+                        $modelName = $modelName.'NgRest';
+                        $item['file'] = $modelName.'.php';
                         $item['class'] = $modelName;
                     }
                     

Indentation +1 added lines, -1 removed lines

@@ -207,7 +207,7 @@
                         'extended' => $extended,
                         'textFields' => $textFields,
                         'properties' => $properties,
-                    	'rules' => $this->generateRules($shema),
+                        'rules' => $this->generateRules($shema),
                     ]);
                     
                     break;

core/console/commands/ModuleController.php

Spacing +13 added lines, -13 removed lines

@@ -34,22 +34,22 @@ 
             }
         }
         
-        $appModulesFolder = Yii::$app->basePath . DIRECTORY_SEPARATOR . 'modules';
-        $moduleFolder = $appModulesFolder . DIRECTORY_SEPARATOR . $moduleName;
+        $appModulesFolder = Yii::$app->basePath.DIRECTORY_SEPARATOR.'modules';
+        $moduleFolder = $appModulesFolder.DIRECTORY_SEPARATOR.$moduleName;
         
         if (file_exists($moduleFolder)) {
-            return $this->outputError("The folder " . $moduleFolder . " exists already.");
+            return $this->outputError("The folder ".$moduleFolder." exists already.");
         }
         
         $folders = [
             'basePath' => $moduleFolder,
-            'adminPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'admin',
-            'adminPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR . 'aws',
-            'frontendPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'frontend',
-            'blocksPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'frontend' . DIRECTORY_SEPARATOR . 'blocks',
-            'blocksPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'frontend' . DIRECTORY_SEPARATOR . 'controllers',
-            'blocksPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'frontend' . DIRECTORY_SEPARATOR . 'views',
-            'modelsPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'models',
+            'adminPath' => $moduleFolder.DIRECTORY_SEPARATOR.'admin',
+            'adminPath' => $moduleFolder.DIRECTORY_SEPARATOR.'admin'.DIRECTORY_SEPARATOR.'aws',
+            'frontendPath' => $moduleFolder.DIRECTORY_SEPARATOR.'frontend',
+            'blocksPath' => $moduleFolder.DIRECTORY_SEPARATOR.'frontend'.DIRECTORY_SEPARATOR.'blocks',
+            'blocksPath' => $moduleFolder.DIRECTORY_SEPARATOR.'frontend'.DIRECTORY_SEPARATOR.'controllers',
+            'blocksPath' => $moduleFolder.DIRECTORY_SEPARATOR.'frontend'.DIRECTORY_SEPARATOR.'views',
+            'modelsPath' => $moduleFolder.DIRECTORY_SEPARATOR.'models',
         ];
 
         $vars = ['folders' => $folders, 'name' => $moduleName, 'ns' => 'app\\modules\\'.$moduleName];
@@ -59,9 +59,9 @@ 
         }
         
         $contents = [
-            $moduleFolder. DIRECTORY_SEPARATOR . 'README.md' => $this->view->render('@luya/console/commands/views/module/readme.php', $vars),
-            $moduleFolder. DIRECTORY_SEPARATOR . 'admin/Module.php' => $this->view->render('@luya/console/commands/views/module/adminmodule.php', $vars),
-            $moduleFolder. DIRECTORY_SEPARATOR . 'frontend/Module.php' => $this->view->render('@luya/console/commands/views/module/frontendmodule.php', $vars),
+            $moduleFolder.DIRECTORY_SEPARATOR.'README.md' => $this->view->render('@luya/console/commands/views/module/readme.php', $vars),
+            $moduleFolder.DIRECTORY_SEPARATOR.'admin/Module.php' => $this->view->render('@luya/console/commands/views/module/adminmodule.php', $vars),
+            $moduleFolder.DIRECTORY_SEPARATOR.'frontend/Module.php' => $this->view->render('@luya/console/commands/views/module/frontendmodule.php', $vars),
         ];
         
         foreach ($contents as $fileName => $content) {

core/helpers/ArrayHelper.php

Spacing +3 added lines, -3 removed lines

@@ -50,9 +50,9 @@ 
         foreach ($array as $k => $v) {
             if (is_numeric($v)) {
                 if (is_float($v)) {
-                    $return[$k] = (float)$v;
+                    $return[$k] = (float) $v;
                 } else {
-                    $return[$k] = (int)$v;
+                    $return[$k] = (int) $v;
                 }
             } elseif (is_array($v)) {
                 $return[$k] = self::typeCast($v);
@@ -92,7 +92,7 @@ 
     public static function search($array, $searchText, $sensitive = false)
     {
         $function = ($sensitive) ? 'strpos' : 'stripos';
-        return array_filter($array, function ($item) use ($searchText, $function) {
+        return array_filter($array, function($item) use ($searchText, $function) {
             $response = false;
             foreach ($item as $key => $value) {
                 if ($response) {

core/console/commands/BaseCrudController.php

Indentation +182 added lines, -182 removed lines

@@ -16,191 +16,191 @@
  */
 abstract class BaseCrudController extends Command
 {
-	public function getSqlTablesArray()
-	{
-		$names = Yii::$app->db->schema->tableNames;
+    public function getSqlTablesArray()
+    {
+        $names = Yii::$app->db->schema->tableNames;
 	
-		return array_combine($names, $names);
-	}
-	/**
-	 * Generates validation rules for the specified table.
-	 * @param \yii\db\TableSchema $table the table schema
-	 * @return array the generated validation rules
-	 */
-	public function generateRules($table)
-	{
-		$types = [];
-		$lengths = [];
-		foreach ($table->columns as $column) {
-			if ($column->autoIncrement) {
-				continue;
-			}
-			if (!$column->allowNull && $column->defaultValue === null) {
-				$types['required'][] = $column->name;
-			}
-			switch ($column->type) {
-				case Schema::TYPE_SMALLINT:
-				case Schema::TYPE_INTEGER:
-				case Schema::TYPE_BIGINT:
-					$types['integer'][] = $column->name;
-					break;
-				case Schema::TYPE_BOOLEAN:
-					$types['boolean'][] = $column->name;
-					break;
-				case Schema::TYPE_FLOAT:
-				case 'double': // Schema::TYPE_DOUBLE, which is available since Yii 2.0.3
-				case Schema::TYPE_DECIMAL:
-				case Schema::TYPE_MONEY:
-					$types['number'][] = $column->name;
-					break;
-				case Schema::TYPE_DATE:
-				case Schema::TYPE_TIME:
-				case Schema::TYPE_DATETIME:
-				case Schema::TYPE_TIMESTAMP:
-					$types['safe'][] = $column->name;
-					break;
-				default: // strings
-					if ($column->size > 0) {
-						$lengths[$column->size][] = $column->name;
-					} else {
-						$types['string'][] = $column->name;
-					}
-			}
-		}
-		$rules = [];
-		foreach ($types as $type => $columns) {
-			$rules[] = "[['" . implode("', '", $columns) . "'], '$type']";
-		}
-		foreach ($lengths as $length => $columns) {
-			$rules[] = "[['" . implode("', '", $columns) . "'], 'string', 'max' => $length]";
-		}
-		$db = $this->getDbConnection();
-		// Unique indexes rules
-		try {
-			$uniqueIndexes = $db->getSchema()->findUniqueIndexes($table);
-			foreach ($uniqueIndexes as $uniqueColumns) {
-				// Avoid validating auto incremental columns
-				if (!$this->isColumnAutoIncremental($table, $uniqueColumns)) {
-					$attributesCount = count($uniqueColumns);
-					if ($attributesCount === 1) {
-						$rules[] = "[['" . $uniqueColumns[0] . "'], 'unique']";
-					} elseif ($attributesCount > 1) {
-						$labels = array_intersect_key($this->generateLabels($table), array_flip($uniqueColumns));
-						$lastLabel = array_pop($labels);
-						$columnsList = implode("', '", $uniqueColumns);
-						$rules[] = "[['$columnsList'], 'unique', 'targetAttribute' => ['$columnsList'], 'message' => 'The combination of " . implode(', ', $labels) . " and $lastLabel has already been taken.']";
-					}
-				}
-			}
-		} catch (NotSupportedException $e) {
-			// doesn't support unique indexes information...do nothing
-		}
-		// Exist rules for foreign keys
-		foreach ($table->foreignKeys as $refs) {
-			$refTable = $refs[0];
-			$refTableSchema = $db->getTableSchema($refTable);
-			if ($refTableSchema === null) {
-				// Foreign key could point to non-existing table: https://github.com/yiisoft/yii2-gii/issues/34
-				continue;
-			}
-			$refClassName = $this->generateClassName($refTable);
-			unset($refs[0]);
-			$attributes = implode("', '", array_keys($refs));
-			$targetAttributes = [];
-			foreach ($refs as $key => $value) {
-				$targetAttributes[] = "'$key' => '$value'";
-			}
-			$targetAttributes = implode(', ', $targetAttributes);
-			$rules[] = "[['$attributes'], 'exist', 'skipOnError' => true, 'targetClass' => $refClassName::className(), 'targetAttribute' => [$targetAttributes]]";
-		}
-		return $rules;
-	}
+        return array_combine($names, $names);
+    }
+    /**
+     * Generates validation rules for the specified table.
+     * @param \yii\db\TableSchema $table the table schema
+     * @return array the generated validation rules
+     */
+    public function generateRules($table)
+    {
+        $types = [];
+        $lengths = [];
+        foreach ($table->columns as $column) {
+            if ($column->autoIncrement) {
+                continue;
+            }
+            if (!$column->allowNull && $column->defaultValue === null) {
+                $types['required'][] = $column->name;
+            }
+            switch ($column->type) {
+                case Schema::TYPE_SMALLINT:
+                case Schema::TYPE_INTEGER:
+                case Schema::TYPE_BIGINT:
+                    $types['integer'][] = $column->name;
+                    break;
+                case Schema::TYPE_BOOLEAN:
+                    $types['boolean'][] = $column->name;
+                    break;
+                case Schema::TYPE_FLOAT:
+                case 'double': // Schema::TYPE_DOUBLE, which is available since Yii 2.0.3
+                case Schema::TYPE_DECIMAL:
+                case Schema::TYPE_MONEY:
+                    $types['number'][] = $column->name;
+                    break;
+                case Schema::TYPE_DATE:
+                case Schema::TYPE_TIME:
+                case Schema::TYPE_DATETIME:
+                case Schema::TYPE_TIMESTAMP:
+                    $types['safe'][] = $column->name;
+                    break;
+                default: // strings
+                    if ($column->size > 0) {
+                        $lengths[$column->size][] = $column->name;
+                    } else {
+                        $types['string'][] = $column->name;
+                    }
+            }
+        }
+        $rules = [];
+        foreach ($types as $type => $columns) {
+            $rules[] = "[['" . implode("', '", $columns) . "'], '$type']";
+        }
+        foreach ($lengths as $length => $columns) {
+            $rules[] = "[['" . implode("', '", $columns) . "'], 'string', 'max' => $length]";
+        }
+        $db = $this->getDbConnection();
+        // Unique indexes rules
+        try {
+            $uniqueIndexes = $db->getSchema()->findUniqueIndexes($table);
+            foreach ($uniqueIndexes as $uniqueColumns) {
+                // Avoid validating auto incremental columns
+                if (!$this->isColumnAutoIncremental($table, $uniqueColumns)) {
+                    $attributesCount = count($uniqueColumns);
+                    if ($attributesCount === 1) {
+                        $rules[] = "[['" . $uniqueColumns[0] . "'], 'unique']";
+                    } elseif ($attributesCount > 1) {
+                        $labels = array_intersect_key($this->generateLabels($table), array_flip($uniqueColumns));
+                        $lastLabel = array_pop($labels);
+                        $columnsList = implode("', '", $uniqueColumns);
+                        $rules[] = "[['$columnsList'], 'unique', 'targetAttribute' => ['$columnsList'], 'message' => 'The combination of " . implode(', ', $labels) . " and $lastLabel has already been taken.']";
+                    }
+                }
+            }
+        } catch (NotSupportedException $e) {
+            // doesn't support unique indexes information...do nothing
+        }
+        // Exist rules for foreign keys
+        foreach ($table->foreignKeys as $refs) {
+            $refTable = $refs[0];
+            $refTableSchema = $db->getTableSchema($refTable);
+            if ($refTableSchema === null) {
+                // Foreign key could point to non-existing table: https://github.com/yiisoft/yii2-gii/issues/34
+                continue;
+            }
+            $refClassName = $this->generateClassName($refTable);
+            unset($refs[0]);
+            $attributes = implode("', '", array_keys($refs));
+            $targetAttributes = [];
+            foreach ($refs as $key => $value) {
+                $targetAttributes[] = "'$key' => '$value'";
+            }
+            $targetAttributes = implode(', ', $targetAttributes);
+            $rules[] = "[['$attributes'], 'exist', 'skipOnError' => true, 'targetClass' => $refClassName::className(), 'targetAttribute' => [$targetAttributes]]";
+        }
+        return $rules;
+    }
 	
-	/**
-	 * Generates a class name from the specified table name.
-	 * @param string $tableName the table name (which may contain schema prefix)
-	 * @param boolean $useSchemaName should schema name be included in the class name, if present
-	 * @return string the generated class name
-	 */
-	protected function generateClassName($tableName, $useSchemaName = null)
-	{
-		if (isset($this->classNames[$tableName])) {
-			return $this->classNames[$tableName];
-		}
-		$schemaName = '';
-		$fullTableName = $tableName;
-		if (($pos = strrpos($tableName, '.')) !== false) {
-			if (($useSchemaName === null && $this->useSchemaName) || $useSchemaName) {
-				$schemaName = substr($tableName, 0, $pos) . '_';
-			}
-			$tableName = substr($tableName, $pos + 1);
-		}
-		$db = $this->getDbConnection();
-		$patterns = [];
-		$patterns[] = "/^{$db->tablePrefix}(.*?)$/";
-		$patterns[] = "/^(.*?){$db->tablePrefix}$/";
-		if (strpos($this->tableName, '*') !== false) {
-			$pattern = $this->tableName;
-			if (($pos = strrpos($pattern, '.')) !== false) {
-				$pattern = substr($pattern, $pos + 1);
-			}
-			$patterns[] = '/^' . str_replace('*', '(\w+)', $pattern) . '$/';
-		}
-		$className = $tableName;
-		foreach ($patterns as $pattern) {
-			if (preg_match($pattern, $tableName, $matches)) {
-				$className = $matches[1];
-				break;
-			}
-		}
-		return $this->classNames[$fullTableName] = Inflector::id2camel($schemaName.$className, '_');
-	}
+    /**
+     * Generates a class name from the specified table name.
+     * @param string $tableName the table name (which may contain schema prefix)
+     * @param boolean $useSchemaName should schema name be included in the class name, if present
+     * @return string the generated class name
+     */
+    protected function generateClassName($tableName, $useSchemaName = null)
+    {
+        if (isset($this->classNames[$tableName])) {
+            return $this->classNames[$tableName];
+        }
+        $schemaName = '';
+        $fullTableName = $tableName;
+        if (($pos = strrpos($tableName, '.')) !== false) {
+            if (($useSchemaName === null && $this->useSchemaName) || $useSchemaName) {
+                $schemaName = substr($tableName, 0, $pos) . '_';
+            }
+            $tableName = substr($tableName, $pos + 1);
+        }
+        $db = $this->getDbConnection();
+        $patterns = [];
+        $patterns[] = "/^{$db->tablePrefix}(.*?)$/";
+        $patterns[] = "/^(.*?){$db->tablePrefix}$/";
+        if (strpos($this->tableName, '*') !== false) {
+            $pattern = $this->tableName;
+            if (($pos = strrpos($pattern, '.')) !== false) {
+                $pattern = substr($pattern, $pos + 1);
+            }
+            $patterns[] = '/^' . str_replace('*', '(\w+)', $pattern) . '$/';
+        }
+        $className = $tableName;
+        foreach ($patterns as $pattern) {
+            if (preg_match($pattern, $tableName, $matches)) {
+                $className = $matches[1];
+                break;
+            }
+        }
+        return $this->classNames[$fullTableName] = Inflector::id2camel($schemaName.$className, '_');
+    }
 	
-	/**
-	 * Checks if any of the specified columns is auto incremental.
-	 * @param \yii\db\TableSchema $table the table schema
-	 * @param array $columns columns to check for autoIncrement property
-	 * @return boolean whether any of the specified columns is auto incremental.
-	 */
-	protected function isColumnAutoIncremental($table, $columns)
-	{
-		foreach ($columns as $column) {
-			if (isset($table->columns[$column]) && $table->columns[$column]->autoIncrement) {
-				return true;
-			}
-		}
-		return false;
-	}
+    /**
+     * Checks if any of the specified columns is auto incremental.
+     * @param \yii\db\TableSchema $table the table schema
+     * @param array $columns columns to check for autoIncrement property
+     * @return boolean whether any of the specified columns is auto incremental.
+     */
+    protected function isColumnAutoIncremental($table, $columns)
+    {
+        foreach ($columns as $column) {
+            if (isset($table->columns[$column]) && $table->columns[$column]->autoIncrement) {
+                return true;
+            }
+        }
+        return false;
+    }
 	
-	/**
-	 * Generates the attribute labels for the specified table.
-	 * @param \yii\db\TableSchema $table the table schema
-	 * @return array the generated attribute labels (name => label)
-	 */
-	public function generateLabels($table)
-	{
-		$labels = [];
-		foreach ($table->columns as $column) {
-			if ($this->generateLabelsFromComments && !empty($column->comment)) {
-				$labels[$column->name] = $column->comment;
-			} elseif (!strcasecmp($column->name, 'id')) {
-				$labels[$column->name] = 'ID';
-			} else {
-				$label = Inflector::camel2words($column->name);
-				if (!empty($label) && substr_compare($label, ' id', -3, 3, true) === 0) {
-					$label = substr($label, 0, -3) . ' ID';
-				}
-				$labels[$column->name] = $label;
-			}
-		}
-		return $labels;
-	}
+    /**
+     * Generates the attribute labels for the specified table.
+     * @param \yii\db\TableSchema $table the table schema
+     * @return array the generated attribute labels (name => label)
+     */
+    public function generateLabels($table)
+    {
+        $labels = [];
+        foreach ($table->columns as $column) {
+            if ($this->generateLabelsFromComments && !empty($column->comment)) {
+                $labels[$column->name] = $column->comment;
+            } elseif (!strcasecmp($column->name, 'id')) {
+                $labels[$column->name] = 'ID';
+            } else {
+                $label = Inflector::camel2words($column->name);
+                if (!empty($label) && substr_compare($label, ' id', -3, 3, true) === 0) {
+                    $label = substr($label, 0, -3) . ' ID';
+                }
+                $labels[$column->name] = $label;
+            }
+        }
+        return $labels;
+    }
 	
-	/**
-	 * @return Connection the DB connection as specified by [[db]].
-	 */
-	protected function getDbConnection()
-	{
-		return Yii::$app->get('db', false);
-	}
+    /**
+     * @return Connection the DB connection as specified by [[db]].
+     */
+    protected function getDbConnection()
+    {
+        return Yii::$app->get('db', false);
+    }
 }
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -69,10 +69,10 @@ 
 		}
 		$rules = [];
 		foreach ($types as $type => $columns) {
-			$rules[] = "[['" . implode("', '", $columns) . "'], '$type']";
+			$rules[] = "[['".implode("', '", $columns)."'], '$type']";
 		}
 		foreach ($lengths as $length => $columns) {
-			$rules[] = "[['" . implode("', '", $columns) . "'], 'string', 'max' => $length]";
+			$rules[] = "[['".implode("', '", $columns)."'], 'string', 'max' => $length]";
 		}
 		$db = $this->getDbConnection();
 		// Unique indexes rules
@@ -83,12 +83,12 @@ 
 				if (!$this->isColumnAutoIncremental($table, $uniqueColumns)) {
 					$attributesCount = count($uniqueColumns);
 					if ($attributesCount === 1) {
-						$rules[] = "[['" . $uniqueColumns[0] . "'], 'unique']";
+						$rules[] = "[['".$uniqueColumns[0]."'], 'unique']";
 					} elseif ($attributesCount > 1) {
 						$labels = array_intersect_key($this->generateLabels($table), array_flip($uniqueColumns));
 						$lastLabel = array_pop($labels);
 						$columnsList = implode("', '", $uniqueColumns);
-						$rules[] = "[['$columnsList'], 'unique', 'targetAttribute' => ['$columnsList'], 'message' => 'The combination of " . implode(', ', $labels) . " and $lastLabel has already been taken.']";
+						$rules[] = "[['$columnsList'], 'unique', 'targetAttribute' => ['$columnsList'], 'message' => 'The combination of ".implode(', ', $labels)." and $lastLabel has already been taken.']";
 					}
 				}
 			}
@@ -131,7 +131,7 @@ 
 		$fullTableName = $tableName;
 		if (($pos = strrpos($tableName, '.')) !== false) {
 			if (($useSchemaName === null && $this->useSchemaName) || $useSchemaName) {
-				$schemaName = substr($tableName, 0, $pos) . '_';
+				$schemaName = substr($tableName, 0, $pos).'_';
 			}
 			$tableName = substr($tableName, $pos + 1);
 		}
@@ -144,7 +144,7 @@ 
 			if (($pos = strrpos($pattern, '.')) !== false) {
 				$pattern = substr($pattern, $pos + 1);
 			}
-			$patterns[] = '/^' . str_replace('*', '(\w+)', $pattern) . '$/';
+			$patterns[] = '/^'.str_replace('*', '(\w+)', $pattern).'$/';
 		}
 		$className = $tableName;
 		foreach ($patterns as $pattern) {
@@ -188,7 +188,7 @@ 
 			} else {
 				$label = Inflector::camel2words($column->name);
 				if (!empty($label) && substr_compare($label, ' id', -3, 3, true) === 0) {
-					$label = substr($label, 0, -3) . ' ID';
+					$label = substr($label, 0, -3).' ID';
 				}
 				$labels[$column->name] = $label;
 			}

core/console/commands/views/crud/create_model.php

Spacing +4 added lines, -4 removed lines

@@ -22,8 +22,8 @@ 
 /**
  * NgRest Model created at <?= date("d.m.Y H:i"); ?> on LUYA Version <?= $luyaVersion; ?>.
  *
-<?php foreach ($properties as $name => $type): ?> * @property <?= $type; ?> $<?= $name . PHP_EOL; ?>
-<?php endforeach;?>
+<?php foreach ($properties as $name => $type): ?> * @property <?= $type; ?> $<?= $name.PHP_EOL; ?>
+<?php endforeach; ?>
  */
 <?php if (!$extended): ?>abstract <?php endif; ?>class <?= $className; ?> extends \luya\admin\ngrest\base\NgRestModel
 {
@@ -53,7 +53,7 @@ 
     public function rules()
     {
         return [
-        <?php foreach($rules as $rule): ?>
+        <?php foreach ($rules as $rule): ?>
     <?=$rule?>,
         <?php endforeach; ?>];
     }
@@ -98,7 +98,7 @@ 
     {
         return [
         <?php foreach ($fieldConfigs as $name => $type): ?>
-    '<?=$name; ?>' => '<?= $type;?>',
+    '<?=$name; ?>' => '<?= $type; ?>',
         <?php endforeach; ?>];
     }