newicon / neon

neon/core/Yii.php

Spacing +1 added lines, -1 removed lines

@@ -24,5 +24,5 @@
 
 spl_autoload_register(['Yii', 'autoload'], true, true);
 // Ability to replace any yii core class with an alternative
-Yii::$classMap = require YII2_PATH . '/classes.php';
+Yii::$classMap = require YII2_PATH.'/classes.php';
 Yii::$container = new yii\di\Container();

neon/core/web/Request.php

Spacing +4 added lines, -4 removed lines

@@ -204,7 +204,7 @@ 
 	 * @throws \yii\base\InvalidConfigException
 	 * @throws HttpException - if validation fails
 	 */
-	public function validate($data, $rules, $errorCode=400)
+	public function validate($data, $rules, $errorCode = 400)
 	{
 		$model = $this->validateData($data, $rules);
 		if ($model->hasErrors()) {
@@ -236,10 +236,10 @@ 
 	 * // $req->hasErrors();
 	 * ```
 	 */
-	public function validateData($data, $rules, $type="get")
+	public function validateData($data, $rules, $type = "get")
 	{
 		$validate = [];
-		foreach($data as $key => $default)
+		foreach ($data as $key => $default)
 			$validate[$key] = $this->$type($key, $default);
 		return \yii\base\DynamicModel::validateData($validate, $rules);
 	}
@@ -385,7 +385,7 @@ 
 	 * used is the $pattern matches the current route
 	 * @return bool
 	 */
-	public function isRoute($pattern, $params=[])
+	public function isRoute($pattern, $params = [])
 	{
 		$route = neon()->controller->getRoute();
 		$match = Str::is(ltrim($pattern, '/'), $route);

Braces +21 added lines, -12 removed lines

@@ -152,10 +152,12 @@ 
 	 */
 	public function get($name = null, $defaultValue = null)
 	{
-		if ($this->_sanitisedQueryParams == null)
-			$this->sanitiseBodyQueryParams();
-		if ($name == null)
-			return $this->_sanitisedQueryParams;
+		if ($this->_sanitisedQueryParams == null) {
+					$this->sanitiseBodyQueryParams();
+		}
+		if ($name == null) {
+					return $this->_sanitisedQueryParams;
+		}
 		return isset($this->_sanitisedQueryParams[$name]) ? $this->_sanitisedQueryParams[$name] : $defaultValue;
 	}
 
@@ -239,8 +241,9 @@ 
 	public function validateData($data, $rules, $type="get")
 	{
 		$validate = [];
-		foreach($data as $key => $default)
-			$validate[$key] = $this->$type($key, $default);
+		foreach($data as $key => $default) {
+					$validate[$key] = $this->$type($key, $default);
+		}
 		return \yii\base\DynamicModel::validateData($validate, $rules);
 	}
 
@@ -253,10 +256,12 @@ 
 	 */
 	public function post($name = null, $defaultValue = null)
 	{
-		if ($this->_sanitisedBodyParams == null)
-			$this->sanitiseBodyQueryParams();
-		if ($name == null)
-			return $this->_sanitisedBodyParams;
+		if ($this->_sanitisedBodyParams == null) {
+					$this->sanitiseBodyQueryParams();
+		}
+		if ($name == null) {
+					return $this->_sanitisedBodyParams;
+		}
 		return isset($this->_sanitisedBodyParams[$name]) ? $this->_sanitisedBodyParams[$name] : $defaultValue;
 	}
 
@@ -390,10 +395,14 @@ 
 		$route = neon()->controller->getRoute();
 		$match = Str::is(ltrim($pattern, '/'), $route);
 		// we can return imidiately if the route does not match the pattern
-		if (!$match) return false;
+		if (!$match) {
+			return false;
+		}
 
 		// if no param search specified then return the match
-		if (empty($params)) return $match;
+		if (empty($params)) {
+			return $match;
+		}
 
 		// Finally check if $params exist in request params
 		return Arr::isSubset($params, neon()->request->getQueryParams());

neon/core/test/helpers.php

Spacing +19 added lines, -19 removed lines

@@ -2,7 +2,7 @@ 
 
 use neon\core\helpers\File;
 
-if (! function_exists('neon_test_database_create')) {
+if (!function_exists('neon_test_database_create')) {
 	/**
 	 * Creates the test database and user
 	 * Note this does not run the neon installation and create the
@@ -11,7 +11,7 @@ 
 	 */
 	function neon_test_database_create()
 	{
-		$installDb  = env('INSTALL_TEST_DB', true);
+		$installDb = env('INSTALL_TEST_DB', true);
 		if ($installDb) {
 			$db = env('DB_NAME');
 			$host = env('DB_HOST', 'localhost');
@@ -52,7 +52,7 @@ 
 	}
 }
 
-if (! function_exists('neon_test_db_cmd')) {
+if (!function_exists('neon_test_db_cmd')) {
 	function neon_test_db_cmd($cmd)
 	{
 		// A security risk here?  Mind you if you can run PHP your system is compromised anyway.
@@ -64,11 +64,11 @@ 
 		# use the following line to see any warnings and errors
 		#exec($c);
 		# or use this one to suppress them (inc the one about the password)
-		exec($c . " 2>/dev/null");
+		exec($c." 2>/dev/null");
 	}
 }
 
-if (! function_exists('neon_test_server_restart')) {
+if (!function_exists('neon_test_server_restart')) {
 	/**
 	 * Restart a test server
 	 * @param $name
@@ -76,18 +76,18 @@ 
 	 * @param int $port
 	 * @throws Exception
 	 */
-	function neon_test_server_restart($name='test_server', $docRoot=DIR_TEST.'/_root/public', $port=8888)
+	function neon_test_server_restart($name = 'test_server', $docRoot = DIR_TEST.'/_root/public', $port = 8888)
 	{
 		neon_test_server_stop($name);
 		echo "\nRestarting test server...\n";
 		// clear the cache
-		File::removeDirectory(DIR_TEST . '/_root/var');
-		File::removeDirectory(DIR_TEST . '/_root/system');
+		File::removeDirectory(DIR_TEST.'/_root/var');
+		File::removeDirectory(DIR_TEST.'/_root/system');
 		neon_test_server_start($name, $docRoot, $port, true);
 	}
 }
 
-if (! function_exists('neon_test_server_start')) {
+if (!function_exists('neon_test_server_start')) {
 	/**
 	 * Spin up the test server to run the acceptance tests against
 	 * @param string $name
@@ -96,7 +96,7 @@ 
 	 * @return \Symfony\Component\Process\Process
 	 * @throws Exception
 	 */
-	function neon_test_server_start($name='test_server', $docRoot=DIR_TEST.'/_root/public', $port=8888, $silent=false)
+	function neon_test_server_start($name = 'test_server', $docRoot = DIR_TEST.'/_root/public', $port = 8888, $silent = false)
 	{
 		if (preg_match("/[^a-z0-9_]/", $name) !== 0) {
 			throw new \Exception('The name must contain only [a-z0-9_] characters');
@@ -106,7 +106,7 @@ 
 		 * Tests are run against this server
 		 */
 		$address = "localhost:$port";
-		$command = PHP_BINARY . " -S {$address} -t {$docRoot}";
+		$command = PHP_BINARY." -S {$address} -t {$docRoot}";
 		if (!$silent) {
 			echo "\n|======================================================";
 			echo "\n| Creating Test Server";
@@ -123,19 +123,19 @@ 
 		}
 		$process = \neon\core\test\ProcessForker::run($name, $command);
 		try {
-			retry(10, function () use ($address) {
+			retry(10, function() use ($address) {
 				$client = new GuzzleHttp\Client();
 				$res = $client->request('GET', $address);
-				echo ' - Server running with code: ' . $res->getStatusCode() . "\n";
+				echo ' - Server running with code: '.$res->getStatusCode()."\n";
 			}, 1000);
-		} catch(GuzzleHttp\Exception\ConnectException $e) {
+		} catch (GuzzleHttp\Exception\ConnectException $e) {
 			throw new \Exception('Unable to connect to the local test server');
 		}
 		return $process;
 	}
 }
 
-if (! function_exists('retry')) {
+if (!function_exists('retry')) {
 	/**
 	 * Retry an operation a given number of times.
 	 *
@@ -153,7 +153,7 @@ 
 		try {
 			return $callback();
 		} catch (\Exception $e) {
-			if (! $times) {
+			if (!$times) {
 				throw $e;
 			}
 			$times--;
@@ -165,13 +165,13 @@ 
 	}
 }
 
-if (! function_exists('neon_test_server_stop')) {
+if (!function_exists('neon_test_server_stop')) {
 	/**
 	 * Spin up the test server to run the acceptance tests against
 	 * @param string $name
 	 * @throws \Exception if name is not formatted correctly
 	 */
-	function neon_test_server_stop($name='test_server')
+	function neon_test_server_stop($name = 'test_server')
 	{
 		if (preg_match("/[^a-z0-9_]/", $name) !== 0) {
 			throw new \Exception('The name must contain only [a-z0-9_] characters');
@@ -181,7 +181,7 @@ 
 	}
 }
 
-if (! function_exists('test_url')) {
+if (!function_exists('test_url')) {
 	/**
 	 * Return the test url
 	 */

neon/core/test/WebBrowserDriver.php

Spacing +5 added lines, -5 removed lines

@@ -35,7 +35,7 @@ 
 		parent::__construct($config, $options);
 		// Set default path for ChromeDriver
 		if (!isset($this->config['path'])) {
-			$this->config['path'] = __DIR__ . '/bin/'.$this->chromeVersion.'/chromedriver-' . $this->getDriverSuffix();
+			$this->config['path'] = __DIR__.'/bin/'.$this->chromeVersion.'/chromedriver-'.$this->getDriverSuffix();
 		}
 		// Set default WebDriver port
 		if (!isset($this->config['port'])) {
@@ -81,8 +81,8 @@ 
 		}
 		$descriptorSpec = array(
 			array('pipe', 'r'),
-			array('file', $this->getLogDir() . 'ChromeDriver.output.txt', 'w'),
-			array('file', $this->getLogDir() . 'ChromeDriver.errors.txt', 'a')
+			array('file', $this->getLogDir().'ChromeDriver.output.txt', 'w'),
+			array('file', $this->getLogDir().'ChromeDriver.errors.txt', 'a')
 		);
 		$this->resource = proc_open($command, $descriptorSpec, $this->pipes, null, null, array('bypass_shell' => true));
 		if (!is_resource($this->resource) || !proc_get_status($this->resource)['running']) {
@@ -170,7 +170,7 @@ 
 					// Make sure the value is true/false and not 1/0
 					$configValue = ($configValue) ? 'true' : 'false';
 				}
-				$params[] = $mapping[$configKey] . '=' . $configValue;
+				$params[] = $mapping[$configKey].'='.$configValue;
 			}
 		}
 		return implode(' ', $params);
@@ -183,7 +183,7 @@ 
 		// Prefix command with exec on non Windows systems to ensure that we receive the correct pid.
 		// See http://php.net/manual/en/function.proc-get-status.php#93382
 		$commandPrefix = $this->isWindows() ? '' : 'exec ';
-		return $commandPrefix . escapeshellarg(realpath($this->config['path'])) . ' ' . $this->getCommandParameters() . ' --url-base=/wd/hub';
+		return $commandPrefix.escapeshellarg(realpath($this->config['path'])).' '.$this->getCommandParameters().' --url-base=/wd/hub';
 	}
 	/**
 	 * Checks if the current machine is Windows.

neon/core/db/Connection.php

Spacing +3 added lines, -3 removed lines

@@ -86,7 +86,7 @@ 
 	{
 		$currentVersion = neon()->getVersion();
 		$dbName = env('DB_NAME');
-		$filename = gmdate('ymd_His') . '_' . $dbName . '_' . $currentVersion . '.sql';
+		$filename = gmdate('ymd_His').'_'.$dbName.'_'.$currentVersion.'.sql';
 		return $this->getBackupDirectory()."/$filename";
 	}
 
@@ -109,7 +109,7 @@ 
 			'--dump-date',
 			'--no-autocommit',
 			'--routines',
-			'--default-character-set=' . $this->charset,
+			'--default-character-set='.$this->charset,
 			'--set-charset',
 			'--triggers',
 			'--host='.env('DB_HOST'),
@@ -135,7 +135,7 @@ 
 	 */
 	public function restore($path)
 	{
-		$process = new Process('mysql ' . env('DB_NAME') . ' < "' . $path . '"');
+		$process = new Process('mysql '.env('DB_NAME').' < "'.$path.'"');
 		$result = $process->run();
 		if (!$process->isSuccessful()) {
 			throw new ProcessFailedException($process);

neon/core/db/TreeRecord.php

Spacing +2 added lines, -2 removed lines

@@ -77,7 +77,7 @@ 
 	 * @param int $depth
 	 * @return int
 	 */
-	public function rebuildTree($parent, $left, $depth=0)
+	public function rebuildTree($parent, $left, $depth = 0)
 	{
 		// the right value of this node is the left value + 1
 		$right = $left + 1;
@@ -117,7 +117,7 @@ 
 	 * @throws \Exception|\Throwable
 	 * @return TreeRecord the child added
 	 */
-	public function addChild(TreeRecord $node, callable $callable=null) : TreeRecord
+	public function addChild(TreeRecord $node, callable $callable = null) : TreeRecord
 	{
 		$result = static::addAsLastChildOf($this, $node);
 		if ($callable) $callable($node);

Braces +18 added lines, -11 removed lines

@@ -60,8 +60,9 @@ 
 	 */
 	public function makeRoot()
 	{
-		if (static::find()->root()->exists())
-			throw new \Exception('You can only create one root node');
+		if (static::find()->root()->exists()) {
+					throw new \Exception('You can only create one root node');
+		}
 		$this->tree_left = 1;
 		$this->tree_right = 2;
 		$this->tree_depth = 0;
@@ -120,7 +121,9 @@ 
 	public function addChild(TreeRecord $node, callable $callable=null) : TreeRecord
 	{
 		$result = static::addAsLastChildOf($this, $node);
-		if ($callable) $callable($node);
+		if ($callable) {
+			$callable($node);
+		}
 		return $node;
 	}
 
@@ -155,8 +158,9 @@ 
 	 */
 	public function moveAsFirstChildOf(TreeRecord $parent)
 	{
-		if ($parent === $this || $this->isAncestorOf($parent))
-			throw new \Excepton("Cannot move node as first child of itself or into a descendant");
+		if ($parent === $this || $this->isAncestorOf($parent)) {
+					throw new \Excepton("Cannot move node as first child of itself or into a descendant");
+		}
 		$oldDepth = $this->tree_depth;
 		$this->tree_left = $parent->tree_depth + 1;
 		$this->tree_parent = $parent->getPrimaryKey();
@@ -230,12 +234,15 @@ 
 	public static function validateAdd(TreeRecord $parent, TreeRecord $node)
 	{
 		// cannot insert as child of itself
-		if ($parent === $node)
-			throw new \Exception("Cannot insert node as last child of itself");
-		if ($parent->getIsNewRecord())
-			throw new \Exception('The parent node must exist.');
-		if ($node->tree_depth === 0 && $parent->isRoot())
-			throw new \Exception('Can not put a root node inside another root node');
+		if ($parent === $node) {
+					throw new \Exception("Cannot insert node as last child of itself");
+		}
+		if ($parent->getIsNewRecord()) {
+					throw new \Exception('The parent node must exist.');
+		}
+		if ($node->tree_depth === 0 && $parent->isRoot()) {
+					throw new \Exception('Can not put a root node inside another root node');
+		}
 	}
 
 	/**

neon/core/db/TreeQuery.php

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
 			$columns = ['tree_root' => SORT_ASC] + $columns;
 		}
 
-		$this->andWhere(['tree_right' => new Expression($db->quoteColumnName('tree_left') . ' + 1')])
+		$this->andWhere(['tree_right' => new Expression($db->quoteColumnName('tree_left').' + 1')])
 			->addOrderBy($columns);
 
 		return $this;
@@ -69,7 +69,7 @@ 
 	 * @param null $parent
 	 * @param null $root
 	 */
-	public function getProperties(&$left=null, &$right=null, &$parent=null, &$root=null)
+	public function getProperties(&$left = null, &$right = null, &$parent = null, &$root = null)
 	{
 		$model = new $this->modelClass();
 		$model->getPropertes($left, $right, $parent, $root);

neon/core/console/CacheController.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 		$r = new Renderer();
 		$r->smarty->clearCompiledTemplate();
 		$r->smarty->clearAllCache();
-		foreach(neon()->view->renderers as $ext => $config) {
+		foreach (neon()->view->renderers as $ext => $config) {
 			$renderer = neon()->view->getRendererByExtension($ext);
 			if ($renderer instanceof ICanFlushTemplates) {
 				$renderer->flushTemplates();

neon/daedalus/migrations/m170121_171048_dds_dds_changes_for_choices.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 //		$connection->createCommand($sql)->execute();
 
 		// 1. add the choices datatype
-$sql =<<<EOQ
+$sql = <<<EOQ
 SET foreign_key_checks = 0;
 REPLACE INTO `dds_data_type` (`data_type_ref`, `label`, `description`, `definition`, `storage_ref`, `deleted`)
 VALUES
@@ -46,7 +46,7 @@ 
 	{
 		$connection = neon()->db;
 
-$sql =<<<EOQ
+$sql = <<<EOQ
 SET foreign_key_checks = 0;
 DELETE FROM {{%dds_data_type}} WHERE `data_type_ref`='choice' LIMIT 1;
 SET foreign_key_checks = 1;