newicon / neon

neon/daedalus/services/ddsAppMigrator/templates/ddsMigration.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
 	public static function addMigration($direction, $migration)
 	{
-		switch($direction) {
+		switch ($direction) {
 			case 'up':
 				self::$upMigrations[] = $migration;
 			break;

neon/daedalus/services/ddsManager/DdsObjectMapManager.php

Spacing +27 added lines, -27 removed lines

@@ -22,7 +22,7 @@ 
 	 * requests to the database within one call
 	 * @var array
 	 */
-	private static $_mapResultsCache=[];
+	private static $_mapResultsCache = [];
 	/**
 	 * The set of map requests
 	 * An array with the requests and the maximum number in the chain
@@ -45,7 +45,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function getObjectMap($classType, $filters=[], $fields=[], $start=0, $length=1000, $includeDeleted=false)
+	public function getObjectMap($classType, $filters = [], $fields = [], $start = 0, $length = 1000, $includeDeleted = false)
 	{
 		if (!$classType)
 			throw new \InvalidArgumentException("Invalid classType '$classType' in getObjectMap. Correct calling code");
@@ -53,7 +53,7 @@ 
 		$cacheKey = md5(serialize(func_get_args()));
 		if (empty(self::$_mapResultsCache[$cacheKey])) {
 			try {
-				$limit = ['start' => max(0, (integer)$start), 'length' => min(1000, (integer)$length)];
+				$limit = ['start' => max(0, (integer) $start), 'length' => min(1000, (integer) $length)];
 				$classType = $this->canonicaliseRef($classType);
 				$fieldsClause = '';
 				$linkJoins = [];
@@ -109,7 +109,7 @@ 
 				$filterClause = '';
 				$filterValues = [];
 				if ($filters) {
-					$ddsObjectFields = ['_uuid','_created','_deleted','_updated'];
+					$ddsObjectFields = ['_uuid', '_created', '_deleted', '_updated'];
 					// whitelist filter keys to prevent sql injection
 					$members = $this->getClassMembers($classType);
 					$filterSubClause = [];
@@ -131,7 +131,7 @@ 
 							$filterValues[":$field$vcount"] = $v;
 							$vcount++;
 						}
-						$inClause = implode(',',$inClause);
+						$inClause = implode(',', $inClause);
 						if (!empty($members[$field]) && $members[$field]['data_type_ref'] == 'link_multi') {
 							$linkName = "link$field";
 							if (!isset($linkJoins[$linkName]))
@@ -141,12 +141,12 @@ 
 							$filterSubClause[] = "AND $keyClause IN ($inClause)";
 						}
 					}
-					$filterClause = implode (' ', $filterSubClause);
+					$filterClause = implode(' ', $filterSubClause);
 				}
 				$linkJoinsClause = implode(' ', $linkJoins);
 
-				$query = "SELECT DISTINCT `o`.`_uuid`, $fieldsClause FROM `dds_object` `o` LEFT JOIN  `$table` `t` ON `o`.`_uuid`=`t`.`_uuid` " .
-					"$linkJoinsClause WHERE `o`.`_class_type` = '$classType' $filterClause $notDeleted ORDER BY $fieldsClause " .
+				$query = "SELECT DISTINCT `o`.`_uuid`, $fieldsClause FROM `dds_object` `o` LEFT JOIN  `$table` `t` ON `o`.`_uuid`=`t`.`_uuid` ".
+					"$linkJoinsClause WHERE `o`.`_class_type` = '$classType' $filterClause $notDeleted ORDER BY $fieldsClause ".
 					"LIMIT $limit[start], $limit[length]";
 				$command = neon()->db->createCommand($query);
 				if ($filters)
@@ -158,12 +158,12 @@ 
 					unset($r['_uuid']);
 
 					// set the map
-					$map[$uuid] = (count($fields)==1) ? current($r) : $r;
+					$map[$uuid] = (count($fields) == 1) ? current($r) : $r;
 				}
 				self::$_mapResultsCache[$cacheKey] = $map;
 			} catch (\Exception $e) {
 				$errorMessage = "Exception during getting a map. This may be caused by empty filters - you cannot filter on null. ".
-					"Your filters were: ".print_r($filters,true).". The error message is ".$e->getMessage();
+					"Your filters were: ".print_r($filters, true).". The error message is ".$e->getMessage();
 				\Neon::error($errorMessage, 'DDS');
 				debug_message($errorMessage);
 				return [];
@@ -175,7 +175,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function makeMapLookupRequest($objectUuids, $chainMapFields=[], $classType=null)
+	public function makeMapLookupRequest($objectUuids, $chainMapFields = [], $classType = null)
 	{
 		if (empty($objectUuids))
 			return null;
@@ -198,7 +198,7 @@ 
 		foreach ($linkedMembers as $lm) {
 			$requestKeys[] = $this->makeMapChainLookupRequest($objectUuids, [$lm]);
 		}
-		return implode('|',$requestKeys);
+		return implode('|', $requestKeys);
 	}
 
 	/**
@@ -217,7 +217,7 @@ 
 			foreach ($partials[0] as $u=>$p) {
 				foreach ($p as $i=>$v) {
 					if ($this->isUuid($v)) {
-						for ($i=1; $i<count($requestKeys); $i++) {
+						for ($i = 1; $i < count($requestKeys); $i++) {
 							if (array_key_exists($v, $partials[$i][1])) {
 								$partials[0][$u][$i] = $partials[$i][1][$v];
 								continue;
@@ -233,7 +233,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function makeMapChainLookupRequest($objectUuids, $chainMembers=[], $chainMapFields=[], $inReverse=false)
+	public function makeMapChainLookupRequest($objectUuids, $chainMembers = [], $chainMapFields = [], $inReverse = false)
 	{
 		if (empty($objectUuids))
 			return null;
@@ -273,7 +273,7 @@ 
 			$this->getMapLookupByLevel($chain);
 			foreach ($chain as $k=>$r) {
 				if ($r['next_uuid'])
-					$requests['chains'][($i+1)][$k]['uuid'] = $r['next_uuid'];
+					$requests['chains'][($i + 1)][$k]['uuid'] = $r['next_uuid'];
 			}
 		}
 		$this->convertMapRequestResults();
@@ -332,7 +332,7 @@ 
 			$requestsByUuid[$r['uuid']][] = $r;
 		}
 		$objectRows = DdsObject::find()
-			->select(['_uuid','_class_type'])
+			->select(['_uuid', '_class_type'])
 			->where(['_uuid'=>$endpoints])
 			->andWhere(['_deleted'=>0])
 			->asArray()
@@ -352,7 +352,7 @@ 
 
 			// now find all the maps members for the required classes
 			$mapFields = DdsMember::find()
-				->select(['class_type','member_ref'])
+				->select(['class_type', 'member_ref'])
 				->where(['class_type'=>$classTypes, 'deleted'=>0, 'map_field'=>1])
 				->asArray()
 				->all();
@@ -368,7 +368,7 @@ 
 			foreach ($objectsByClassMapsAndChain as $class => $chainMapObjects) {
 				foreach ($chainMapObjects as $chain => $mapObjects) {
 					foreach ($mapObjects as $mapField => $objectUuids) {
-						$objs = "'".implode("','",$objectUuids)."'";
+						$objs = "'".implode("','", $objectUuids)."'";
 						// make sure a map field can be created
 						$mapFieldsClause = '';
 						if ($mapField === self::$_defaultMapChain) {
@@ -377,7 +377,7 @@ 
 							$mapFieldsClause = "CAST(`$mapsByClass[$class]` AS CHAR)";
 						} else {
 							$mapFieldsClause = "CONCAT_WS('$hackySeparator'";
-							foreach (explode(',',$mapField) as $m) {
+							foreach (explode(',', $mapField) as $m) {
 								$mapFieldsClause .= ",CAST(`$m` AS CHAR)";
 							}
 							$mapFieldsClause .= ')';
@@ -402,7 +402,7 @@ 
 		$mapsByChainAndUuid = [];
 		foreach ($maps as $m) {
 			if (strpos($m['map'], $hackySeparator) !== false) {
-				$m['map'] = explode($hackySeparator,$m['map']);
+				$m['map'] = explode($hackySeparator, $m['map']);
 			}
 			$mapsByChainAndUuid[$m['chain']][$m['mapFields']][$m['uuid']] = $m;
 		}
@@ -473,14 +473,14 @@ 
 		$chainCount = count($chainMembers);
 		// split the chain up into requests per chain level if there are any
 		foreach ($chainMembers as $i=>$mc) {
-			$mapFieldKey = ($i == 0 ? 0 : $chainMembers[$i-1]);
-			$mapFields = !empty($chainMapFields[$mapFieldKey]) ? implode(',',$chainMapFields[$mapFieldKey]) : self::$_defaultMapChain;
-			$requests['chains'][$i][$requestKey] = ['uuid'=>($i===0?$objectUuid:null), 'map'=>null, 'mapFields'=>$mapFields, 'chain'=>$mc, 'key'=>$requestKey];
+			$mapFieldKey = ($i == 0 ? 0 : $chainMembers[$i - 1]);
+			$mapFields = !empty($chainMapFields[$mapFieldKey]) ? implode(',', $chainMapFields[$mapFieldKey]) : self::$_defaultMapChain;
+			$requests['chains'][$i][$requestKey] = ['uuid'=>($i === 0 ? $objectUuid : null), 'map'=>null, 'mapFields'=>$mapFields, 'chain'=>$mc, 'key'=>$requestKey];
 		}
 		// add a final chain for the last item
-		$mapFieldKey = ($chainCount == 0 ? 0 : $chainMembers[$chainCount-1]);
-		$mapFields = !empty($chainMapFields[$mapFieldKey]) ? implode(',',$chainMapFields[$mapFieldKey]) : self::$_defaultMapChain;
-		$requests['chains'][$chainCount][$requestKey] = ['uuid'=>($chainCount===0?$objectUuid:null), 'map'=>null, 'mapFields'=>$mapFields, 'chain'=>'__FINAL__', 'key'=>$requestKey];
+		$mapFieldKey = ($chainCount == 0 ? 0 : $chainMembers[$chainCount - 1]);
+		$mapFields = !empty($chainMapFields[$mapFieldKey]) ? implode(',', $chainMapFields[$mapFieldKey]) : self::$_defaultMapChain;
+		$requests['chains'][$chainCount][$requestKey] = ['uuid'=>($chainCount === 0 ? $objectUuid : null), 'map'=>null, 'mapFields'=>$mapFields, 'chain'=>'__FINAL__', 'key'=>$requestKey];
 
 		// and add the requestKey so we don't calculate this again
 		$requests['keys'][$requestKey] = [
@@ -509,7 +509,7 @@ 
 		$results = &static::$_mapResults;
 
 		$tempResults = [];
-		if (count($chains)===0)
+		if (count($chains) === 0)
 			return;
 		foreach ($chains as $level => $maps) {
 			foreach ($maps as $key=>$map) {

Braces +51 added lines, -35 removed lines

@@ -47,8 +47,9 @@ 
 	 */
 	public function getObjectMap($classType, $filters=[], $fields=[], $start=0, $length=1000, $includeDeleted=false)
 	{
-		if (!$classType)
-			throw new \InvalidArgumentException("Invalid classType '$classType' in getObjectMap. Correct calling code");
+		if (!$classType) {
+					throw new \InvalidArgumentException("Invalid classType '$classType' in getObjectMap. Correct calling code");
+		}
 
 		$cacheKey = md5(serialize(func_get_args()));
 		if (empty(self::$_mapResultsCache[$cacheKey])) {
@@ -73,8 +74,9 @@ 
 						$class2Member = Arr::index($linkedMemberClasses, 'class_type');
 						foreach ($linkedMembers as $lm) {
 							// only try to link through to tables that are within daedalus
-							if (isset($class2Member[$lm['link_class']]))
-								$field2link[$lm['member_ref']] = $class2Member[$lm['link_class']];
+							if (isset($class2Member[$lm['link_class']])) {
+															$field2link[$lm['member_ref']] = $class2Member[$lm['link_class']];
+							}
 						}
 					}
 					foreach ($fields as $field) {
@@ -82,9 +84,9 @@ 
 							$fl = $field2link[$field];
 							$table = $this->getTableFromClassType($fl['class_type']);
 							$getFields[] = "`$table`.`$fl[member_ref]`";
-							if ($linkedMembers[$field]['data_type_ref'] == 'link_uni')
-								$linkJoins[$table] = "LEFT JOIN `$table` ON `t`.`$field`=`$table`.`_uuid`";
-							else {
+							if ($linkedMembers[$field]['data_type_ref'] == 'link_uni') {
+															$linkJoins[$table] = "LEFT JOIN `$table` ON `t`.`$field`=`$table`.`_uuid`";
+							} else {
 								$linkName = 'link'.$field;
 								$linkJoins[$linkName] = "LEFT JOIN `dds_link` `$linkName` ON (`o`.`_uuid`=`$linkName`.`from_id` AND `$linkName`.`from_member`='$field')";
 								$linkJoins[$table] = "LEFT JOIN `$table` ON `$linkName`.`to_id` =`$table`.`_uuid`";
@@ -96,8 +98,9 @@ 
 					$fieldsClause = implode(', ', $getFields);
 				} else {
 					$member = $this->getMapMemberForClass($classType);
-					if (!$member)
-						throw new \RuntimeException("There is no mappable member field set on class $classType");
+					if (!$member) {
+											throw new \RuntimeException("There is no mappable member field set on class $classType");
+					}
 					// set this as an array for later
 					$fields = [$member['member_ref']];
 					$fieldsClause = "`t`.`$member[member_ref]`";
@@ -116,12 +119,14 @@ 
 					foreach ($filters as $field=>$value) {
 						if ($field == '_map_field_') {
 							$mapMember = $this->getMapMemberForClass($classType);
-							if ($mapMember && $value)
-								$filterSubClause[] = "AND `t`.`$mapMember[member_ref]` LIKE '%$value%'";
+							if ($mapMember && $value) {
+															$filterSubClause[] = "AND `t`.`$mapMember[member_ref]` LIKE '%$value%'";
+							}
 							continue;
 						}
-						if (!(isset($members[$field]) || in_array($field, $ddsObjectFields)))
-							continue;
+						if (!(isset($members[$field]) || in_array($field, $ddsObjectFields))) {
+													continue;
+						}
 						$keyClause = (in_array($field, $ddsObjectFields)) ? "`o`.`$field`" : "`t`.`$field`";
 						$value = is_array($value) ? $value : [$value];
 						$vcount = 1;
@@ -134,8 +139,9 @@ 
 						$inClause = implode(',',$inClause);
 						if (!empty($members[$field]) && $members[$field]['data_type_ref'] == 'link_multi') {
 							$linkName = "link$field";
-							if (!isset($linkJoins[$linkName]))
-								$linkJoins[$linkName] = "LEFT JOIN `dds_link` `$linkName` ON (`o`.`_uuid`=`$linkName`.`from_id` AND `$linkName`.`from_member`='$field')";
+							if (!isset($linkJoins[$linkName])) {
+															$linkJoins[$linkName] = "LEFT JOIN `dds_link` `$linkName` ON (`o`.`_uuid`=`$linkName`.`from_id` AND `$linkName`.`from_member`='$field')";
+							}
 							$filterSubClause[] = "AND `$linkName`.`to_id` IN ($inClause)";
 						} else {
 							$filterSubClause[] = "AND $keyClause IN ($inClause)";
@@ -149,8 +155,9 @@ 
 					"$linkJoinsClause WHERE `o`.`_class_type` = '$classType' $filterClause $notDeleted ORDER BY $fieldsClause " .
 					"LIMIT $limit[start], $limit[length]";
 				$command = neon()->db->createCommand($query);
-				if ($filters)
-					$command->bindValues($filterValues);
+				if ($filters) {
+									$command->bindValues($filterValues);
+				}
 				$rows = $command->queryAll();
 				foreach ($rows as $r) {
 					// extract out the uuid result
@@ -177,8 +184,9 @@ 
 	 */
 	public function makeMapLookupRequest($objectUuids, $chainMapFields=[], $classType=null)
 	{
-		if (empty($objectUuids))
-			return null;
+		if (empty($objectUuids)) {
+					return null;
+		}
 		/*  See if there are any linked fields that we need to get
 			The implementation here is somewhat crude. Generally speaking we are probably looking
 			at needing to implement graphql or something similar to easily manage all the possible
@@ -235,8 +243,9 @@ 
 	 */
 	public function makeMapChainLookupRequest($objectUuids, $chainMembers=[], $chainMapFields=[], $inReverse=false)
 	{
-		if (empty($objectUuids))
-			return null;
+		if (empty($objectUuids)) {
+					return null;
+		}
 
 		// create a request key based on the input parameters
 		$requestKey = md5(serialize(func_get_args()));
@@ -265,15 +274,17 @@ 
 	{
 		$requests = &static::$_mapRequests;
 		// check we have any requests to make
-		if (count($requests['chains']) === 0)
-			return;
+		if (count($requests['chains']) === 0) {
+					return;
+		}
 		// run through the chain and get the reverse maps for each level of requests
 		foreach ($requests['chains'] as $i=>&$chain) {
 			// the requests will be filled in during this call
 			$this->getMapLookupByLevel($chain);
 			foreach ($chain as $k=>$r) {
-				if ($r['next_uuid'])
-					$requests['chains'][($i+1)][$k]['uuid'] = $r['next_uuid'];
+				if ($r['next_uuid']) {
+									$requests['chains'][($i+1)][$k]['uuid'] = $r['next_uuid'];
+				}
 			}
 		}
 		$this->convertMapRequestResults();
@@ -322,8 +333,9 @@ 
 	 */
 	private function getMapLookupByLevel(&$requests)
 	{
-		if (empty($requests))
-			return;
+		if (empty($requests)) {
+					return;
+		}
 
 		$endpoints = [];
 		$requestsByUuid = [];
@@ -372,8 +384,9 @@ 
 						// make sure a map field can be created
 						$mapFieldsClause = '';
 						if ($mapField === self::$_defaultMapChain) {
-							if (!isset($mapsByClass[$class]))
-								continue;
+							if (!isset($mapsByClass[$class])) {
+															continue;
+							}
 							$mapFieldsClause = "CAST(`$mapsByClass[$class]` AS CHAR)";
 						} else {
 							$mapFieldsClause = "CONCAT_WS('$hackySeparator'";
@@ -436,8 +449,9 @@ 
 	 */
 	private function addRequest($requestKey, $objectUuid, $chainMembers, $chainMapFields, $inReverse)
 	{
-		if (empty($objectUuid))
-			return;
+		if (empty($objectUuid)) {
+					return;
+		}
 
 		// Treat a request for objectUuids as multiple single object map requests
 		// TODO NJ 20190415 - make this work properly with multiple uuids without needing multiple requests
@@ -466,8 +480,9 @@ 
 		$requests = &static::$_mapRequests; // to make the code slightly shorter
 
 		// check to see if the request has already added
-		if (isset($requests['keys'][$requestKey]))
-			return;
+		if (isset($requests['keys'][$requestKey])) {
+					return;
+		}
 
 		// calculate how many chains we are going down
 		$chainCount = count($chainMembers);
@@ -509,8 +524,9 @@ 
 		$results = &static::$_mapResults;
 
 		$tempResults = [];
-		if (count($chains)===0)
-			return;
+		if (count($chains)===0) {
+					return;
+		}
 		foreach ($chains as $level => $maps) {
 			foreach ($maps as $key=>$map) {
 				$tempResults[$key][$level][$map['uuid']] = $map['map'];

neon/daedalus/services/ddsManager/models/DdsClass.php

Braces +3 added lines, -2 removed lines

@@ -31,8 +31,9 @@
 	 */
 	public function hasChangeLog()
 	{
-		if (isset($this->attributes['change_log']))
-			return $this->attributes['change_log'];
+		if (isset($this->attributes['change_log'])) {
+					return $this->attributes['change_log'];
+		}
 		return false;
 	}
 

neon/daedalus/services/ddsManager/models/DdsMember.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 	{
 		// return choices as decoded json or null
 		if (!empty($this->choices))
-			$this->choices = json_decode($this->choices,true);
+			$this->choices = json_decode($this->choices, true);
 		parent::afterFind();
 	}
 

Braces +8 added lines, -6 removed lines

@@ -72,10 +72,11 @@ 
 	public function beforeSave($insert)
 	{
 		// choices can only be an array and are stored as JSON
-		if (is_array($this->choices))
-			$this->choices = json_encode($this->choices);
-		else
-			$this->choices = null;
+		if (is_array($this->choices)) {
+					$this->choices = json_encode($this->choices);
+		} else {
+					$this->choices = null;
+		}
 		return parent::beforeSave($insert);
 	}
 
@@ -85,8 +86,9 @@ 
 	public function afterFind()
 	{
 		// return choices as decoded json or null
-		if (!empty($this->choices))
-			$this->choices = json_decode($this->choices,true);
+		if (!empty($this->choices)) {
+					$this->choices = json_decode($this->choices,true);
+		}
 		parent::afterFind();
 	}
 

neon/daedalus/services/ddsManager/DdsDataDefinitionManager.php

Braces +84 added lines, -56 removed lines

@@ -39,8 +39,9 @@ 
 	 */
 	public function isMemberRefUnique($classType, $candidate)
 	{
-		if ($this->isClassTypeUnique($classType))
-			throw new \InvalidArgumentException("Class type ".$this->canonicaliseRef($classType)." unknown");
+		if ($this->isClassTypeUnique($classType)) {
+					throw new \InvalidArgumentException("Class type ".$this->canonicaliseRef($classType)." unknown");
+		}
 		$mr = $this->canonicaliseRef($candidate);
 		$member = DdsMember::find()->where(['class_type'=>$classType, 'member_ref'=>$mr])->one();
 		return ($member == null);
@@ -65,15 +66,17 @@ 
 	public function listClasses($module, &$total, $includeDeleted=false, $start=0, $length=100, $orderBy='label')
 	{
 		$query = $this->_getClassesQuery($module, $includeDeleted);
-		if ($start == 0)
-			$total = (int) $query->count();
+		if ($start == 0) {
+					$total = (int) $query->count();
+		}
 		$results = $query->asArray()
 			->offset($start)
 			->limit($length)
 			->orderBy($orderBy)
 			->all();
-		foreach ($results as &$r)
-			$r['count_current'] = $r['count_total'] - $r['count_deleted'];
+		foreach ($results as &$r) {
+					$r['count_current'] = $r['count_total'] - $r['count_deleted'];
+		}
 		return $results;
 	}
 
@@ -95,8 +98,9 @@ 
 			->asArray()
 			->all();
 		$map = [];
-		foreach ($mappable as $m)
-			$map[$m['class_type']] = $m['label'];
+		foreach ($mappable as $m) {
+					$map[$m['class_type']] = $m['label'];
+		}
 		return $map;
 	}
 
@@ -116,13 +120,15 @@ 
 	public function addClass(&$classType, $module)
 	{
 		$classType = $this->canonicaliseRef($classType);
-		if (DdsClass::findOne(['class_type'=>$classType]) !== null)
-			throw new \InvalidArgumentException("The class $classType already exists");
+		if (DdsClass::findOne(['class_type'=>$classType]) !== null) {
+					throw new \InvalidArgumentException("The class $classType already exists");
+		}
 		$c = new DdsClass();
 		$c->class_type = $classType;
 		$c->module = (empty($module) ? null : $module);
-		if (!$c->save())
-			throw new \RuntimeException("Couldn't save the class: ".print_r($c->errors,true));
+		if (!$c->save()) {
+					throw new \RuntimeException("Couldn't save the class: ".print_r($c->errors,true));
+		}
 		$upSql = $this->getClassTypeMigrationSql($classType);
 		$downSql = "DELETE FROM `dds_class` WHERE `class_type`='$classType';";
 		$this->storeMigration($upSql, $downSql);
@@ -137,8 +143,9 @@ 
 	{
 		if ($this->findClass($classType, $class)) {
 			$data = $class->toArray();
-			if ($includeMembers)
-				$data['members'] = $this->listMembers($class['class_type']);
+			if ($includeMembers) {
+							$data['members'] = $this->listMembers($class['class_type']);
+			}
 			return $data;
 		}
 		return null;
@@ -150,8 +157,9 @@ 
 	public function editClass($classType, $changes)
 	{
 		$allowed = array_intersect_key($changes, array_flip(['label', 'description', 'module', 'change_log']));
-		if (count($allowed)==0)
-			return;
+		if (count($allowed)==0) {
+					return;
+		}
 		$this->clearClassCache($classType);
 		$downSql = $this->getClassTypeMigrationSql($classType);
 		if ($this->findClass($classType, $class)) {
@@ -159,8 +167,9 @@ 
 			$updates = array_diff_assoc($allowed, $class->attributes);
 			if (count($updates)) {
 				$class->attributes = $updates;
-				if (!$class->save())
-					throw new \RuntimeException("Dds: Couldn't update the class '$classType': ".print_r($class->errors));
+				if (!$class->save()) {
+									throw new \RuntimeException("Dds: Couldn't update the class '$classType': ".print_r($class->errors));
+				}
 				$upSql = $this->getClassTypeMigrationSql($classType);
 				$this->storeMigration($upSql, $downSql);
 			}
@@ -203,8 +212,9 @@ 
 	public function destroyClass($classType)
 	{
 		if ($this->findClass($classType, $class)) {
-			if ($this->hasObjects($classType))
-				throw new \RunTimeException("You need to delete all objects before you can destroy a class");
+			if ($this->hasObjects($classType)) {
+							throw new \RunTimeException("You need to delete all objects before you can destroy a class");
+			}
 
 			// now delete the rows
 			$members = DdsMember::find()->where(['class_type'=>$class->class_type])->asArray()->all();
@@ -216,12 +226,14 @@ 
 					$errors[] = $e->getMessage();
 				}
 			}
-			if (count($errors))
-				throw new \RuntimeException("Couldn't destroy all of the members: ".print_r($errors, true));
+			if (count($errors)) {
+							throw new \RuntimeException("Couldn't destroy all of the members: ".print_r($errors, true));
+			}
 			// now delete the class
 			// can also return 0 - which is valid - false means there has been an error
-			if ($class->delete() === false)
-				throw new \RuntimeException("Couldn't destroy the class: ".print_r($class->errors, true));
+			if ($class->delete() === false) {
+							throw new \RuntimeException("Couldn't destroy the class: ".print_r($class->errors, true));
+			}
 			// and clear away the table
 			$this->dropClassTable($class->class_type);
 			$this->clearClassCache($classType);
@@ -251,8 +263,9 @@ 
 			// extract out any additional information
 			$choices = ((!empty($additional['choices']) && is_array($additional['choices'])) ? $additional['choices'] : []);
 			$linkClass = (!empty($additional['link_class']) ? $additional['link_class'] : null);
-			if (DdsMember::findOne(['class_type' => $classType, 'member_ref' => $memberRef])!==null)
-				throw new \InvalidArgumentException("The member $memberRef already exists");
+			if (DdsMember::findOne(['class_type' => $classType, 'member_ref' => $memberRef])!==null) {
+							throw new \InvalidArgumentException("The member $memberRef already exists");
+			}
 			if (in_array($dataTypeRef, ['link_uni', 'link_multi']) && !$linkClass) {
 				throw new \InvalidArgumentException("Link_uni, link_multi data types require a link_class to be passed for member '$classType::$memberRef'. You passed in ".print_r($additional, true));
 			}
@@ -265,8 +278,9 @@ 
 			$member->choices = ($this->memberAllowedChoices($dataTypeRef) ? $choices : null);
 			$member->link_class = ($this->memberAllowedLinks($dataTypeRef) ? $linkClass : null);
 			$member->created = $this->now();
-			if (!$member->save())
-				throw new \RuntimeException("Couldn't save the member: ".print_r($member->errors, true));
+			if (!$member->save()) {
+							throw new \RuntimeException("Couldn't save the member: ".print_r($member->errors, true));
+			}
 
 			// create the migrations
 			$savedMember = $this->getMember($classType, $memberRef);
@@ -310,12 +324,14 @@ 
 	{
 		// check that only allowed updates are made
 		$allowed = array_intersect_key($changes, array_flip(['label', 'description', 'definition', 'choices', 'link_class']));
-		if (count($allowed)==0)
-			return;
+		if (count($allowed)==0) {
+					return;
+		}
 
 		// find the member and remove any illegitamate updates
-		if (!$this->findMember($classType, $memberRef, $member))
-			throw new \InvalidArgumentException("No member found");
+		if (!$this->findMember($classType, $memberRef, $member)) {
+					throw new \InvalidArgumentException("No member found");
+		}
 		if (isset($allowed['choices'])) {
 			$allowed['choices'] = empty($allowed['choices']) ? [] : $allowed['choices'];
 			if (!(is_array($allowed['choices']) && $this->memberAllowedChoices($member->data_type_ref))) {
@@ -323,16 +339,18 @@ 
 			}
 		}
 
-		if (isset($allowed['link_class']) && !$this->memberAllowedLinks($member->data_type_ref))
-			unset($allowed['link_class']);
+		if (isset($allowed['link_class']) && !$this->memberAllowedLinks($member->data_type_ref)) {
+					unset($allowed['link_class']);
+		}
 
 		// finally check to see if there are any actual updates and if so save the provided updates
 		$updates = $this->getMemberUpdateDifferences($allowed, $member->attributes);
 		if (count($updates)) {
 			$downSql = $this->getTableRowReplaceSql('dds_member', $member);
 			$member->attributes = $updates;
-			if (!$member->save())
-				throw new \RuntimeException("Couldn't update the member: ".print_r ($member->errors, true));
+			if (!$member->save()) {
+							throw new \RuntimeException("Couldn't update the member: ".print_r ($member->errors, true));
+			}
 			$upSql = $this->getTableRowReplaceSql('dds_member', $member);
 			$this->storeMigration($upSql, $downSql);
 			$this->clearClassMemberCache($classType);
@@ -344,13 +362,15 @@ 
 	 */
 	public function setMemberAsMapField($classType, $memberRef)
 	{
-		if (!$this->findMember($classType, $memberRef, $member))
-			throw new \InvalidArgumentException("No member found");
+		if (!$this->findMember($classType, $memberRef, $member)) {
+					throw new \InvalidArgumentException("No member found");
+		}
 
 		// find out which member had the map field set for migrations
 		$oldMember = DdsMember::findOne(['class_type'=>$classType, 'map_field'=>1]);
-		if ($oldMember && $oldMember->member_ref == $memberRef)
-			return;
+		if ($oldMember && $oldMember->member_ref == $memberRef) {
+					return;
+		}
 		$upSql = "UPDATE `dds_member` SET `map_field`=(IF (`member_ref`='$memberRef', 1, 0)) WHERE `class_type`='$classType';";
 		$downSql = ($oldMember ? "UPDATE `dds_member` SET `map_field`=(IF (`member_ref`='{$oldMember->member_ref}', 1, 0)) WHERE `class_type`='$classType';" : null);
 		neon()->db->createCommand($upSql)->execute();
@@ -445,16 +465,18 @@ 
 	public function addDataType(&$dataTypeRef, $label, $description, $definition, $storageRef)
 	{
 		$dataTypeRef = $this->canonicaliseRef($dataTypeRef);
-		if ($this->findDataType($dataTypeRef))
-			throw new \InvalidArgumentException("The dataType $dataTypeRef already exists");
+		if ($this->findDataType($dataTypeRef)) {
+					throw new \InvalidArgumentException("The dataType $dataTypeRef already exists");
+		}
 		$dt = new DdsDataType();
 		$dt->data_type_ref = $dataTypeRef;
 		$dt->label = $label;
 		$dt->description = $description;
 		$dt->definition = $definition;
 		$dt->storage_ref = $storageRef;
-		if (!$dt->save())
-			throw new \RuntimeException("Couldn't create the datatype $dataTypeRef: ".print_r($dt->errors, true));
+		if (!$dt->save()) {
+					throw new \RuntimeException("Couldn't create the datatype $dataTypeRef: ".print_r($dt->errors, true));
+		}
 
 		// store the migration
 		$this->findDataType($dataTypeRef, $dt);
@@ -479,16 +501,18 @@ 
 	public function editDataType($dataTypeRef, $changes)
 	{
 		$allowed = array_intersect_key($changes, array_flip(['label', 'description', 'definition']));
-		if (count($allowed) == 0)
-			return;
+		if (count($allowed) == 0) {
+					return;
+		}
 		if ($this->findDataType($dataTypeRef, $dataType)) {
 			// make the updates if there is anything to change
 			$updates = array_diff($allowed, $dataType->attributes);
 			if (count($updates)) {
 				$downSql = $this->getTableRowReplaceSql('dds_data_type', $dataType);
 				$dataType->attributes = $updates;
-				if (!$dataType->save())
-					throw new \RuntimeException("Couldn't save the datatype: ".print_r($dataType->errors(),true));
+				if (!$dataType->save()) {
+									throw new \RuntimeException("Couldn't save the datatype: ".print_r($dataType->errors(),true));
+				}
 				$upSql = $this->getTableRowReplaceSql('dds_data_type', $dataType);
 				$this->storeMigration($upSql, $downSql);
 			}
@@ -552,8 +576,9 @@ 
 	private function getClassTypeMigrationSql($classType)
 	{
 		$ddsClass = DdsClass::findOne(['class_type'=>$classType]);
-		if ($ddsClass == null)
-			return null;
+		if ($ddsClass == null) {
+					return null;
+		}
 		return $this->getTableRowReplaceSql('dds_class', $ddsClass);
 	}
 
@@ -603,11 +628,13 @@ 
 				if (is_array($v)) {
 					$diff = $this->getMemberUpdateDifferences($v, $b[$k]);
 					// we want all of the array if there were any differences
-					if (count($diff))
-						$diffs[$k] = $v;
+					if (count($diff)) {
+											$diffs[$k] = $v;
+					}
 				} else {
-					if ((string)$v !== (string)$b[$k])
-						$diffs[$k] = $v;
+					if ((string)$v !== (string)$b[$k]) {
+											$diffs[$k] = $v;
+					}
 				}
 			} else {
 				$diffs[$k] = $v;
@@ -633,8 +660,9 @@ 
 			$query->andWhere(['deleted' => 0]);
 		}
 		$query->select($select);
-		if ($module != null)
-			$query->andWhere(['or', ['module' => $module], ['module' => NULL]]);
+		if ($module != null) {
+					$query->andWhere(['or', ['module' => $module], ['module' => NULL]]);
+		}
 		return $query;
 	}
 

Spacing +18 added lines, -18 removed lines

@@ -51,7 +51,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function countClasses($module=null, $includeDeleted=false)
+	public function countClasses($module = null, $includeDeleted = false)
 	{
 		$query = $this->_getClassesQuery($module, $includeDeleted);
 		return $query->count();
@@ -60,7 +60,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function listClasses($module, &$total, $includeDeleted=false, $start=0, $length=100, $orderBy='label')
+	public function listClasses($module, &$total, $includeDeleted = false, $start = 0, $length = 100, $orderBy = 'label')
 	{
 		$query = $this->_getClassesQuery($module, $includeDeleted);
 		if ($start == 0)
@@ -120,7 +120,7 @@ 
 		$c->class_type = $classType;
 		$c->module = (empty($module) ? null : $module);
 		if (!$c->save())
-			throw new \RuntimeException("Couldn't save the class: ".print_r($c->errors,true));
+			throw new \RuntimeException("Couldn't save the class: ".print_r($c->errors, true));
 		$upSql = $this->getClassTypeMigrationSql($classType);
 		$downSql = "DELETE FROM `dds_class` WHERE `class_type`='$classType';";
 		$this->storeMigration($upSql, $downSql);
@@ -131,7 +131,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function getClass($classType, $includeMembers=false)
+	public function getClass($classType, $includeMembers = false)
 	{
 		if ($this->findClass($classType, $class)) {
 			$data = $class->toArray();
@@ -148,7 +148,7 @@ 
 	public function editClass($classType, $changes)
 	{
 		$allowed = array_intersect_key($changes, array_flip(['label', 'description', 'module', 'change_log']));
-		if (count($allowed)==0)
+		if (count($allowed) == 0)
 			return;
 		$this->clearClassCache($classType);
 		$downSql = $this->getClassTypeMigrationSql($classType);
@@ -232,7 +232,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function listMembers($classType, $includeDeleted=false, $keyBy='member_ref')
+	public function listMembers($classType, $includeDeleted = false, $keyBy = 'member_ref')
 	{
 		return $this->listMembersForClass($classType, $includeDeleted, $keyBy);
 	}
@@ -240,7 +240,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function addMember($classType, &$memberRef, $dataTypeRef, $label, $description, $additional=null)
+	public function addMember($classType, &$memberRef, $dataTypeRef, $label, $description, $additional = null)
 	{
 		$classType = $this->canonicaliseRef($classType);
 		$memberRef = $this->canonicaliseRef($memberRef);
@@ -249,7 +249,7 @@ 
 			// extract out any additional information
 			$choices = ((!empty($additional['choices']) && is_array($additional['choices'])) ? $additional['choices'] : []);
 			$linkClass = (!empty($additional['link_class']) ? $additional['link_class'] : null);
-			if (DdsMember::findOne(['class_type' => $classType, 'member_ref' => $memberRef])!==null)
+			if (DdsMember::findOne(['class_type' => $classType, 'member_ref' => $memberRef]) !== null)
 				throw new \InvalidArgumentException("The member $memberRef already exists");
 			if (in_array($dataTypeRef, ['link_uni', 'link_multi']) && !$linkClass) {
 				throw new \InvalidArgumentException("Link_uni, link_multi data types require a link_class to be passed for member '$classType::$memberRef'. You passed in ".print_r($additional, true));
@@ -273,7 +273,7 @@ 
 			$mId = $this->storeMigration($upMember, $downMember);
 
 			// and create the member column
-			if (($error=$this->addClassMemberColumn($classType, $member->member_ref)) !== true) {
+			if (($error = $this->addClassMemberColumn($classType, $member->member_ref)) !== true) {
 				$member->delete();
 				$this->removeMigration($mId);
 				throw new \RuntimeException("Couldn't create the member column. Error=".$error);
@@ -286,7 +286,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function getMember($classType, $memberRef, $fields=[])
+	public function getMember($classType, $memberRef, $fields = [])
 	{
 		// !! keep member as an object so it runs all conversion code
 		$query = DdsMember::find();
@@ -308,7 +308,7 @@ 
 	{
 		// check that only allowed updates are made
 		$allowed = array_intersect_key($changes, array_flip(['label', 'description', 'definition', 'choices', 'link_class']));
-		if (count($allowed)==0)
+		if (count($allowed) == 0)
 			return;
 
 		// find the member and remove any illegitamate updates
@@ -330,7 +330,7 @@ 
 			$downSql = $this->getTableRowReplaceSql('dds_member', $member);
 			$member->attributes = $updates;
 			if (!$member->save())
-				throw new \RuntimeException("Couldn't update the member: ".print_r ($member->errors, true));
+				throw new \RuntimeException("Couldn't update the member: ".print_r($member->errors, true));
 			$upSql = $this->getTableRowReplaceSql('dds_member', $member);
 			$this->storeMigration($upSql, $downSql);
 			$this->clearClassMemberCache($classType);
@@ -363,7 +363,7 @@ 
 	public function deleteMember($classType, $memberRef)
 	{
 		// delete a member if it isn't already deleted
-		if ($this->findMember($classType, $memberRef, $member) && $member->deleted==0) {
+		if ($this->findMember($classType, $memberRef, $member) && $member->deleted == 0) {
 			$upSql = "UPDATE `dds_member` SET `deleted`=1 WHERE `class_type`='$classType' AND `member_ref`='$memberRef';";
 			$downSql = "UPDATE `dds_member` SET `deleted`=0 WHERE `class_type`='$classType' AND `member_ref`='$memberRef';";
 			neon()->db->createCommand($upSql)->execute();
@@ -378,7 +378,7 @@ 
 	public function undeleteMember($classType, $memberRef)
 	{
 		// undelete a member if it is already deleted
-		if ($this->findMember($classType, $memberRef, $member) && $member->deleted==1) {
+		if ($this->findMember($classType, $memberRef, $member) && $member->deleted == 1) {
 			// create migrations
 			$upSql = "UPDATE `dds_member` SET `deleted`=0 WHERE `class_type`='$classType' AND `member_ref`='$memberRef';";
 			$downSql = "UPDATE `dds_member` SET `deleted`=1 WHERE `class_type`='$classType' AND `member_ref`='$memberRef';";
@@ -425,7 +425,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function listDataTypes($includeDeleted=false)
+	public function listDataTypes($includeDeleted = false)
 	{
 		$query = DdsDataType::find();
 		$select = ['data_type_ref', 'label', 'description', 'definition', 'storage_ref'];
@@ -486,7 +486,7 @@ 
 				$downSql = $this->getTableRowReplaceSql('dds_data_type', $dataType);
 				$dataType->attributes = $updates;
 				if (!$dataType->save())
-					throw new \RuntimeException("Couldn't save the datatype: ".print_r($dataType->errors(),true));
+					throw new \RuntimeException("Couldn't save the datatype: ".print_r($dataType->errors(), true));
 				$upSql = $this->getTableRowReplaceSql('dds_data_type', $dataType);
 				$this->storeMigration($upSql, $downSql);
 			}
@@ -604,7 +604,7 @@ 
 					if (count($diff))
 						$diffs[$k] = $v;
 				} else {
-					if ((string)$v !== (string)$b[$k])
+					if ((string) $v !== (string) $b[$k])
 						$diffs[$k] = $v;
 				}
 			} else {
@@ -621,7 +621,7 @@ 
 	 */
 	private static $_classCache = [];
 
-	private function _getClassesQuery($module=null, $includeDeleted=false)
+	private function _getClassesQuery($module = null, $includeDeleted = false)
 	{
 		$query = DdsClass::find();
 		$select = ['class_type', 'label', 'description', 'module', 'count_total', 'count_deleted', 'change_log'];

neon/daedalus/services/ddsHelpers/DdsQueryHelpers.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 	/**
 	 * @inheritdoc
 	 */
-	public function addObjectDeletionChecksOnJoin(\yii\db\Query $query, $tables, $join='innerJoin')
+	public function addObjectDeletionChecksOnJoin(\yii\db\Query $query, $tables, $join = 'innerJoin')
 	{
 		foreach ($tables as $table) {
 			if ($join == 'innerJoin') {

neon/daedalus/plugins/smarty/function.getDdsObject.php

Braces +3 added lines, -2 removed lines

@@ -13,8 +13,9 @@
  */
 function smarty_function_getDdsObject($params, $template)
 {
-	if (!isset($params['uuid']))
-		throw new InvalidArgumentException("DdsObjectToJson - you need to pass in the 'uuid'");
+	if (!isset($params['uuid'])) {
+			throw new InvalidArgumentException("DdsObjectToJson - you need to pass in the 'uuid'");
+	}
 	$assign = !empty($params['assign']) ? $params['assign'] : 'ddsObject';
 	$asJson = isset($params['asJson']) ? $params['asJson'] : false;
 	$dds = neon('dds')->IDdsObjectManagement;

neon/daedalus/controllers/IndexController.php

Spacing +1 added lines, -1 removed lines

@@ -244,7 +244,7 @@
 			if ($count)
 				$classes = array_merge($classes, $nextSet);
 			$start += $count;
-		} while ($count>0);
+		} while ($count > 0);
 		$classesByType = array_column($classes, null, 'class_type');
 
 		// get the full definition of these

Braces +21 added lines, -14 removed lines

@@ -103,8 +103,9 @@ 
 		$form = $this->getPhoebeForm($type);
 		$object = $this->ddo()->getObject($id);
 		$form->loadFromDb($object);
-		if (neon()->request->getIsAjax())
-			return $form->ajaxValidation();
+		if (neon()->request->getIsAjax()) {
+					return $form->ajaxValidation();
+		}
 
 		if ($form->processRequest()) {
 			$this->ddo()->editObject($id, $form->getData());
@@ -128,8 +129,9 @@ 
 	public function actionDeleteObject($type, $id, $redirect = true)
 	{
 		$this->ddo()->deleteObject($id);
-		if ($redirect)
-			$this->redirect(['/daedalus/index/list', 'type' => $type]);
+		if ($redirect) {
+					$this->redirect(['/daedalus/index/list', 'type' => $type]);
+		}
 	}
 
 	/**
@@ -141,8 +143,9 @@ 
 	public function actionUndeleteObject($type, $id, $redirect = true)
 	{
 		$this->ddo()->undeleteObject($id);
-		if ($redirect)
-			$this->redirect(['/daedalus/index/list', 'type' => $type]);
+		if ($redirect) {
+					$this->redirect(['/daedalus/index/list', 'type' => $type]);
+		}
 	}
 
 	/**
@@ -154,8 +157,9 @@ 
 	public function actionDestroyObject($type, $id, $redirect = true)
 	{
 		$this->ddo()->destroyObject($id);
-		if ($redirect)
-			$this->redirect(['/daedalus/index/list', 'type' => $type]);
+		if ($redirect) {
+					$this->redirect(['/daedalus/index/list', 'type' => $type]);
+		}
 	}
 
 
@@ -170,8 +174,9 @@ 
 		while ($rows > 0) {
 			$count = min($rows, 100);
 			$data = [];
-			for ($i = 0; $i < $count; $i++)
-				$data[] = $form->fake();
+			for ($i = 0; $i < $count; $i++) {
+							$data[] = $form->fake();
+			}
 			$this->ddo()->addObjects($type, $data);
 			$rows -= $count;
 		}
@@ -281,8 +286,9 @@ 
 		do {
 			$nextSet = $ddc->listClasses(null, $total, false, $start, $length);
 			$count = count($nextSet);
-			if ($count)
-				$classes = array_merge($classes, $nextSet);
+			if ($count) {
+							$classes = array_merge($classes, $nextSet);
+			}
 			$start += $count;
 		} while ($count>0);
 		$classesByType = array_column($classes, null, 'class_type');
@@ -295,8 +301,9 @@ 
 			foreach ($class['members'] as &$member) {
 				$member['data_type'] = $dataTypeByRef[$member['data_type_ref']];
 				$member['links_to_table'] = null;
-				if ($member['link_class'] && isset($classesByType[$member['link_class']]))
-					$member['links_to_table'] = $classesByType[$member['link_class']]['label'];
+				if ($member['link_class'] && isset($classesByType[$member['link_class']])) {
+									$member['links_to_table'] = $classesByType[$member['link_class']]['label'];
+				}
 			}
 			$definitions[$c['class_type']] = $class;
 		}

neon/daedalus/controllers/common/DaedalusController.php

Braces +9 added lines, -6 removed lines

@@ -82,8 +82,9 @@ 
 	 */
 	protected function ddo()
 	{
-		if ($this->_ddo == null)
-			$this->_ddo = neon('dds')->IDdsObjectManagement;
+		if ($this->_ddo == null) {
+					$this->_ddo = neon('dds')->IDdsObjectManagement;
+		}
 		return $this->_ddo;
 	}
 
@@ -92,8 +93,9 @@ 
 	 */
 	protected function ddc()
 	{
-		if ($this->_ddc == null)
-			$this->_ddc = neon('dds')->IDdsClassManagement;
+		if ($this->_ddc == null) {
+					$this->_ddc = neon('dds')->IDdsClassManagement;
+		}
 		return $this->_ddc;
 	}
 
@@ -102,8 +104,9 @@ 
 	 */
 	protected function ddt()
 	{
-		if ($this->_ddt == null)
-			$this->_ddt = neon('dds')->IDdsDataTypeManagement;
+		if ($this->_ddt == null) {
+					$this->_ddt = neon('dds')->IDdsDataTypeManagement;
+		}
 		return $this->_ddt;
 	}
 

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 	 * @param array $options additional options for the form
 	 * @return \neon\core\form\Form
 	 */
-	protected function getPhoebeForm($type, $options=[])
+	protected function getPhoebeForm($type, $options = [])
 	{
 		return neon()->phoebe->getForm('daedalus', $type, $options);
 	}