newicon / neon

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/DdsObjectManager.php

Spacing +60 added lines, -60 removed lines

@@ -31,14 +31,14 @@ 
 	 * requests to the database within one call
 	 * @var array
 	 */
-	private static $_requestResultsCache=[];
-	private static $_linkResultsCache=[];
-	private static $_mapResultsCache=[];
+	private static $_requestResultsCache = [];
+	private static $_linkResultsCache = [];
+	private static $_mapResultsCache = [];
 
 	/**
 	 * @inheritdoc
 	 */
-	public function addObjectRequest($classType, array $filters=[], array $order=[], array $limit=[], $resultKey=null, $includeDeleted=false)
+	public function addObjectRequest($classType, array $filters = [], array $order = [], array $limit = [], $resultKey = null, $includeDeleted = false)
 	{
 		// protect ourselves against SQL injection by making sure all
 		// items are canonicalised as required (and use of PDO later)
@@ -105,7 +105,7 @@ 
 					$data[$k] = self::$_requestResultsCache[$r['requestKey']];
 				} else {
 					// set null result information about the request
-					$newData[$k] = ['start'=>$r['limit']['start'],'length'=>0,'total'=>$r['total'],'rows'=>[]];
+					$newData[$k] = ['start'=>$r['limit']['start'], 'length'=>0, 'total'=>$r['total'], 'rows'=>[]];
 					$sql[] = $r['sql'];
 					if ($r['totalSql'])
 						$sql[] = $r['totalSql'];
@@ -165,7 +165,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function runSingleObjectRequest($classType, array $filters=[], array $order=[], array $limit=[], $includeDeleted = false)
+	public function runSingleObjectRequest($classType, array $filters = [], array $order = [], array $limit = [], $includeDeleted = false)
 	{
 		if (empty($classType))
 			throw new \InvalidArgumentException('ClassType must be specified');
@@ -189,7 +189,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)
 	{
 		return $this->getObjectMapManager()->getObjectMap($classType, $filters, $fields, $start, $length, $includeDeleted);
 	}
@@ -197,7 +197,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function makeMapLookupRequest($objectUuids, $mapFields=[], $classType=null)
+	public function makeMapLookupRequest($objectUuids, $mapFields = [], $classType = null)
 	{
 		return $this->getObjectMapManager()->makeMapLookupRequest($objectUuids, $mapFields, $classType);
 	}
@@ -205,7 +205,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function makeMapChainLookupRequest($objectUuids, $chainMembers=[], $chainMapFields=[], $inReverse=false)
+	public function makeMapChainLookupRequest($objectUuids, $chainMembers = [], $chainMapFields = [], $inReverse = false)
 	{
 		return $this->getObjectMapManager()->makeMapChainLookupRequest($objectUuids, $chainMembers, $chainMapFields, $inReverse);
 	}
@@ -248,7 +248,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function listObjects($classType, &$total=null, $includeDeleted=false, $inFull=true, $start=0, $length=100, $order=null)
+	public function listObjects($classType, &$total = null, $includeDeleted = false, $inFull = true, $start = 0, $length = 100, $order = null)
 	{
 		$classType = $this->canonicaliseRef($classType);
 		if (empty($order))
@@ -280,14 +280,14 @@ 
 		if (is_array($order)) {
 			$orderBits = [];
 			foreach ($order as $k=>$d) {
-				if ($k[1]=='o') {
+				if ($k[1] == 'o') {
 					$orderBits[] = "$k $d";
 				} else if ($inFull) {
 					$orderBits[] = "[[t]].$k $d";
 				}
 			}
 			if ($orderBits)
-				$orderClause = implode(', ',$orderBits);
+				$orderClause = implode(', ', $orderBits);
 			$query->orderBy($orderClause);
 		}
 
@@ -299,7 +299,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function addObject($classType, array $data, &$changeLogUuid=null)
+	public function addObject($classType, array $data, &$changeLogUuid = null)
 	{
 		$class = null;
 		$classType = $this->canonicaliseRef($classType);
@@ -317,7 +317,7 @@ 
 		$object->_created = $now;
 		$object->_updated = $now;
 		if (!$object->save())
-			throw new \RuntimeException("Couldn't create object: ".print_r($object->errors,true));
+			throw new \RuntimeException("Couldn't create object: ".print_r($object->errors, true));
 
 		// increment the class's object count
 		$class->count_total += 1;
@@ -333,7 +333,7 @@ 
 			$values = [];
 			foreach (array_keys($memberStorage) as $memRef) {
 				// save all non-empty fields.
-				if (array_key_exists($memRef, $data) && $data[$memRef]!==null && $data[$memRef]!=='') {
+				if (array_key_exists($memRef, $data) && $data[$memRef] !== null && $data[$memRef] !== '') {
 					$fields[] = "`$memRef`";
 					$inserts[] = ":v$count";
 					$values[":v$count"] = $data[$memRef];
@@ -342,7 +342,7 @@ 
 			}
 
 			if (count($fields))
-				$query = "INSERT INTO `$table` (`_uuid`, ".implode(', ',$fields).") VALUES ('{$object->_uuid}', ".implode(', ', $inserts).")";
+				$query = "INSERT INTO `$table` (`_uuid`, ".implode(', ', $fields).") VALUES ('{$object->_uuid}', ".implode(', ', $inserts).")";
 			else
 				$query = "INSERT INTO `$table` (`_uuid`) VALUES ('{$object->_uuid}')";
 			$command = neon()->db->createCommand($query);
@@ -370,7 +370,7 @@ 
 	 *
 	 * @inheritdoc
 	 */
-	public function addObjects($classType, array $data, $chunkSize=1000)
+	public function addObjects($classType, array $data, $chunkSize = 1000)
 	{
 		$classType = $this->canonicaliseRef($classType);
 		$class = null;
@@ -388,7 +388,7 @@ 
 		$columns[] = '_uuid';
 		$nullRow['_uuid'] = null;
 
-		foreach(array_chunk($data, $chunkSize) as $chunkData) {
+		foreach (array_chunk($data, $chunkSize) as $chunkData) {
 			$rows = [];
 			$objectDbRows = [];
 			$objectsLinks = [];
@@ -411,7 +411,7 @@ 
 			neon()->db->createCommand()->batchInsert(DdsObject::tableName(), ['_uuid', '_class_type', '_created', '_updated'], $objectDbRows)->execute();
 			neon()->db->createCommand()->batchInsert($table, $columns, $rows)->execute();
 
-			foreach($objectsLinks as $uuid => $links) {
+			foreach ($objectsLinks as $uuid => $links) {
 				// if there are any links then add these to the link table
 				//
 				// TODO - make this a bulk insert across all data
@@ -435,7 +435,7 @@ 
 			$table = $this->getTableFromClassType($object->_class_type);
 			$query = "SELECT `o`.*, `t`.* FROM `dds_object` `o` LEFT JOIN  `$table` `t` ON `o`.`_uuid`=`t`.`_uuid` WHERE `o`.`_uuid`=:uuid LIMIT 1";
 			$rows = neon()->db->createCommand($query)->bindValue(':uuid', $uuid)->queryAll();
-			$row =  count($rows) > 0 ? $rows[0] : null;
+			$row = count($rows) > 0 ? $rows[0] : null;
 			$this->convertFromDBToPHP($row, $this->getMemberLinks($uuid));
 			return $row;
 		}
@@ -445,10 +445,10 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function editObject($uuid, array $changes, &$changeLogUuid=null)
+	public function editObject($uuid, array $changes, &$changeLogUuid = null)
 	{
 		// check there are some changes to make
-		if (count($changes)==0)
+		if (count($changes) == 0)
 			return false;
 
 		// check that the object exists and find its class type
@@ -493,10 +493,10 @@ 
 					}
 				}
 			}
-			if (count($updates)==0)
+			if (count($updates) == 0)
 				return false;
 
-			$query = "UPDATE `$table` SET ".implode(', ',$updates)." WHERE `_uuid`='$uuid' LIMIT 1";
+			$query = "UPDATE `$table` SET ".implode(', ', $updates)." WHERE `_uuid`='$uuid' LIMIT 1";
 			neon()->db->createCommand($query)->bindValues($values)->execute();
 
 			// add or remove any links from the linking table
@@ -521,15 +521,15 @@ 
 	 */
 	public function editObjects($classType, array $uuids, array $changes)
 	{
-		if (count($uuids)==0 || count($changes)==0)
+		if (count($uuids) == 0 || count($changes) == 0)
 			return false;
 		try {
 			$uuids = $this->checkUuidsAgainstClassType($uuids, $classType);
-			if (count($uuids)==0)
+			if (count($uuids) == 0)
 				return false;
 			$table = $this->getTableFromClassType($classType);
 			$memberStorage = $this->getMemberStorage($classType);
-			if (count($memberStorage)==0) {
+			if (count($memberStorage) == 0) {
 				throw new \InvalidArgumentException('Unknown or empty class type '.$classType);
 			}
 
@@ -560,7 +560,7 @@ 
 					}
 				}
 			}
-			if (count($updates)==0)
+			if (count($updates) == 0)
 				return false;
 
 			// sort out the uuid clause for both the update on the table and in the object table
@@ -580,7 +580,7 @@ 
 			$query = "UPDATE `dds_object` SET `_updated`=NOW() WHERE `_uuid` IN $uuidClause LIMIT ".count($uuids);
 			$db->createCommand($query)->bindValues($objectValues)->execute();
 			// make the changes
-			$query = "UPDATE `$table` SET ".implode(', ',$updates)." WHERE `_uuid` IN $uuidClause LIMIT ".count($uuids);
+			$query = "UPDATE `$table` SET ".implode(', ', $updates)." WHERE `_uuid` IN $uuidClause LIMIT ".count($uuids);
 			$db->createCommand($query)->bindValues($values)->execute();
 
 			//
@@ -604,11 +604,11 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function deleteObject($uuid, &$changeLogUuid=null)
+	public function deleteObject($uuid, &$changeLogUuid = null)
 	{
 		$object = null;
 		// find the object and delete if it hasn't already been
-		if ($this->getObjectFromId($uuid, $object) && $object->_deleted==0) {
+		if ($this->getObjectFromId($uuid, $object) && $object->_deleted == 0) {
 			$object->_deleted = 1;
 			$object->_updated = date('Y-m-d H:i:s');
 			if (!$object->save())
@@ -642,7 +642,7 @@ 
 	public function deleteObjects(array $uuids)
 	{
 		$objects = $this->getObjectRowsFromIds($uuids);
-		if (count($objects)==0)
+		if (count($objects) == 0)
 			return;
 
 		$foundUuids = [];
@@ -680,11 +680,11 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function undeleteObject($uuid, &$changeLogUuid=null)
+	public function undeleteObject($uuid, &$changeLogUuid = null)
 	{
 		$object = null;
 		// find the object and delete if it hasn't already been
-		if ($this->getObjectFromId($uuid, $object) && $object->_deleted==1) {
+		if ($this->getObjectFromId($uuid, $object) && $object->_deleted == 1) {
 			$object->_deleted = 0;
 			$object->_updated = date('Y-m-d H:i:s');
 			if (!$object->save())
@@ -693,7 +693,7 @@ 
 			// and update the class object deleted count
 			$class = null;
 			if ($this->findClass($object['_class_type'], $class)) {
-				$class->count_deleted = max(0, $class->count_deleted-1);
+				$class->count_deleted = max(0, $class->count_deleted - 1);
 				$class->save();
 
 				// see if we need to store the change log
@@ -707,7 +707,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function destroyObject($uuid, &$changeLogUuid=null)
+	public function destroyObject($uuid, &$changeLogUuid = null)
 	{
 		$object = null;
 		if ($this->getObjectFromId($uuid, $object)) {
@@ -729,9 +729,9 @@ 
 
 			// then if ok, decrement the class's object counts
 			if ($class) {
-				$class->count_total = max(0, $class->count_total-1);
+				$class->count_total = max(0, $class->count_total - 1);
 				if ($object['_deleted'] == 1)
-					$class->count_deleted = max(0, $class->count_deleted-1);
+					$class->count_deleted = max(0, $class->count_deleted - 1);
 				$class->save();
 			}
 
@@ -752,7 +752,7 @@ 
 	public function destroyObjects(array $uuids)
 	{
 		$objects = $this->getObjectRowsFromIds($uuids);
-		if (count($objects)==0)
+		if (count($objects) == 0)
 			return;
 
 		$objectUuids = [];
@@ -787,9 +787,9 @@ 
 
 			// decrement the class's object counts
 			if ($class) {
-				$class->count_total = max(0, $class->count_total-count($uuids));
+				$class->count_total = max(0, $class->count_total - count($uuids));
 				if (isset($objectsDeleted[$classType]))
-					$class->count_deleted = max(0, $class->count_deleted-count($objectsDeleted[$classType]));
+					$class->count_deleted = max(0, $class->count_deleted - count($objectsDeleted[$classType]));
 				$class->save();
 			}
 		}
@@ -827,7 +827,7 @@ 
 	 * @param [] &$dataSet  [n]=>$rows  rows of requested data
 	 * @param string $classTypeKey the key in the data that will give the class type
 	 */
-	private function convertResultsToPHP(&$dataSet, $links=null, $classTypeKey='_class_type')
+	private function convertResultsToPHP(&$dataSet, $links = null, $classTypeKey = '_class_type')
 	{
 		// if we haven't been provided any multilinks (even if empty array)
 		// then see if there are any multilinks to extract
@@ -850,7 +850,7 @@ 
 	 * @param DdsObject &$object  the returned object
 	 * @return boolean  whether or not object found
 	 */
-	private function getObjectFromId($uuid, &$object=null)
+	private function getObjectFromId($uuid, &$object = null)
 	{
 		$object = DdsObject::find()->noCache()->where(['_uuid' => $uuid])->one();
 		return ($object !== null);
@@ -899,13 +899,13 @@ 
 	 * @param string $resultKey  if provided use this else create one
 	 * @return string  return the resultKey
 	 */
-	private function createSqlAndStoreRequest(array $request, $resultKey=null)
+	private function createSqlAndStoreRequest(array $request, $resultKey = null)
 	{
 		// track number of calls to function to generate unique wthin one php request per call and per request result keys
-		static $counter = 0; $counter ++;
+		static $counter = 0; $counter++;
 		// a randomly generated resultKey prevents db query chaching.
 		$resultKey = $resultKey ? $resultKey : $request['requestKey'].'_'.$counter;
-		$request['resultKey' ] = $resultKey;
+		$request['resultKey'] = $resultKey;
 		if (!array_key_exists($request['requestKey'], self::$_requestResultsCache))
 			$this->convertRequestToSql($request);
 		// store the request
@@ -963,7 +963,7 @@ 
 	private function convertRequestToSql(&$request)
 	{
 		$table = $this->getTableFromClassType($request['classType']);
-		$links = array_keys($this->getClassMembers($request['classType'], ['link_multi','file_ref_multi']));
+		$links = array_keys($this->getClassMembers($request['classType'], ['link_multi', 'file_ref_multi']));
 		$where = $this->extractWhereClause($request['filters'], $request['deleted'], $links, $filterKeys);
 		$join  = $this->extractJoinClause($links, $filterKeys);
 		$order = $this->extractOrderClause($request['order']);
@@ -1002,7 +1002,7 @@ 
 	{
 		$filterKeys = [];
 		$notDeleted = '`o`.`_deleted`=0';
-		if (count($filters)==0)
+		if (count($filters) == 0)
 			return $includeDeleted ? '' : "WHERE $notDeleted";
 		$this->createFilterClause($filters, $links, $filterKeys);
 		if (!$includeDeleted)
@@ -1087,7 +1087,7 @@ 
 		// Start creating the sql. $filters[0,1] will have been canonicalised, $filters[2] is protected using PDO
 		// Not all queries have a [2] though so should be just the operator (e.g. IS NULL)
 		//
-		$filter = (in_array($filters[0], $links) ? "`link_{$filters[0]}`.`to_id`": $this->quoteField($filters[0]));
+		$filter = (in_array($filters[0], $links) ? "`link_{$filters[0]}`.`to_id`" : $this->quoteField($filters[0]));
 		$filterKeys[$filters[0]] = $filters[0];
 		if ($this->operatorTakesObject($filters[1]) && isset($filters[2]))
 			$filters['itemSql'] = $filters['sql'] = "$filter ".$this->prepareForPDO($filters[1], $filters[2]);
@@ -1100,11 +1100,11 @@ 
 	{
 		if (is_array($value)) {
 			$pdoValues = [];
-			if (!in_array($operator, ['=','!=','IN','NOT IN']))
+			if (!in_array($operator, ['=', '!=', 'IN', 'NOT IN']))
 				throw new \InvalidArgumentException("Daedalus: Cannot pass an *array* of values with an operator of $operator");
 			foreach ($value as $v) {
 				if (is_array($v))
-					throw new \InvalidArgumentException("Daedalus: Cannot pass an *array* of *array* of values as filters (silly billy). You passed ".print_r($value,true));
+					throw new \InvalidArgumentException("Daedalus: Cannot pass an *array* of *array* of values as filters (silly billy). You passed ".print_r($value, true));
 				$count = count($this->boundValues);
 				$variable = ":var{$count}end";
 				$this->boundValues[$variable] = $v;
@@ -1115,11 +1115,11 @@ 
 				$operator = 'IN';
 			if ($operator == '!=')
 				$operator = 'NOT IN';
-			return "$operator (".implode(',',$pdoValues).')';
+			return "$operator (".implode(',', $pdoValues).')';
 		} else {
 			$count = count($this->boundValues);
 			$variable = ":var{$count}end";
-			if (strpos(strtolower($operator), 'like')!==false) {
+			if (strpos(strtolower($operator), 'like') !== false) {
 				$this->boundValues[$variable] = "%$value%";
 				return "$operator $variable";
 			} else if (strpos(strtolower($operator), 'null') !== false) {
@@ -1138,7 +1138,7 @@ 
 	 */
 	private function extractOrderClause($order)
 	{
-		if (count($order)==0)
+		if (count($order) == 0)
 			return '';
 		$clause = [];
 		foreach ($order as $o => $d) {
@@ -1148,12 +1148,12 @@ 
 				break;
 			}
 			// allow negative ordering in mysql for nulls last
-			if (strpos($o, '-')===0)
+			if (strpos($o, '-') === 0)
 				$clause[] = '-'.substr($o, 1)." $d";
 			else
 				$clause[] = "$o $d";
 		}
-		return 'ORDER BY '.implode(', ',$clause);
+		return 'ORDER BY '.implode(', ', $clause);
 	}
 
 	/**
@@ -1163,7 +1163,7 @@ 
 	 */
 	private function extractLimitClause($limit)
 	{
-		if (count($limit)==0)
+		if (count($limit) == 0)
 			return '';
 		return "LIMIT $limit[start], $limit[length]";
 	}
@@ -1187,7 +1187,7 @@ 
 			if (!is_array($toLinks))
 				$toLinks = [$toLinks];
 			if (!$this->areUUIDs($toLinks))
-				throw new \InvalidArgumentException("The toMemberLinks should be UUID64s. You passed in ".print_r($toLinks,true));
+				throw new \InvalidArgumentException("The toMemberLinks should be UUID64s. You passed in ".print_r($toLinks, true));
 			array_unique($toLinks);
 
 			//
@@ -1207,7 +1207,7 @@ 
 				$batchInsert[] = ['from_id'=>$fromLink, 'from_member'=>$member, 'to_id'=>$toLink];
 			$memberCount = 0;
 			if (count($batchInsert))
-				$memberCount = neon()->db->createCommand()->batchInsert('{{%dds_link}}', ['from_id','from_member','to_id'], $batchInsert)->execute();
+				$memberCount = neon()->db->createCommand()->batchInsert('{{%dds_link}}', ['from_id', 'from_member', 'to_id'], $batchInsert)->execute();
 			if (YII_DEBUG && $memberCount !== $batchCount)
 				throw new Exception("The link insertion failed for member $member - $batchCount items should have been inserted vs $memberCount actual");
 			$count += $memberCount;
@@ -1264,7 +1264,7 @@ 
 	 * @param array $changes  what the changes are
 	 * @return string  the uuid of the log entry
 	 */
-	private function createChangeLogEntry($class, $changeKey, $objectUuid, $originalValues=[], $newValues=[])
+	private function createChangeLogEntry($class, $changeKey, $objectUuid, $originalValues = [], $newValues = [])
 	{
 		static $changeLog = null;
 		if (!$changeLog)

Braces +203 added lines, -140 removed lines

@@ -107,8 +107,9 @@ 
 					// set null result information about the request
 					$newData[$k] = ['start'=>$r['limit']['start'],'length'=>0,'total'=>$r['total'],'rows'=>[]];
 					$sql[] = $r['sql'];
-					if ($r['totalSql'])
-						$sql[] = $r['totalSql'];
+					if ($r['totalSql']) {
+											$sql[] = $r['totalSql'];
+					}
 					$resultKey2RequestKey[$r['resultKey']] = $r['requestKey'];
 				}
 			}
@@ -167,8 +168,9 @@ 
 	 */
 	public function runSingleObjectRequest($classType, array $filters=[], array $order=[], array $limit=[], $includeDeleted = false)
 	{
-		if (empty($classType))
-			throw new \InvalidArgumentException('ClassType must be specified');
+		if (empty($classType)) {
+					throw new \InvalidArgumentException('ClassType must be specified');
+		}
 
 		// make sure that any currently queued requests from elsewhere are saved off the queue
 		$currentRequests = $this->popRequests();
@@ -251,16 +253,18 @@ 
 	public function listObjects($classType, &$total=null, $includeDeleted=false, $inFull=true, $start=0, $length=100, $order=null)
 	{
 		$classType = $this->canonicaliseRef($classType);
-		if (empty($order))
-			$order = ['_created'=>'DESC'];
+		if (empty($order)) {
+					$order = ['_created'=>'DESC'];
+		}
 		$order = $this->canonicaliseOrder($order);
 
 		// get the total first
 		$class = null;
 		$this->findClass($classType, $class, true);
 		$total = $class->count_total;
-		if (!$includeDeleted)
-			$total -= $class->count_deleted;
+		if (!$includeDeleted) {
+					$total -= $class->count_deleted;
+		}
 
 		// now get the objects
 		$query = (new \neon\core\db\Query)
@@ -270,8 +274,9 @@ 
 			->offset($start)
 			->limit($length);
 
-		if (!$includeDeleted)
-			$query->andWhere('[[o]].[[_deleted]] = 0');
+		if (!$includeDeleted) {
+					$query->andWhere('[[o]].[[_deleted]] = 0');
+		}
 		if ($inFull) {
 			$tableName = $this->getTableFromClassType($classType);
 			$query->innerJoin('{{'.$tableName.'}} t', '[[o]].[[_uuid]]=[[t]].[[_uuid]]');
@@ -286,8 +291,9 @@ 
 					$orderBits[] = "[[t]].$k $d";
 				}
 			}
-			if ($orderBits)
-				$orderClause = implode(', ',$orderBits);
+			if ($orderBits) {
+							$orderClause = implode(', ',$orderBits);
+			}
 			$query->orderBy($orderClause);
 		}
 
@@ -304,8 +310,9 @@ 
 		$class = null;
 		$classType = $this->canonicaliseRef($classType);
 		$this->findClass($classType, $class, true);
-		if ($class->hasChangeLog())
-			$newValues = $data;
+		if ($class->hasChangeLog()) {
+					$newValues = $data;
+		}
 		$table = $this->getTableFromClassType($classType);
 
 		// create the new object
@@ -316,8 +323,9 @@ 
 		$object->_class_type = $classType;
 		$object->_created = $now;
 		$object->_updated = $now;
-		if (!$object->save())
-			throw new \RuntimeException("Couldn't create object: ".print_r($object->errors,true));
+		if (!$object->save()) {
+					throw new \RuntimeException("Couldn't create object: ".print_r($object->errors,true));
+		}
 
 		// increment the class's object count
 		$class->count_total += 1;
@@ -341,10 +349,11 @@ 
 				}
 			}
 
-			if (count($fields))
-				$query = "INSERT INTO `$table` (`_uuid`, ".implode(', ',$fields).") VALUES ('{$object->_uuid}', ".implode(', ', $inserts).")";
-			else
-				$query = "INSERT INTO `$table` (`_uuid`) VALUES ('{$object->_uuid}')";
+			if (count($fields)) {
+							$query = "INSERT INTO `$table` (`_uuid`, ".implode(', ',$fields).") VALUES ('{$object->_uuid}', ".implode(', ', $inserts).")";
+			} else {
+							$query = "INSERT INTO `$table` (`_uuid`) VALUES ('{$object->_uuid}')";
+			}
 			$command = neon()->db->createCommand($query);
 			$command->bindValues($values);
 			$command->execute();
@@ -352,8 +361,9 @@ 
 			// if there are any links then add these to the link table
 			$this->setMemberLinks($object->_uuid, $links);
 
-			if ($class->hasChangeLog())
-				$changeLogUuid = $this->createChangeLogEntry($class, 'ADD', $object->_uuid, [], $newValues);
+			if ($class->hasChangeLog()) {
+							$changeLogUuid = $this->createChangeLogEntry($class, 'ADD', $object->_uuid, [], $newValues);
+			}
 		} catch (\Exception $e) {
 			// execution failed so clean up the object
 			$object->delete();
@@ -394,8 +404,9 @@ 
 			$objectsLinks = [];
 			$now = date('Y-m-d H:i:s');
 			foreach ($chunkData as $row) {
-				if ($class->hasChangeLog())
-					$newValues = $row;
+				if ($class->hasChangeLog()) {
+									$newValues = $row;
+				}
 				// ddt table value - format row data and append the uuid
 				$this->convertFromPHPToDB($classType, $row, $links);
 				$uuid = (!empty($row['_uuid']) && $this->isUUID($row['_uuid'])) ? $row['_uuid'] : $this->generateUUID();
@@ -405,8 +416,9 @@ 
 				// object table row value
 				$objectDbRows[] = [$row['_uuid'], $classType, $now, $now];
 				$objectsLinks[$row['_uuid']] = $links;
-				if ($class->hasChangeLog())
-					$this->createChangeLogEntry($class, 'ADD', $uuid, [], $newValues);
+				if ($class->hasChangeLog()) {
+									$this->createChangeLogEntry($class, 'ADD', $uuid, [], $newValues);
+				}
 			}
 			neon()->db->createCommand()->batchInsert(DdsObject::tableName(), ['_uuid', '_class_type', '_created', '_updated'], $objectDbRows)->execute();
 			neon()->db->createCommand()->batchInsert($table, $columns, $rows)->execute();
@@ -448,20 +460,23 @@ 
 	public function editObject($uuid, array $changes, &$changeLogUuid=null)
 	{
 		// check there are some changes to make
-		if (count($changes)==0)
-			return false;
+		if (count($changes)==0) {
+					return false;
+		}
 
 		// check that the object exists and find its class type
-		if (!$this->getObjectFromId($uuid, $object))
-			throw new \InvalidArgumentException("Couldn't edit object with id $uuid as not found");
+		if (!$this->getObjectFromId($uuid, $object)) {
+					throw new \InvalidArgumentException("Couldn't edit object with id $uuid as not found");
+		}
 
 		// see if we need to store the change log
 		$class = null;
 		$this->findClass($object['_class_type'], $class);
 
 		$object->_updated = date('Y-m-d H:i:s');
-		if (!$object->save())
-			return $object->errors;
+		if (!$object->save()) {
+					return $object->errors;
+		}
 
 		// now update any member changes
 		try {
@@ -493,8 +508,9 @@ 
 					}
 				}
 			}
-			if (count($updates)==0)
-				return false;
+			if (count($updates)==0) {
+							return false;
+			}
 
 			$query = "UPDATE `$table` SET ".implode(', ',$updates)." WHERE `_uuid`='$uuid' LIMIT 1";
 			neon()->db->createCommand($query)->bindValues($values)->execute();
@@ -503,8 +519,9 @@ 
 			$this->setMemberLinks($object->_uuid, $links);
 
 			// finally note the changes in the change log
-			if ($class && $class->hasChangeLog())
-				$changeLogUuid = $this->createChangeLogEntry($class, 'EDIT', $uuid, $originalValues, $newValues);
+			if ($class && $class->hasChangeLog()) {
+							$changeLogUuid = $this->createChangeLogEntry($class, 'EDIT', $uuid, $originalValues, $newValues);
+			}
 
 		} catch (\yii\db\exception $e) {
 			$this->clearCaches();
@@ -521,12 +538,14 @@ 
 	 */
 	public function editObjects($classType, array $uuids, array $changes)
 	{
-		if (count($uuids)==0 || count($changes)==0)
-			return false;
+		if (count($uuids)==0 || count($changes)==0) {
+					return false;
+		}
 		try {
 			$uuids = $this->checkUuidsAgainstClassType($uuids, $classType);
-			if (count($uuids)==0)
-				return false;
+			if (count($uuids)==0) {
+							return false;
+			}
 			$table = $this->getTableFromClassType($classType);
 			$memberStorage = $this->getMemberStorage($classType);
 			if (count($memberStorage)==0) {
@@ -537,8 +556,9 @@ 
 			$class = null;
 			$this->findClass($classType, $class);
 			if ($class && $class->hasChangeLog()) {
-				foreach ($uuids as $uuid)
-					$beforeValues[$uuid] = array_intersect_key($this->getObject($uuid), $changes);
+				foreach ($uuids as $uuid) {
+									$beforeValues[$uuid] = array_intersect_key($this->getObject($uuid), $changes);
+				}
 				$newValues = $changes;
 			}
 
@@ -560,8 +580,9 @@ 
 					}
 				}
 			}
-			if (count($updates)==0)
-				return false;
+			if (count($updates)==0) {
+							return false;
+			}
 
 			// sort out the uuid clause for both the update on the table and in the object table
 			$uuidClause = [];
@@ -589,8 +610,9 @@ 
 
 			// and save entries into a change log
 			if ($class && $class->hasChangeLog()) {
-				foreach ($beforeValues as $uuid=>$before)
-					$this->createChangeLogEntry($class, 'EDIT', $uuid, $before, $newValues);
+				foreach ($beforeValues as $uuid=>$before) {
+									$this->createChangeLogEntry($class, 'EDIT', $uuid, $before, $newValues);
+				}
 			}
 
 		} catch (\yii\db\exception $e) {
@@ -611,8 +633,9 @@ 
 		if ($this->getObjectFromId($uuid, $object) && $object->_deleted==0) {
 			$object->_deleted = 1;
 			$object->_updated = date('Y-m-d H:i:s');
-			if (!$object->save())
-				throw new \RuntimeException("Couldn't delete the object: ".print_r($object->errors, true));
+			if (!$object->save()) {
+							throw new \RuntimeException("Couldn't delete the object: ".print_r($object->errors, true));
+			}
 			// and update the class object deleted count
 			$class = null;
 			$this->findClass($object['_class_type'], $class);
@@ -620,8 +643,9 @@ 
 			$class->save();
 
 			// see if we need to store the change log
-			if ($class && $class->hasChangeLog())
-				$changeLogUuid = $this->createChangeLogEntry($class, 'DELETE', $uuid);
+			if ($class && $class->hasChangeLog()) {
+							$changeLogUuid = $this->createChangeLogEntry($class, 'DELETE', $uuid);
+			}
 
 			// ---- KEEP ME ----
 			// on't delete the links so any that haven't been deleted between
@@ -642,8 +666,9 @@ 
 	public function deleteObjects(array $uuids)
 	{
 		$objects = $this->getObjectRowsFromIds($uuids);
-		if (count($objects)==0)
-			return;
+		if (count($objects)==0) {
+					return;
+		}
 
 		$foundUuids = [];
 		$foundClasses = [];
@@ -660,8 +685,9 @@ 
 				$deletedUuids[$classType][$obj['_uuid']] = $obj['_uuid'];
 			}
 		}
-		if (count($foundUuids))
-			DdsObject::updateAll(['_deleted'=>1, '_updated'=>date('Y-m-d H:i:s')], ['_uuid'=>$foundUuids]);
+		if (count($foundUuids)) {
+					DdsObject::updateAll(['_deleted'=>1, '_updated'=>date('Y-m-d H:i:s')], ['_uuid'=>$foundUuids]);
+		}
 		foreach ($foundClasses as $type=>$count) {
 			$class = null;
 			if ($this->findClass($type, $class)) {
@@ -669,8 +695,9 @@ 
 				$class->save();
 				// TODO 20200107 Make a bulk call for change log entries
 				if ($class->hasChangeLog()) {
-					foreach ($deletedUuids[$class->class_type] as $objUuid)
-						$this->createChangeLogEntry($class, 'DELETE', $objUuid);
+					foreach ($deletedUuids[$class->class_type] as $objUuid) {
+											$this->createChangeLogEntry($class, 'DELETE', $objUuid);
+					}
 				}
 			}
 		}
@@ -687,8 +714,9 @@ 
 		if ($this->getObjectFromId($uuid, $object) && $object->_deleted==1) {
 			$object->_deleted = 0;
 			$object->_updated = date('Y-m-d H:i:s');
-			if (!$object->save())
-				throw new \RuntimeException("Couldn't undelete the object: ".print_r($object->errors, true));
+			if (!$object->save()) {
+							throw new \RuntimeException("Couldn't undelete the object: ".print_r($object->errors, true));
+			}
 
 			// and update the class object deleted count
 			$class = null;
@@ -697,8 +725,9 @@ 
 				$class->save();
 
 				// see if we need to store the change log
-				if ($class->hasChangeLog())
-					$changeLogUuid = $this->createChangeLogEntry($class, 'UNDELETE', $uuid);
+				if ($class->hasChangeLog()) {
+									$changeLogUuid = $this->createChangeLogEntry($class, 'UNDELETE', $uuid);
+				}
 			}
 			$this->clearCaches();
 		}
@@ -713,8 +742,9 @@ 
 		if ($this->getObjectFromId($uuid, $object)) {
 			$class = null;
 			$this->findClass($object['_class_type'], $class);
-			if ($class && $class->hasChangeLog())
-				$originalValues = $this->getObject($uuid);
+			if ($class && $class->hasChangeLog()) {
+							$originalValues = $this->getObject($uuid);
+			}
 
 			// delete any object table data
 			$table = $this->getTableFromClassType($object['_class_type']);
@@ -730,8 +760,9 @@ 
 			// then if ok, decrement the class's object counts
 			if ($class) {
 				$class->count_total = max(0, $class->count_total-1);
-				if ($object['_deleted'] == 1)
-					$class->count_deleted = max(0, $class->count_deleted-1);
+				if ($object['_deleted'] == 1) {
+									$class->count_deleted = max(0, $class->count_deleted-1);
+				}
 				$class->save();
 			}
 
@@ -739,8 +770,9 @@ 
 			DdsLink::deleteAll(['or', ['from_id'=>$uuid], ['to_id'=>$uuid]]);
 
 			// and note this is in the change log
-			if ($class && $class->hasChangeLog())
-				$changeLogUuid = $this->createChangeLogEntry($class, 'DESTROY', $uuid, $originalValues);
+			if ($class && $class->hasChangeLog()) {
+							$changeLogUuid = $this->createChangeLogEntry($class, 'DESTROY', $uuid, $originalValues);
+			}
 
 			$this->clearCaches();
 		}
@@ -752,16 +784,18 @@ 
 	public function destroyObjects(array $uuids)
 	{
 		$objects = $this->getObjectRowsFromIds($uuids);
-		if (count($objects)==0)
-			return;
+		if (count($objects)==0) {
+					return;
+		}
 
 		$objectUuids = [];
 		$objectsDeleted = [];
 		$classUuids = [];
 		foreach ($objects as $obj) {
 			$objectUuids[$obj['_uuid']] = $obj['_uuid'];
-			if ($obj['_deleted'] == 1)
-				$objectsDeleted[$obj['_class_type']][$obj['_uuid']] = $obj['_uuid'];
+			if ($obj['_deleted'] == 1) {
+							$objectsDeleted[$obj['_class_type']][$obj['_uuid']] = $obj['_uuid'];
+			}
 			$classUuids[$obj['_class_type']][] = $obj['_uuid'];
 		}
 
@@ -788,8 +822,9 @@ 
 			// decrement the class's object counts
 			if ($class) {
 				$class->count_total = max(0, $class->count_total-count($uuids));
-				if (isset($objectsDeleted[$classType]))
-					$class->count_deleted = max(0, $class->count_deleted-count($objectsDeleted[$classType]));
+				if (isset($objectsDeleted[$classType])) {
+									$class->count_deleted = max(0, $class->count_deleted-count($objectsDeleted[$classType]));
+				}
 				$class->save();
 			}
 		}
@@ -817,8 +852,9 @@ 
 	 */
 	private function getObjectMapManager()
 	{
-		if (!$this->_objectMapManager)
-			$this->_objectMapManager = new DdsObjectMapManager;
+		if (!$this->_objectMapManager) {
+					$this->_objectMapManager = new DdsObjectMapManager;
+		}
 		return $this->_objectMapManager;
 	}
 
@@ -833,14 +869,16 @@ 
 		// then see if there are any multilinks to extract
 		if ($links === null) {
 			$objectIds = [];
-			foreach ($dataSet as $row)
-				$objectIds[] = $row['_uuid'];
+			foreach ($dataSet as $row) {
+							$objectIds[] = $row['_uuid'];
+			}
 			$links = $this->getMembersLinks($objectIds);
 		}
 		foreach ($dataSet as &$data) {
 			// convert full rows to database. Totals are left untouched
-			if (isset($data[$classTypeKey]))
-				$this->convertFromDBToPHP($data, $links[$data['_uuid']], $classTypeKey);
+			if (isset($data[$classTypeKey])) {
+							$this->convertFromDBToPHP($data, $links[$data['_uuid']], $classTypeKey);
+			}
 		}
 	}
 
@@ -906,8 +944,9 @@ 
 		// a randomly generated resultKey prevents db query chaching.
 		$resultKey = $resultKey ? $resultKey : $request['requestKey'].'_'.$counter;
 		$request['resultKey' ] = $resultKey;
-		if (!array_key_exists($request['requestKey'], self::$_requestResultsCache))
-			$this->convertRequestToSql($request);
+		if (!array_key_exists($request['requestKey'], self::$_requestResultsCache)) {
+					$this->convertRequestToSql($request);
+		}
 		// store the request
 		$this->objectRequests[$request['classType']][$resultKey] = $request;
 		return $resultKey;
@@ -984,8 +1023,9 @@ 
 	{
 		$join = ['INNER JOIN dds_object `o` on `t`.`_uuid` = `o`.`_uuid`'];
 		foreach ($links as $l) {
-			if (in_array($l, $filterKeys))
-				$join[] = "LEFT JOIN dds_link `link_$l` ON (`link_$l`.`from_id`=`o`.`_uuid` AND `link_$l`.`from_member`='$l')";
+			if (in_array($l, $filterKeys)) {
+							$join[] = "LEFT JOIN dds_link `link_$l` ON (`link_$l`.`from_id`=`o`.`_uuid` AND `link_$l`.`from_member`='$l')";
+			}
 		}
 		return implode(' ', $join);
 	}
@@ -1002,11 +1042,13 @@ 
 	{
 		$filterKeys = [];
 		$notDeleted = '`o`.`_deleted`=0';
-		if (count($filters)==0)
-			return $includeDeleted ? '' : "WHERE $notDeleted";
+		if (count($filters)==0) {
+					return $includeDeleted ? '' : "WHERE $notDeleted";
+		}
 		$this->createFilterClause($filters, $links, $filterKeys);
-		if (!$includeDeleted)
-			return "WHERE $notDeleted AND ($filters[sql])";
+		if (!$includeDeleted) {
+					return "WHERE $notDeleted AND ($filters[sql])";
+		}
 		return "WHERE $filters[sql]";
 	}
 
@@ -1023,8 +1065,9 @@ 
 		// filter down until we hit the actual filters
 		if (is_array($filters[0])) {
 			foreach ($filters as $k => &$filter) {
-				if ($k === 'logic')
-					continue;
+				if ($k === 'logic') {
+									continue;
+				}
 				$this->createFilterClause($filter, $links, $filterKeys);
 			}
 			//
@@ -1035,25 +1078,28 @@ 
 				// in which case we combine those with to get the filterSql
 				$filterSql = [];
 				foreach ($filters as $k => &$filter) {
-					if ($k === 'logic')
-						continue;
+					if ($k === 'logic') {
+											continue;
+					}
 					// use the logic keys if any for the items - these can be in position 3
 					// for most operators and position 2 for operators that don't take a key
 					if ($this->operatorTakesObject($filter[1])) {
-						if (isset($filter[3]))
-							$filterSql[$filter[3]] = $filter['itemSql'];
-						else
-							$filterSql[] = $filter['itemSql'];
+						if (isset($filter[3])) {
+													$filterSql[$filter[3]] = $filter['itemSql'];
+						} else {
+													$filterSql[] = $filter['itemSql'];
+						}
 					} else {
-						if (isset($filter[2]))
-							$filterSql[$filter[2]] = $filter['itemSql'];
-						else
-							$filterSql[] = $filter['itemSql'];
+						if (isset($filter[2])) {
+													$filterSql[$filter[2]] = $filter['itemSql'];
+						} else {
+													$filterSql[] = $filter['itemSql'];
+						}
 					}
 				}
-				if (empty($filters['logic']))
-					$filters['filterSql'] = $filters['sql'] = implode(' AND ', $filterSql);
-				else {
+				if (empty($filters['logic'])) {
+									$filters['filterSql'] = $filters['sql'] = implode(' AND ', $filterSql);
+				} else {
 					// make sure we test logic filters in order from longest key to shortest key
 					// otherwise we can end up with subkeys screwing things up
 					$orderedKeys = array_map('strlen', array_keys($filterSql));
@@ -1065,8 +1111,9 @@ 
 					// double conversion,
 					$keys = array_keys($filterSql);
 					$keys2hashed = array();
-					foreach ($keys as $k)
-						$keys2hashed[$k] = md5($k);
+					foreach ($keys as $k) {
+											$keys2hashed[$k] = md5($k);
+					}
 					$logicPass1 = str_replace($keys, $keys2hashed, $filters['logic']);
 					$filters['filterSql'] = $filters['sql'] = str_replace($keys2hashed, array_values($filterSql), $logicPass1);
 				}
@@ -1089,9 +1136,9 @@ 
 		//
 		$filter = (in_array($filters[0], $links) ? "`link_{$filters[0]}`.`to_id`": $this->quoteField($filters[0]));
 		$filterKeys[$filters[0]] = $filters[0];
-		if ($this->operatorTakesObject($filters[1]) && isset($filters[2]))
-			$filters['itemSql'] = $filters['sql'] = "$filter ".$this->prepareForPDO($filters[1], $filters[2]);
-		else {
+		if ($this->operatorTakesObject($filters[1]) && isset($filters[2])) {
+					$filters['itemSql'] = $filters['sql'] = "$filter ".$this->prepareForPDO($filters[1], $filters[2]);
+		} else {
 			$filters['itemSql'] = $filters['sql'] = "$filter $filters[1]";
 		}
 	}
@@ -1100,21 +1147,25 @@ 
 	{
 		if (is_array($value)) {
 			$pdoValues = [];
-			if (!in_array($operator, ['=','!=','IN','NOT IN']))
-				throw new \InvalidArgumentException("Daedalus: Cannot pass an *array* of values with an operator of $operator");
+			if (!in_array($operator, ['=','!=','IN','NOT IN'])) {
+							throw new \InvalidArgumentException("Daedalus: Cannot pass an *array* of values with an operator of $operator");
+			}
 			foreach ($value as $v) {
-				if (is_array($v))
-					throw new \InvalidArgumentException("Daedalus: Cannot pass an *array* of *array* of values as filters (silly billy). You passed ".print_r($value,true));
+				if (is_array($v)) {
+									throw new \InvalidArgumentException("Daedalus: Cannot pass an *array* of *array* of values as filters (silly billy). You passed ".print_r($value,true));
+				}
 				$count = count($this->boundValues);
 				$variable = ":var{$count}end";
 				$this->boundValues[$variable] = $v;
 				$pdoValues[] = $variable;
 			}
 			// converts equals to ins and outs
-			if ($operator == '=')
-				$operator = 'IN';
-			if ($operator == '!=')
-				$operator = 'NOT IN';
+			if ($operator == '=') {
+							$operator = 'IN';
+			}
+			if ($operator == '!=') {
+							$operator = 'NOT IN';
+			}
 			return "$operator (".implode(',',$pdoValues).')';
 		} else {
 			$count = count($this->boundValues);
@@ -1138,8 +1189,9 @@ 
 	 */
 	private function extractOrderClause($order)
 	{
-		if (count($order)==0)
-			return '';
+		if (count($order)==0) {
+					return '';
+		}
 		$clause = [];
 		foreach ($order as $o => $d) {
 			// if any of the order clauses are RAND then replace whole clause
@@ -1148,10 +1200,11 @@ 
 				break;
 			}
 			// allow negative ordering in mysql for nulls last
-			if (strpos($o, '-')===0)
-				$clause[] = '-'.substr($o, 1)." $d";
-			else
-				$clause[] = "$o $d";
+			if (strpos($o, '-')===0) {
+							$clause[] = '-'.substr($o, 1)." $d";
+			} else {
+							$clause[] = "$o $d";
+			}
 		}
 		return 'ORDER BY '.implode(', ',$clause);
 	}
@@ -1163,8 +1216,9 @@ 
 	 */
 	private function extractLimitClause($limit)
 	{
-		if (count($limit)==0)
-			return '';
+		if (count($limit)==0) {
+					return '';
+		}
 		return "LIMIT $limit[start], $limit[length]";
 	}
 
@@ -1180,14 +1234,17 @@ 
 	private function setMemberLinks($fromLink, array $toMemberLinks)
 	{
 		// check you've been supplied with rinky dinky data
-		if (!$this->isUUID($fromLink))
-			throw new \InvalidArgumentException("The fromLink should be a UUID64. You passed in $fromLink");
+		if (!$this->isUUID($fromLink)) {
+					throw new \InvalidArgumentException("The fromLink should be a UUID64. You passed in $fromLink");
+		}
 		$count = 0;
 		foreach ($toMemberLinks as $member => $toLinks) {
-			if (!is_array($toLinks))
-				$toLinks = [$toLinks];
-			if (!$this->areUUIDs($toLinks))
-				throw new \InvalidArgumentException("The toMemberLinks should be UUID64s. You passed in ".print_r($toLinks,true));
+			if (!is_array($toLinks)) {
+							$toLinks = [$toLinks];
+			}
+			if (!$this->areUUIDs($toLinks)) {
+							throw new \InvalidArgumentException("The toMemberLinks should be UUID64s. You passed in ".print_r($toLinks,true));
+			}
 			array_unique($toLinks);
 
 			//
@@ -1203,13 +1260,16 @@ 
 			// add the new links in
 			$batchInsert = [];
 			$batchCount = count($toLinks);
-			foreach ($toLinks as $toLink)
-				$batchInsert[] = ['from_id'=>$fromLink, 'from_member'=>$member, 'to_id'=>$toLink];
+			foreach ($toLinks as $toLink) {
+							$batchInsert[] = ['from_id'=>$fromLink, 'from_member'=>$member, 'to_id'=>$toLink];
+			}
 			$memberCount = 0;
-			if (count($batchInsert))
-				$memberCount = neon()->db->createCommand()->batchInsert('{{%dds_link}}', ['from_id','from_member','to_id'], $batchInsert)->execute();
-			if (YII_DEBUG && $memberCount !== $batchCount)
-				throw new Exception("The link insertion failed for member $member - $batchCount items should have been inserted vs $memberCount actual");
+			if (count($batchInsert)) {
+							$memberCount = neon()->db->createCommand()->batchInsert('{{%dds_link}}', ['from_id','from_member','to_id'], $batchInsert)->execute();
+			}
+			if (YII_DEBUG && $memberCount !== $batchCount) {
+							throw new Exception("The link insertion failed for member $member - $batchCount items should have been inserted vs $memberCount actual");
+			}
 			$count += $memberCount;
 		}
 		return $count;
@@ -1236,8 +1296,9 @@ 
 	 */
 	protected function getMembersLinks(array $objectIds)
 	{
-		if (empty($objectIds))
-			return [];
+		if (empty($objectIds)) {
+					return [];
+		}
 		$objectIds = array_unique($objectIds);
 		sort($objectIds, SORT_STRING);
 		$cacheKey = md5(serialize($objectIds));
@@ -1249,8 +1310,9 @@ 
 				->asArray()
 				->all();
 			$multilinks = array_fill_keys($objectIds, []);
-			foreach ($rows as $row)
-				$multilinks[$row['from_id']][$row['from_member']][] = $row['to_id'];
+			foreach ($rows as $row) {
+							$multilinks[$row['from_id']][$row['from_member']][] = $row['to_id'];
+			}
 			self::$_linkResultsCache[$cacheKey] = $multilinks;
 		}
 		return self::$_linkResultsCache[$cacheKey];
@@ -1267,8 +1329,9 @@ 
 	private function createChangeLogEntry($class, $changeKey, $objectUuid, $originalValues=[], $newValues=[])
 	{
 		static $changeLog = null;
-		if (!$changeLog)
-			$changeLog = neon('dds')->IDdsChangeLogManagement;
+		if (!$changeLog) {
+					$changeLog = neon('dds')->IDdsChangeLogManagement;
+		}
 		return $changeLog->addLogEntry($objectUuid, $class->toArray(), $changeKey, $originalValues, $newValues);
 	}
 

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

Indentation +51 added lines, -51 removed lines

@@ -18,59 +18,59 @@
  */
 class DdsDataType extends \yii\db\ActiveRecord
 {
-    /**
-     * @inheritdoc
-     */
-    public static function tableName()
-    {
-        return 'dds_data_type';
-    }
+	/**
+	 * @inheritdoc
+	 */
+	public static function tableName()
+	{
+		return 'dds_data_type';
+	}
 
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            [['data_type_ref', 'storage_ref'], 'required'],
-            [['deleted'], 'integer'],
-            [['data_type_ref', 'storage_ref'], 'string', 'max' => 50],
-            [['label'], 'string', 'max' => 300],
-            [['description'], 'string', 'max' => 1000],
-            [['definition'], 'string', 'max' => 2000],
-            [['data_type_ref'], 'unique'],
-            [['storage_ref'], 'exist', 'skipOnError' => true, 'targetClass' => DdsStorage::className(), 'targetAttribute' => ['storage_ref' => 'storage_ref']],
-        ];
-    }
+	/**
+	 * @inheritdoc
+	 */
+	public function rules()
+	{
+		return [
+			[['data_type_ref', 'storage_ref'], 'required'],
+			[['deleted'], 'integer'],
+			[['data_type_ref', 'storage_ref'], 'string', 'max' => 50],
+			[['label'], 'string', 'max' => 300],
+			[['description'], 'string', 'max' => 1000],
+			[['definition'], 'string', 'max' => 2000],
+			[['data_type_ref'], 'unique'],
+			[['storage_ref'], 'exist', 'skipOnError' => true, 'targetClass' => DdsStorage::className(), 'targetAttribute' => ['storage_ref' => 'storage_ref']],
+		];
+	}
 
-    /**
-     * @inheritdoc
-     */
-    public function attributeLabels()
-    {
-        return [
-            'data_type_ref' => 'Data Type Ref',
-            'label' => 'Label',
-            'description' => 'Description',
-            'definition' => 'Definition',
-            'storage_ref' => 'Storage Ref',
-            'deleted' => 'Deleted',
-        ];
-    }
+	/**
+	 * @inheritdoc
+	 */
+	public function attributeLabels()
+	{
+		return [
+			'data_type_ref' => 'Data Type Ref',
+			'label' => 'Label',
+			'description' => 'Description',
+			'definition' => 'Definition',
+			'storage_ref' => 'Storage Ref',
+			'deleted' => 'Deleted',
+		];
+	}
 
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getStorageRef()
-    {
-        return $this->hasOne(DdsStorage::className(), ['storage_ref' => 'storage_ref']);
-    }
+	/**
+	 * @return \yii\db\ActiveQuery
+	 */
+	public function getStorageRef()
+	{
+		return $this->hasOne(DdsStorage::className(), ['storage_ref' => 'storage_ref']);
+	}
 
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getDdsMembers()
-    {
-        return $this->hasMany(DdsMember::className(), ['data_type_ref' => 'data_type_ref']);
-    }
+	/**
+	 * @return \yii\db\ActiveQuery
+	 */
+	public function getDdsMembers()
+	{
+		return $this->hasMany(DdsMember::className(), ['data_type_ref' => 'data_type_ref']);
+	}
 }

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

Indentation +41 added lines, -41 removed lines

@@ -15,48 +15,48 @@
  */
 class DdsStorage extends \yii\db\ActiveRecord
 {
-    /**
-     * @inheritdoc
-     */
-    public static function tableName()
-    {
-        return 'dds_storage';
-    }
+	/**
+	 * @inheritdoc
+	 */
+	public static function tableName()
+	{
+		return 'dds_storage';
+	}
 
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            [['storage_ref', 'label', 'type', 'description'], 'required'],
-            [['type'], 'string'],
-            [['storage_ref'], 'string', 'max' => 50],
-            [['label'], 'string', 'max' => 300],
-            [['description'], 'string', 'max' => 8000],
-            [['storage_ref'], 'unique'],
-        ];
-    }
+	/**
+	 * @inheritdoc
+	 */
+	public function rules()
+	{
+		return [
+			[['storage_ref', 'label', 'type', 'description'], 'required'],
+			[['type'], 'string'],
+			[['storage_ref'], 'string', 'max' => 50],
+			[['label'], 'string', 'max' => 300],
+			[['description'], 'string', 'max' => 8000],
+			[['storage_ref'], 'unique'],
+		];
+	}
 
-    /**
-     * @inheritdoc
-     */
-    public function attributeLabels()
-    {
-        return [
-            'id' => 'ID',
-            'storage_ref' => 'Storage Ref',
-            'label' => 'Label',
-            'type' => 'Type',
-            'description' => 'Description',
-        ];
-    }
+	/**
+	 * @inheritdoc
+	 */
+	public function attributeLabels()
+	{
+		return [
+			'id' => 'ID',
+			'storage_ref' => 'Storage Ref',
+			'label' => 'Label',
+			'type' => 'Type',
+			'description' => 'Description',
+		];
+	}
 
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getDdsDataTypes()
-    {
-        return $this->hasMany(DdsDataType::className(), ['storage_ref' => 'storage_ref']);
-    }
+	/**
+	 * @return \yii\db\ActiveQuery
+	 */
+	public function getDdsDataTypes()
+	{
+		return $this->hasMany(DdsDataType::className(), ['storage_ref' => 'storage_ref']);
+	}
 }

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/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);
 	}
 
 	/**
@@ -531,7 +531,7 @@ 
 		}
 		if ($key === 1) {
 			// accept only these operators
-			switch(strtolower($item)) {
+			switch (strtolower($item)) {
 				case '=': case '!=':
 				case '<': case '<=':
 				case '>': case '>=':
@@ -566,7 +566,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.");
 			}
 		}
@@ -577,8 +577,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;
 	}
 
@@ -614,7 +614,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;
@@ -638,10 +638,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) {
@@ -654,7 +654,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;
 				}
 			}
@@ -669,14 +669,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);
 			}
 		}
@@ -688,9 +688,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])) {
@@ -753,7 +753,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
@@ -789,7 +789,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)) {
@@ -868,11 +868,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);
+		}
 	}
 
 	/**
@@ -577,8 +592,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;
 	}
 
@@ -614,10 +630,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';
@@ -705,14 +722,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;
@@ -737,8 +756,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;
+				}
 			}
 		}
 	}
@@ -757,16 +777,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;
@@ -798,19 +820,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;
 	}
@@ -863,16 +888,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;
 	}
 
@@ -883,10 +910,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);
 	}
 
@@ -921,8 +950,9 @@ 
 	protected function areUUIDs(array $candidates)
 	{
 		foreach ($candidates as $candidate) {
-			if (!$this->isUUID($candidate))
-				return false;
+			if (!$this->isUUID($candidate)) {
+							return false;
+			}
 		}
 		return true;
 	}

neon/daedalus/services/ddsManager/DdsDataDefinitionManager.php

Spacing +18 added lines, -18 removed lines

@@ -53,7 +53,7 @@ 
 	 * @param bool $includeDeleted
 	 * @return \yii\db\ActiveQuery
 	 */
-	public function countClasses($module=null, $includeDeleted=false)
+	public function countClasses($module = null, $includeDeleted = false)
 	{
 		$query = $this->_getClassesQuery($module, $includeDeleted);
 		return $query->count();
@@ -62,7 +62,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)
@@ -122,7 +122,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);
@@ -133,7 +133,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function getClass($classType, $includeMembers=false)
+	public function getClass($classType, $includeMembers = false)
 	{
 		if ($this->findClass($classType, $class)) {
 			$data = $class->toArray();
@@ -150,7 +150,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);
@@ -234,7 +234,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);
 	}
@@ -242,7 +242,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);
@@ -251,7 +251,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));
@@ -275,7 +275,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);
@@ -288,7 +288,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();
@@ -310,7 +310,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
@@ -332,7 +332,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);
@@ -365,7 +365,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();
@@ -380,7 +380,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';";
@@ -427,7 +427,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function listDataTypes($includeDeleted=false)
+	public function listDataTypes($includeDeleted = false)
 	{
 		$query = DdsDataType::find();
 		$select = ['data_type_ref', 'label', 'description', 'definition', 'storage_ref'];
@@ -488,7 +488,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);
 			}
@@ -606,7 +606,7 @@ 
 					if (count($diff))
 						$diffs[$k] = $v;
 				} else {
-					if ((string)$v !== (string)$b[$k])
+					if ((string) $v !== (string) $b[$k])
 						$diffs[$k] = $v;
 				}
 			} else {
@@ -623,7 +623,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'];

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;
 	}
 

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') {