newicon / neon

neon/core/console/ServeController.php

Indentation +13 added lines, -13 removed lines

@@ -20,18 +20,18 @@
  */
 class ServeController extends YiiServeController
 {
-    /**
-     * @var int port to serve on.
-     */
-    public $port = 8080;
-    /**
-     * @var string path or path alias to directory to serve
-     */
-    public $docroot = '@root/public';
-    /**
-     * @var string path to router script.
-     * See https://secure.php.net/manual/en/features.commandline.webserver.php
-     */
-    public $router;
+	/**
+	 * @var int port to serve on.
+	 */
+	public $port = 8080;
+	/**
+	 * @var string path or path alias to directory to serve
+	 */
+	public $docroot = '@root/public';
+	/**
+	 * @var string path to router script.
+	 * See https://secure.php.net/manual/en/features.commandline.webserver.php
+	 */
+	public $router;
 
 }

neon/core/console/HookController.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	{
 		$branch = exec('git rev-parse --abbrev-ref HEAD');
 		// find readme file
-		$readme =  $readmeFile;
+		$readme = $readmeFile;
 		// read the entire readme
 		$str = file_get_contents($readme);
 		// replace the branch tags

neon/core/console/PublishController.php

Spacing +6 added lines, -6 removed lines

@@ -60,7 +60,7 @@ 
 
 		// Check the version number conforms to semver format - 2.0.1 or 3.0.0[-beta][+build]
 		if (!preg_match('/^v[0-9]+\.[0-9]+\.[0-9]+([-+].*)?$/', $version, $match)) {
-			$this->stderr("!! The version number is not a valid version it must be in the format 'v#.#.#' or 'v#.#.#[-description][+build]'.\n",  Console::FG_RED);
+			$this->stderr("!! The version number is not a valid version it must be in the format 'v#.#.#' or 'v#.#.#[-description][+build]'.\n", Console::FG_RED);
 			return ExitCode::UNSPECIFIED_ERROR;
 		}
 
@@ -75,7 +75,7 @@ 
 
 		// Check to see if the javascript has been built since changing
 		if (!$this->confirm("=> Have you run the neon build process?\n")) {
-			$this->stdout("-> Please run the build process before continuing! =>./neo core/build/neon\n",  Console::FG_CYAN);
+			$this->stdout("-> Please run the build process before continuing! =>./neo core/build/neon\n", Console::FG_CYAN);
 			return ExitCode::UNSPECIFIED_ERROR;
 		}
 
@@ -83,7 +83,7 @@ 
 		// need to make sure that the version to update to is specified and checked in, in the composer.json file
 		// this ensures the tag will have the correct version listed
 		if (!$this->confirm("=> Are your tests passing?\n")) {
-			$this->stdout("-> Please run all of the tests! =>./codecept run\n",  Console::FG_CYAN);
+			$this->stdout("-> Please run all of the tests! =>./codecept run\n", Console::FG_CYAN);
 			return ExitCode::UNSPECIFIED_ERROR;
 		}
 
@@ -100,10 +100,10 @@ 
 		$process->wait();
 		$gitVersions = explode("\n", $process->getOutput());
 		$versions = [];
-		foreach($gitVersions as $v) {
-			$v = substr($v, strrpos($v, "/")+1);
+		foreach ($gitVersions as $v) {
+			$v = substr($v, strrpos($v, "/") + 1);
 			if ($v == '') continue;
-			$versions[] = $v ;
+			$versions[] = $v;
 		}
 		dp($versions);
 		if (in_array($version, $versions)) {

Braces +3 added lines, -1 removed lines

@@ -102,7 +102,9 @@
 		$versions = [];
 		foreach($gitVersions as $v) {
 			$v = substr($v, strrpos($v, "/")+1);
-			if ($v == '') continue;
+			if ($v == '') {
+				continue;
+			}
 			$versions[] = $v ;
 		}
 		dp($versions);

neon/core/console/HelpController.php

Spacing +13 added lines, -13 removed lines

@@ -34,7 +34,7 @@ 
 		if (isset($commands['core/help'])) {
 			unset($commands['core/help']);
 		}
-		$this->stdout("\nThis is Neon version " . \Neon::getVersion() . ".\n");
+		$this->stdout("\nThis is Neon version ".\Neon::getVersion().".\n");
 		if (!empty($commands)) {
 			$this->stdout("\nThe following commands are available:\n\n", Console::BOLD);
 			$len = 0;
@@ -47,7 +47,7 @@ 
 					if (!empty($actions)) {
 						$prefix = $controller->getUniqueId();
 						foreach ($actions as $action) {
-							$string = $prefix . '/' . $action;
+							$string = $prefix.'/'.$action;
 							if ($action === $controller->defaultAction) {
 								$string .= ' (default)';
 							}
@@ -59,7 +59,7 @@ 
 				} elseif (($l = strlen($command)) > $len) {
 					$len = $l;
 				}
-				$this->stdout('- ' . $this->ansiFormat($command, Console::FG_YELLOW));
+				$this->stdout('- '.$this->ansiFormat($command, Console::FG_YELLOW));
 				$this->stdout(str_repeat(' ', $len + 4 - strlen($command)));
 				$this->stdout(Console::wrapText($description, $len + 4 + 2), Console::BOLD);
 				$this->stdout("\n");
@@ -71,8 +71,8 @@ 
 					if (!empty($actions)) {
 						$prefix = $controller->getUniqueId();
 						foreach ($actions as $action) {
-							$string = '  ' . $prefix . '/' . $action;
-							$this->stdout('  ' . $this->ansiFormat($string, Console::FG_GREEN));
+							$string = '  '.$prefix.'/'.$action;
+							$this->stdout('  '.$this->ansiFormat($string, Console::FG_GREEN));
 							if ($action === $controller->defaultAction) {
 								$string .= ' (default)';
 								$this->stdout(' (default)', Console::FG_YELLOW);
@@ -90,8 +90,8 @@ 
 			}
 			$scriptName = $this->getScriptName();
 			$this->stdout("\nTo see the help of each command, enter:\n", Console::BOLD);
-			$this->stdout("\n  $scriptName " . $this->ansiFormat('help', Console::FG_YELLOW) . ' '
-							. $this->ansiFormat('<command-name>', Console::FG_CYAN) . "\n\n");
+			$this->stdout("\n  $scriptName ".$this->ansiFormat('help', Console::FG_YELLOW).' '
+							. $this->ansiFormat('<command-name>', Console::FG_CYAN)."\n\n");
 		} else {
 			$this->stdout("\nNo commands are found.\n\n", Console::BOLD);
 		}
@@ -104,8 +104,8 @@ 
 	 */
 	protected function getDefaultHelpHeader()
 	{
-		return "\nThis is Yii version " . \Yii::getVersion() . ".\n"
-			. "\nThis is Neon version " . \Neon::getVersion() . ".\n";
+		return "\nThis is Yii version ".\Yii::getVersion().".\n"
+			. "\nThis is Neon version ".\Neon::getVersion().".\n";
 
 	}
 
@@ -114,13 +114,13 @@ 
 	 */
 	protected function getModuleCommands($module)
 	{
-		$prefix = $module instanceof Application ? '' : $module->getUniqueId() . '/';
+		$prefix = $module instanceof Application ? '' : $module->getUniqueId().'/';
 
 		$commands = [];
 
 		if ($module->id != 'core') {
 			foreach (array_keys($module->controllerMap) as $id) {
-				$commands[] = $prefix . $id;
+				$commands[] = $prefix.$id;
 			}
 		}
 
@@ -130,11 +130,11 @@ 
 			$files = scandir($controllerPath);
 			foreach ($files as $file) {
 				if (!empty($file) && substr_compare($file, 'Controller.php', -14, 14) === 0) {
-					$controllerClass = $module->controllerNamespace . '\\' . substr(basename($file), 0, -4);
+					$controllerClass = $module->controllerNamespace.'\\'.substr(basename($file), 0, -4);
 					if ($this->validateControllerClass($controllerClass)) {
 //						if ($prefix == 'core' || $prefix == 'core/')
 //							continue;
-						$commands[] = $prefix . Inflector::camel2id(substr(basename($file), 0, -14));
+						$commands[] = $prefix.Inflector::camel2id(substr(basename($file), 0, -14));
 					}
 				}
 			}

neon/core/console/MigrateController.php

Indentation +4 added lines, -4 removed lines

@@ -23,10 +23,10 @@
  */
 class MigrateController extends \yii\console\controllers\MigrateController
 {
-    /**
-     * @inheritdoc
-     */
-    public $templateFile = '@neon/core/views/migration.php';
+	/**
+	 * @inheritdoc
+	 */
+	public $templateFile = '@neon/core/views/migration.php';
 
 	/**
 	 * @var string Define the app that is responsible for this migration.

Spacing +7 added lines, -7 removed lines

@@ -76,7 +76,7 @@ 
 				if ($app === null) {
 					throw new Exception('No app exists with id "'.$this->app.'"');
 				}
-				$this->getMigrator()->migrationPath = $app->getClassAlias() . '/migrations';
+				$this->getMigrator()->migrationPath = $app->getClassAlias().'/migrations';
 				$this->migrationPath = $this->getMigrator()->migrationPath;
 			}
 			return true;
@@ -120,8 +120,8 @@ 
 		if (!preg_match('/^\w+$/', $name)) {
 			throw new Exception("The migration name should contain letters, digits and/or underscore characters only.");
 		}
-		$name = 'm' . gmdate('Ymd_His') . '_' . $app . '_' . $name;
-		$file = neon()->getAlias($this->migrationPath . DIRECTORY_SEPARATOR . $name . '.php');
+		$name = 'm'.gmdate('Ymd_His').'_'.$app.'_'.$name;
+		$file = neon()->getAlias($this->migrationPath.DIRECTORY_SEPARATOR.$name.'.php');
 		if ($this->confirm("Create new migration '$file'?")) {
 			$content = Yii::$app->getView()->renderFile(Neon::getAlias($this->templateFile), ['className' => $name]);
 			FileHelper::createDirectory(dirname($file));
@@ -151,10 +151,10 @@ 
 		$success = $this->migrator->migrateUp($class);
 		$time = microtime(true) - $start;
 		if ($success) {
-			$this->stdout("*** applied $class (time: " . sprintf("%.3f", $time) . "s)\n\n", Console::FG_GREEN);
+			$this->stdout("*** applied $class (time: ".sprintf("%.3f", $time)."s)\n\n", Console::FG_GREEN);
 			return true;
 		} else {
-			$this->stdout("*** failed to apply $class (time: " . sprintf("%.3f", $time) . "s)\n\n", Console::FG_RED);
+			$this->stdout("*** failed to apply $class (time: ".sprintf("%.3f", $time)."s)\n\n", Console::FG_RED);
 			return false;
 		}
 	}
@@ -171,11 +171,11 @@ 
 		$success = $this->migrator->migrateDown($class);
 		if ($success) {
 			$time = microtime(true) - $start;
-			$this->stdout("*** reverted $class (time: " . sprintf("%.3f", $time) . "s)\n\n", Console::FG_GREEN);
+			$this->stdout("*** reverted $class (time: ".sprintf("%.3f", $time)."s)\n\n", Console::FG_GREEN);
 			return true;
 		} else {
 			$time = microtime(true) - $start;
-			$this->stdout("*** failed to revert $class (time: " . sprintf("%.3f", $time) . "s)\n\n", Console::FG_RED);
+			$this->stdout("*** failed to revert $class (time: ".sprintf("%.3f", $time)."s)\n\n", Console::FG_RED);
 			return false;
 		}
 	}

Braces +3 added lines, -2 removed lines

@@ -54,8 +54,9 @@
 	 */
 	public function getMigrator()
 	{
-		if ($this->_migrator === null)
-			$this->_migrator = new Migrator;
+		if ($this->_migrator === null) {
+					$this->_migrator = new Migrator;
+		}
 		return $this->_migrator;
 	}
 

neon/core/console/TestController.php

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
 	/**
 	 * @var bool if true stop execution after first failed test
 	 */
-	public $failFast=false;
+	public $failFast = false;
 	/**
 	 * @var string Comma separated list of tests to run for e.g. unit,acceptance,api
 	 */
@@ -40,7 +40,7 @@ 
 	 * run a codecept test
 	 * @param string $tests
 	 */
-	public function actionIndex($tests='unit,api,acceptance')
+	public function actionIndex($tests = 'unit,api,acceptance')
 	{
 		$options = $this->failFast ? ' --fail-fast' : '';
 
@@ -49,12 +49,12 @@ 
 
 		$options .= " $tests";
 
-		$command = './codecept run ' . $options;
+		$command = './codecept run '.$options;
 		$process = new Process($command, null, null, null, null);
 
 		$this->stdout("-> Running command: $command\n", Console::FG_CYAN);
 		// enable real time output
-		$process->run(function ($type, $buffer) {
+		$process->run(function($type, $buffer) {
 			echo $buffer;
 		});
 	}

Braces +3 added lines, -2 removed lines

@@ -44,8 +44,9 @@
 	{
 		$options = $this->failFast ? ' --fail-fast' : '';
 
-		if ($this->run)
-			$tests = $this->run;
+		if ($this->run) {
+					$tests = $this->run;
+		}
 
 		$options .= " $tests";
 

neon/core/console/BuildController.php

Spacing +3 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
 		$root = neon()->getAlias("@root").DIRECTORY_SEPARATOR;
 
 		// 1. Check that Babel is installed and if not install it
-		if (($result = $this->checkBabel())!=0)
+		if (($result = $this->checkBabel()) != 0)
 			return $result;
 
 		// 2. Create the babel config file
@@ -90,7 +90,7 @@ 
 			return $result;
 
 		// 3. Run babel over the project
-		$sourceDirectory = $root.$path;;
+		$sourceDirectory = $root.$path; ;
 		$outDirectory = $root.'babelOut';
 		$command = "babel --root-mode=upward $sourceDirectory --out-dir=$outDirectory --out-file-extension=.build.js --ignore='$sourceDirectory/**/*.build.js','$sourceDirectory/**/vendor/*','$sourceDirectory/**/*.min.js'";
 		$this->stdout("\n-> Running the babel command over $path\n");
@@ -110,7 +110,7 @@ 
 
 		// 5. Remove the babel directory
 		$this->stdout("\n-> Removing the temporary directory $outDirectory\n");
-		$deleteCommand="rm -rf $outDirectory";
+		$deleteCommand = "rm -rf $outDirectory";
 		$this->stdout("->   $deleteCommand\n");
 		$delete = new Process($deleteCommand);
 		$delete->start();

Braces +6 added lines, -4 removed lines

@@ -82,12 +82,14 @@
 		$root = neon()->getAlias("@root").DIRECTORY_SEPARATOR;
 
 		// 1. Check that Babel is installed and if not install it
-		if (($result = $this->checkBabel())!=0)
-			return $result;
+		if (($result = $this->checkBabel())!=0) {
+					return $result;
+		}
 
 		// 2. Create the babel config file
-		if (($result = $this->checkBabelConfig($root)) != 0)
-			return $result;
+		if (($result = $this->checkBabelConfig($root)) != 0) {
+					return $result;
+		}
 
 		// 3. Run babel over the project
 		$sourceDirectory = $root.$path;;

neon/core/AppInterface.php

Indentation +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 	 *     'order' => 1010,
 	 *     'url' => ['/cms/index/index'],
 	 *     'visible => neon()->user->is('neon-administrator')
- 	 * ];
+	 * ];
 	 * ```
 	 */
 	public function getMenu();

neon/core/traits/PropertiesTrait.php

Spacing +4 added lines, -4 removed lines

@@ -17,11 +17,11 @@ 
  */
 trait PropertiesTrait
 {
-	public function toArray($except=[])
+	public function toArray($except = [])
 	{
-		$array= [];
+		$array = [];
 		$properties = $this->getProperties();
-		foreach($properties as $key => $value) {
+		foreach ($properties as $key => $value) {
 			if (in_array($value, $except)) { continue; }
 			list($prop, $value) = $this->resolveProperty($key, $value);
 			$array[$prop] = $this->valueToArray($value);
@@ -47,7 +47,7 @@ 
 	public function valueToArray($value)
 	{
 		if (is_array($value)) {
-			foreach($value as $key => $val) {
+			foreach ($value as $key => $val) {
 				$value[$key] = $this->valueToArray($val);
 			}
 		} else if (is_object($value) && $value instanceof IArrayable) {

Braces +6 added lines, -3 removed lines

@@ -26,8 +26,9 @@ 
 			list($prop, $value) = $this->resolveProperty($key, $value);
 			$array[$prop] = $this->valueToArray($value);
 		}
-		if (!isset($array['class']))
-			$array['class'] = get_called_class();
+		if (!isset($array['class'])) {
+					$array['class'] = get_called_class();
+		}
 		return $array;
 	}
 
@@ -39,7 +40,9 @@ 
 	 */
 	public function resolveProperty($key, $value)
 	{
-		if (is_int($key)) $key = $value;
+		if (is_int($key)) {
+			$key = $value;
+		}
 		$value = is_string($value) ? $this->$value : call_user_func($value, $this, $key);
 		return [$key, $value];
 	}