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/services/ddsManager/DdsCore.php

Spacing +32 added lines, -32 removed lines

@@ -111,7 +111,7 @@ 
 		$member = $storage[$memberRef];
 		// handle some storage differences
 		$columnCheck = substr($member['column'], 0, 4);
-		if ($columnCheck=='CHAR' || $columnCheck=='UUID') {
+		if ($columnCheck == 'CHAR' || $columnCheck == 'UUID') {
 			$size = (isset($member['definition']['size'])) ? $member['definition']['size'] : 150;
 			$member['column'] = str_replace($columnCheck, "CHAR($size)", $member['column']);
 		}
@@ -160,10 +160,10 @@ 
 	 * @return []  array of ['member_ref']=>['data_type_ref', 'column', 'index']
 	 *  where column is the db column type
 	 */
-	protected function getMemberStorage($classType, $memberRef=null)
+	protected function getMemberStorage($classType, $memberRef = null)
 	{
 		$boundValues = [];
-		$query =<<<EOQ
+		$query = <<<EOQ
 SELECT `m`.`member_ref`, `s`.`type`, d.`definition` FROM dds_member m
 JOIN `dds_data_type` d ON `m`.`data_type_ref`=d.`data_type_ref`
 JOIN `dds_storage` s ON `d`.`storage_ref`=s.`storage_ref`
@@ -182,7 +182,7 @@ 
 			$memberStorage[$r['member_ref']] = [
 				'column' => $this->getColumnType($r['type']),
 				'index' => $this->getIndexType($r['type']),
-				'definition' => empty($r['definition']) ? null : json_decode($r['definition'],true)
+				'definition' => empty($r['definition']) ? null : json_decode($r['definition'], true)
 			];
 		}
 		return $memberStorage;
@@ -209,7 +209,7 @@ 
 			case 'BINARY_LONG': $type = "LONGBLOB"; break;
 			case 'CHAR': $type = "CHAR"; break;
 			case 'UUID': $type = "UUID"; break;
-			default: $type="UNKNOWN STORAGE TYPE $storageType"; break;
+			default: $type = "UNKNOWN STORAGE TYPE $storageType"; break;
 		}
 		$collation = $this->getCollation($storageType);
 		if ($collation)
@@ -284,7 +284,7 @@ 
 	 * @throws \InvalidArgumentException if class not found and $throwException is true
 	 * @return boolean  whether or not found
 	 */
-	protected function findClass($classType, &$class=null, $throwException=false)
+	protected function findClass($classType, &$class = null, $throwException = false)
 	{
 		$ct = $this->canonicaliseRef($classType);
 		if (empty(self::$_classCache[$ct])) {
@@ -333,13 +333,13 @@ 
 	/**
 	 * @see IDdsClassManagement::listMembers
 	 */
-	protected function listMembersForClass($classType, $includeDeleted=false, $keyBy='member_ref')
+	protected function listMembersForClass($classType, $includeDeleted = false, $keyBy = 'member_ref')
 	{
 		if (!is_string($classType))
 			throw new \InvalidArgumentException('The class type $classType parameter should be a string');
 		$select = ['member_ref', 'label', 'data_type_ref', 'description', 'choices', 'map_field', 'link_class'];
 		if (!empty($keyBy) && !in_array($keyBy, $select))
-			throw new \InvalidArgumentException("Parameter keyBy must be empty or one of ".print_r($select,true));
+			throw new \InvalidArgumentException("Parameter keyBy must be empty or one of ".print_r($select, true));
 
 		// see if we have a cached version or getting from the database
 		if (empty(static::$_classMembersCache[$classType][$includeDeleted])) {
@@ -390,7 +390,7 @@ 
 	 */
 	protected function setClassMapMemberCache($classType, $member)
 	{
-		static::$_classMemberMapCache[$classType]=$member;
+		static::$_classMemberMapCache[$classType] = $member;
 	}
 
 	/**
@@ -399,7 +399,7 @@ 
 	 * @param \neon\daedalus\services\ddsManager\models\DdsDataType &$dataType
 	 * @return boolean  whether or not found
 	 */
-	protected function findDataType($dataTypeRef, &$dataType=null)
+	protected function findDataType($dataTypeRef, &$dataType = null)
 	{
 		$dataType = DdsDataType::findOne(['data_type_ref'=>$dataTypeRef]);
 		return ($dataType !== null);
@@ -453,7 +453,7 @@ 
 	 * @param char $separator  the single character separator to split the string into its parts
 	 * @return string  the canonicalised result
 	 */
-	protected function canonicaliseRefByParts($ref, $separator=".")
+	protected function canonicaliseRefByParts($ref, $separator = ".")
 	{
 		$parts = explode($separator, $ref);
 		$canons = [];
@@ -467,7 +467,7 @@ 
 	 * @param $ref
 	 * @return string
 	 */
-	protected function quoteField($ref, $ddsObjectAlias='o')
+	protected function quoteField($ref, $ddsObjectAlias = 'o')
 	{
 		if (in_array($ref, ['_uuid', '_created', '_updated', '_class_ref'])) {
 			return "`$ddsObjectAlias`.`$ref`";
@@ -487,7 +487,7 @@ 
 		try {
 			$this->canonicaliseFiltersRecursive($filters);
 		} catch (\InvalidArgumentException $ex) {
-			throw new \InvalidArgumentException($ex->getMessage()." Filters passed in: ".print_r($filters,true));
+			throw new \InvalidArgumentException($ex->getMessage()." Filters passed in: ".print_r($filters, true));
 		}
 		return $filters;
 	}
@@ -502,7 +502,7 @@ 
 	protected function canonicaliseFiltersRecursive(&$filters)
 	{
 		// is this a filter clause or set of filter clauses??
-		if (!is_array($filters) || count($filters)==0)
+		if (!is_array($filters) || count($filters) == 0)
 			return;
 
 		// recursively descend until one finds a filter clause
@@ -513,9 +513,9 @@ 
 		}
 		// so canonicalise a filter clause
 		if (array_key_exists(0, $filters))
-			$this->canonicaliseFilter($filters[0],0);
+			$this->canonicaliseFilter($filters[0], 0);
 		if (array_key_exists(1, $filters))
-			$this->canonicaliseFilter($filters[1],1);
+			$this->canonicaliseFilter($filters[1], 1);
 
 		// Handle nulls passed as values
 		// ['field', '=', null] and ['field', '!=', null]
@@ -544,7 +544,7 @@ 
 		}
 		if ($key === 1) {
 			// accept only these operators
-			switch(strtolower($item)) {
+			switch (strtolower($item)) {
 				case '=': case '!=':
 				case '<': case '<=':
 				case '>': case '>=':
@@ -579,7 +579,7 @@ 
 	{
 		// check there are no integer keys as this means not all keys are in the logic
 		foreach ($keys as $k) {
-			if ((int)$k === $k) {
+			if ((int) $k === $k) {
 				throw new \InvalidArgumentException("Daedalus: You have provided a logic string to the query, but it looks like not all filter clauses have a logic name added to them. All filter clauses need to represented in the logic statement.");
 			}
 		}
@@ -590,8 +590,8 @@ 
 			['AND', 'and', 'NOT', 'not', 'OR', 'or', ' ', ')', '('],
 			'', $subLogic
 		);
-		if (strlen($subLogic)>0)
-			throw new \InvalidArgumentException("Daedalus: Invalid logic operator provided. Maybe you haven't defined all keys or have other logic than 'AND', 'OR', 'NOT' and '(',')' characters in your logic? You have defined the keys as ".print_r($keys, true)." for a logic statement of ".print_r($logic,true)." The remaining characters are ".print_r($subLogic,true));
+		if (strlen($subLogic) > 0)
+			throw new \InvalidArgumentException("Daedalus: Invalid logic operator provided. Maybe you haven't defined all keys or have other logic than 'AND', 'OR', 'NOT' and '(',')' characters in your logic? You have defined the keys as ".print_r($keys, true)." for a logic statement of ".print_r($logic, true)." The remaining characters are ".print_r($subLogic, true));
 		return $logic;
 	}
 
@@ -627,7 +627,7 @@ 
 				switch ($drn) {
 					case 'ASC': case 'DESC':
 						// allow -ve key starts for nulls last in MySql
-						if (strpos($k,'-') === 0)
+						if (strpos($k, '-') === 0)
 							$canon['-'.$this->quoteField($k)] = $drn;
 						else
 							$canon[$this->quoteField($k)] = $drn;
@@ -651,10 +651,10 @@ 
 	protected function canonicaliseLimit($limit, &$total, &$calculateTotal)
 	{
 		$canon = [];
-		$total=null;
+		$total = null;
 		$calculateTotal = false;
 		if (is_array($limit)) {
-			$canon = ['start'=>0,'length'=>self::MAX_LENGTH];
+			$canon = ['start'=>0, 'length'=>self::MAX_LENGTH];
 			foreach ($limit as $k=>$v) {
 				$key = strtolower($k);
 				switch ($key) {
@@ -667,7 +667,7 @@ 
 					case 'total':
 						// $v can be truthy or the previous integer
 						$total = is_numeric($v) ? (int) $v : null;
-						$calculateTotal = ($v===true || $v==='true');
+						$calculateTotal = ($v === true || $v === 'true');
 					break;
 				}
 			}
@@ -682,14 +682,14 @@ 
 	 * @param [] $row  the row of data to be converted
 	 * @param string $classTypeKey the key in the data that will give the class type
 	 */
-	protected function convertFromDBToPHP(&$row, $links=[], $classTypeKey='_class_type')
+	protected function convertFromDBToPHP(&$row, $links = [], $classTypeKey = '_class_type')
 	{
 		$classType = $row[$classTypeKey];
 		$members = $this->getClassMembers($classType);
 		// now process only the member defined fields:
 		foreach ($row as $key => &$value) {
 			if (isset($members[$key])) {
-				$memberLinks = isset($links[$key])?$links[$key]:[];
+				$memberLinks = isset($links[$key]) ? $links[$key] : [];
 				$this->doConversionFromDBToPHP($members[$key], $value, $memberLinks);
 			}
 		}
@@ -701,9 +701,9 @@ 
 	 * @param string $dataType the data type ref of the value
 	 * @param mixed $value  the value returned by the database
 	 */
-	protected function doConversionFromDBToPHP($member, &$value, $memberLinks=[])
+	protected function doConversionFromDBToPHP($member, &$value, $memberLinks = [])
 	{
-		switch($member['data_type_ref']) {
+		switch ($member['data_type_ref']) {
 			case 'choice':
 				// silently ignore deleted old choice as no longer valid
 				if (is_array($member['choices']) && isset($member['choices'][$value])) {
@@ -766,7 +766,7 @@ 
 	protected function doConversionFromPHPToDB($member, &$value, &$links)
 	{
 		$links = null;
-		switch($member['data_type_ref']) {
+		switch ($member['data_type_ref']) {
 			case 'choice':
 				// convert from the value array to the key if the array
 				// the array was returned
@@ -802,7 +802,7 @@ 
 	 * @param array $dataTypes  add to restrict members to certain types
 	 * @return array the members
 	 */
-	protected function getClassMembers($classType, array $dataTypes=[])
+	protected function getClassMembers($classType, array $dataTypes = [])
 	{
 		static $_classMembers = [];
 		if (!array_key_exists($classType, $_classMembers)) {
@@ -881,11 +881,11 @@ 
 		$fields = [];
 		$values = [];
 		foreach ($row as $f=>$v) {
-			$fields[]=$f;
+			$fields[] = $f;
 			$values[] = $this->pdoQuote($v);
 		}
 		if (count($fields))
-			return "REPLACE INTO `$table` (`".(implode('`,`',$fields)).'`) VALUES ('.(implode(",",$values)).");";
+			return "REPLACE INTO `$table` (`".(implode('`,`', $fields)).'`) VALUES ('.(implode(",", $values)).");";
 		return null;
 	}
 

Braces +94 added lines, -64 removed lines

@@ -99,8 +99,9 @@ 
 		$tableName = $this->getTableFromClassType($classType);
 		$upSql = $this->getDropTableSql($classType);
 		$downSql = $this->getCreateTableSql($tableName);
-		foreach ($upSql as $up)
-			neon()->db->createCommand($up)->execute();
+		foreach ($upSql as $up) {
+					neon()->db->createCommand($up)->execute();
+		}
 		$this->storeMigration($upSql, $downSql);
 	}
 
@@ -212,8 +213,9 @@ 
 			default: $type="UNKNOWN STORAGE TYPE $storageType"; break;
 		}
 		$collation = $this->getCollation($storageType);
-		if ($collation)
-			return "$type $collation DEFAULT NULL ";
+		if ($collation) {
+					return "$type $collation DEFAULT NULL ";
+		}
 		return "$type DEFAULT NULL ";
 	}
 
@@ -291,8 +293,9 @@ 
 			self::$_classCache[$ct] = DdsClass::findOne(['class_type' => $ct]);
 		}
 		$class = self::$_classCache[$ct];
-		if (!$class && $throwException)
-			throw new \InvalidArgumentException('Unknown class type "'.$ct.'"');
+		if (!$class && $throwException) {
+					throw new \InvalidArgumentException('Unknown class type "'.$ct.'"');
+		}
 		return ($class !== null);
 	}
 
@@ -335,32 +338,38 @@ 
 	 */
 	protected function listMembersForClass($classType, $includeDeleted=false, $keyBy='member_ref')
 	{
-		if (!is_string($classType))
-			throw new \InvalidArgumentException('The class type $classType parameter should be a string');
+		if (!is_string($classType)) {
+					throw new \InvalidArgumentException('The class type $classType parameter should be a string');
+		}
 		$select = ['member_ref', 'label', 'data_type_ref', 'description', 'choices', 'map_field', 'link_class'];
-		if (!empty($keyBy) && !in_array($keyBy, $select))
-			throw new \InvalidArgumentException("Parameter keyBy must be empty or one of ".print_r($select,true));
+		if (!empty($keyBy) && !in_array($keyBy, $select)) {
+					throw new \InvalidArgumentException("Parameter keyBy must be empty or one of ".print_r($select,true));
+		}
 
 		// see if we have a cached version or getting from the database
 		if (empty(static::$_classMembersCache[$classType][$includeDeleted])) {
 			$query = DdsMember::find()->where(['class_type' => $classType]);
-			if ($includeDeleted)
-				$select[] = 'deleted';
-			else
-				$query->andWhere(['deleted' => 0]);
+			if ($includeDeleted) {
+							$select[] = 'deleted';
+			} else {
+							$query->andWhere(['deleted' => 0]);
+			}
 			$rows = $query->select($select)->orderBy('created')->asArray()->all();
-			foreach ($rows as $k=>$r)
-				$rows[$k]['choices'] = json_decode($r['choices'], true);
+			foreach ($rows as $k=>$r) {
+							$rows[$k]['choices'] = json_decode($r['choices'], true);
+			}
 			static::$_classMembersCache[$classType][$includeDeleted] = $rows;
 		}
 
-		if (empty($keyBy))
-			return static::$_classMembersCache[$classType][$includeDeleted];
+		if (empty($keyBy)) {
+					return static::$_classMembersCache[$classType][$includeDeleted];
+		}
 
 		// key by a particular ref
 		$results = [];
-		foreach (static::$_classMembersCache[$classType][$includeDeleted] as $r)
-			$results[$r[$keyBy]] = $r;
+		foreach (static::$_classMembersCache[$classType][$includeDeleted] as $r) {
+					$results[$r[$keyBy]] = $r;
+		}
 
 		return $results;
 	}
@@ -457,8 +466,9 @@ 
 	{
 		$parts = explode($separator, $ref);
 		$canons = [];
-		foreach ($parts as $p)
-			$canons[] = $this->canonicaliseRef($p);
+		foreach ($parts as $p) {
+					$canons[] = $this->canonicaliseRef($p);
+		}
 		return implode($separator, $canons);
 	}
 
@@ -482,8 +492,9 @@ 
 	 */
 	protected function canonicaliseFilters($filters)
 	{
-		if (!is_array($filters))
-			return [];
+		if (!is_array($filters)) {
+					return [];
+		}
 		try {
 			$this->canonicaliseFiltersRecursive($filters);
 		} catch (\InvalidArgumentException $ex) {
@@ -502,20 +513,24 @@ 
 	protected function canonicaliseFiltersRecursive(&$filters)
 	{
 		// is this a filter clause or set of filter clauses??
-		if (!is_array($filters) || count($filters)==0)
-			return;
+		if (!is_array($filters) || count($filters)==0) {
+					return;
+		}
 
 		// recursively descend until one finds a filter clause
 		if (is_array($filters[0])) {
-			foreach ($filters as &$f)
-				$this->canonicaliseFiltersRecursive($f);
+			foreach ($filters as &$f) {
+							$this->canonicaliseFiltersRecursive($f);
+			}
 			return;
 		}
 		// so canonicalise a filter clause
-		if (array_key_exists(0, $filters))
-			$this->canonicaliseFilter($filters[0],0);
-		if (array_key_exists(1, $filters))
-			$this->canonicaliseFilter($filters[1],1);
+		if (array_key_exists(0, $filters)) {
+					$this->canonicaliseFilter($filters[0],0);
+		}
+		if (array_key_exists(1, $filters)) {
+					$this->canonicaliseFilter($filters[1],1);
+		}
 
 		// Handle nulls passed as values
 		// ['field', '=', null] and ['field', '!=', null]
@@ -590,8 +605,9 @@ 
 			['AND', 'and', 'NOT', 'not', 'OR', 'or', ' ', ')', '('],
 			'', $subLogic
 		);
-		if (strlen($subLogic)>0)
-			throw new \InvalidArgumentException("Daedalus: Invalid logic operator provided. Maybe you haven't defined all keys or have other logic than 'AND', 'OR', 'NOT' and '(',')' characters in your logic? You have defined the keys as ".print_r($keys, true)." for a logic statement of ".print_r($logic,true)." The remaining characters are ".print_r($subLogic,true));
+		if (strlen($subLogic)>0) {
+					throw new \InvalidArgumentException("Daedalus: Invalid logic operator provided. Maybe you haven't defined all keys or have other logic than 'AND', 'OR', 'NOT' and '(',')' characters in your logic? You have defined the keys as ".print_r($keys, true)." for a logic statement of ".print_r($logic,true)." The remaining characters are ".print_r($subLogic,true));
+		}
 		return $logic;
 	}
 
@@ -627,10 +643,11 @@ 
 				switch ($drn) {
 					case 'ASC': case 'DESC':
 						// allow -ve key starts for nulls last in MySql
-						if (strpos($k,'-') === 0)
-							$canon['-'.$this->quoteField($k)] = $drn;
-						else
-							$canon[$this->quoteField($k)] = $drn;
+						if (strpos($k,'-') === 0) {
+													$canon['-'.$this->quoteField($k)] = $drn;
+						} else {
+													$canon[$this->quoteField($k)] = $drn;
+						}
 					break;
 					case 'RAND':
 						$canon['RAND'] = 'RAND';
@@ -718,14 +735,16 @@ 
 				if (!empty($choices) && is_array($choices)) {
 					foreach ($choices as $choice) {
 						// silently ignore deleted old choice as no longer valid
-						if (isset($member['choices'][$choice]))
-							$value[] = ['key'=>$choice, 'value'=>$member['choices'][$choice]];
+						if (isset($member['choices'][$choice])) {
+													$value[] = ['key'=>$choice, 'value'=>$member['choices'][$choice]];
+						}
 					}
 				}
 			break;
 			case 'boolean':
-				if ($value === NULL)
-					return;
+				if ($value === NULL) {
+									return;
+				}
 				$value = !!$value;
 			break;
 			case 'json': $value = json_decode($value, true); break;
@@ -750,8 +769,9 @@ 
 			$itemLinks = null;
 			if (isset($members[$key])) {
 				$this->doConversionFromPHPToDB($members[$key], $value, $itemLinks);
-				if ($itemLinks !== null)
-					$links[$key] = $itemLinks;
+				if ($itemLinks !== null) {
+									$links[$key] = $itemLinks;
+				}
 			}
 		}
 	}
@@ -770,16 +790,18 @@ 
 			case 'choice':
 				// convert from the value array to the key if the array
 				// the array was returned
-				if (is_array($value) && isset($value['key']))
-					$value = $value['key'];
+				if (is_array($value) && isset($value['key'])) {
+									$value = $value['key'];
+				}
 			break;
 			case 'choice_multiple':
 				$value = json_encode($value);
 			break;
 			case 'boolean':
 				// check for null values
-				if ($value === null)
-					return;
+				if ($value === null) {
+									return;
+				}
 				// convert from truthy to database 1 or 0
 				$value = $value ? 1 : 0;
 			break;
@@ -811,19 +833,22 @@ 
 				// make sure model afterFind has been run
 				$members = DdsMember::find()->where(['class_type'=>$classType])->all();
 				$membersByRef = [];
-				foreach ($members as $member)
-					$membersByRef[$member['member_ref']] = $member->attributes;
+				foreach ($members as $member) {
+									$membersByRef[$member['member_ref']] = $member->attributes;
+				}
 				$_classMembers[$classType] = $membersByRef;
 			} catch (\Exception $e) {
 				throw new \InvalidArgumentException("Error attempting to get members for $classType.");
 			}
 		}
-		if (empty($dataTypes))
-			return $_classMembers[$classType];
+		if (empty($dataTypes)) {
+					return $_classMembers[$classType];
+		}
 		$dataMembers = [];
 		foreach ($_classMembers[$classType] as $k=>$m) {
-			if (in_array($m['data_type_ref'], $dataTypes))
-				$dataMembers[$k] = $m;
+			if (in_array($m['data_type_ref'], $dataTypes)) {
+							$dataMembers[$k] = $m;
+			}
 		}
 		return $dataMembers;
 	}
@@ -876,16 +901,18 @@ 
 	 */
 	protected function getTableRowReplaceSql($table, $row)
 	{
-		if (!is_array($row))
-			$row = $row->toArray();
+		if (!is_array($row)) {
+					$row = $row->toArray();
+		}
 		$fields = [];
 		$values = [];
 		foreach ($row as $f=>$v) {
 			$fields[]=$f;
 			$values[] = $this->pdoQuote($v);
 		}
-		if (count($fields))
-			return "REPLACE INTO `$table` (`".(implode('`,`',$fields)).'`) VALUES ('.(implode(",",$values)).");";
+		if (count($fields)) {
+					return "REPLACE INTO `$table` (`".(implode('`,`',$fields)).'`) VALUES ('.(implode(",",$values)).");";
+		}
 		return null;
 	}
 
@@ -896,10 +923,12 @@ 
 	 */
 	private function pdoQuote($value)
 	{
-		if (is_array($value))
-			$value = json_encode($value);
-		if (is_null($value))
-			return 'null';
+		if (is_array($value)) {
+					$value = json_encode($value);
+		}
+		if (is_null($value)) {
+					return 'null';
+		}
 		return neon()->db->pdo->quote($value);
 	}
 
@@ -934,8 +963,9 @@ 
 	protected function areUUIDs(array $candidates)
 	{
 		foreach ($candidates as $candidate) {
-			if (!$this->isUUID($candidate))
-				return false;
+			if (!$this->isUUID($candidate)) {
+							return false;
+			}
 		}
 		return true;
 	}