newicon / neon

neon/daedalus/services/ddsManager/DdsCore.php

Spacing +33 added lines, -33 removed lines

@@ -112,7 +112,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']);
 		}
@@ -161,10 +161,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`
@@ -183,7 +183,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;
@@ -210,7 +210,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)
@@ -285,7 +285,7 @@ 
 	 * @throws InvalidArgumentException if class not found and $throwException is true
 	 * @return bool  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])) {
@@ -334,13 +334,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])) {
@@ -391,7 +391,7 @@ 
 	 */
 	protected function setClassMapMemberCache($classType, $member)
 	{
-		static::$_classMemberMapCache[$classType]=$member;
+		static::$_classMemberMapCache[$classType] = $member;
 	}
 
 	/**
@@ -400,7 +400,7 @@ 
 	 * @param DdsDataType &$dataType
 	 * @return bool  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);
@@ -454,7 +454,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 = [];
@@ -468,7 +468,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`";
@@ -488,7 +488,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;
 	}
@@ -503,7 +503,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
@@ -514,9 +514,9 @@ 
 		}
 		// so canonicalise a filter clause
 		if (array_key_exists(0, $filters))
-			$this->canonicaliseFilter($filters[0],0);
+			$this->canonicaliseFilter($filters[0], 0);
 		if (array_key_exists(1, $filters))
-			$this->canonicaliseFilter($filters[1],1);
+			$this->canonicaliseFilter($filters[1], 1);
 
 		// Handle nulls passed as values
 		// ['field', '=', null] and ['field', '!=', null]
@@ -545,7 +545,7 @@ 
 		}
 		if ($key === 1) {
 			// accept only these operators
-			switch(strtolower($item)) {
+			switch (strtolower($item)) {
 				case '=': case '!=':
 				case '<': case '<=':
 				case '>': case '>=':
@@ -580,7 +580,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.'
 				);
@@ -593,8 +593,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;
 	}
 
@@ -630,7 +630,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;
@@ -654,10 +654,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) {
@@ -670,7 +670,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;
 				}
 			}
@@ -685,14 +685,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);
 			}
 		}
@@ -704,9 +704,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])) {
@@ -769,7 +769,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
@@ -805,7 +805,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)) {
@@ -838,7 +838,7 @@ 
 	 */
 	protected function getTableFromClassType($classType)
 	{
-		return 'ddt_' .$this->canonicaliseRef($classType);
+		return 'ddt_'.$this->canonicaliseRef($classType);
 	}
 
 	/**
@@ -884,11 +884,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

@@ -100,8 +100,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);
 	}
 
@@ -213,8 +214,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 ";
 	}
 
@@ -292,8 +294,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);
 	}
 
@@ -336,32 +339,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;
 	}
@@ -458,8 +467,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);
 	}
 
@@ -483,8 +493,9 @@ 
 	 */
 	protected function canonicaliseFilters($filters)
 	{
-		if (!is_array($filters))
-			return [];
+		if (!is_array($filters)) {
+					return [];
+		}
 		try {
 			$this->canonicaliseFiltersRecursive($filters);
 		} catch (InvalidArgumentException $ex) {
@@ -503,20 +514,24 @@ 
 	protected function canonicaliseFiltersRecursive(&$filters)
 	{
 		// is this a filter clause or set of filter clauses??
-		if (!is_array($filters) || count($filters)==0)
-			return;
+		if (!is_array($filters) || count($filters)==0) {
+					return;
+		}
 
 		// recursively descend until one finds a filter clause
 		if (is_array($filters[0])) {
-			foreach ($filters as &$f)
-				$this->canonicaliseFiltersRecursive($f);
+			foreach ($filters as &$f) {
+							$this->canonicaliseFiltersRecursive($f);
+			}
 			return;
 		}
 		// so canonicalise a filter clause
-		if (array_key_exists(0, $filters))
-			$this->canonicaliseFilter($filters[0],0);
-		if (array_key_exists(1, $filters))
-			$this->canonicaliseFilter($filters[1],1);
+		if (array_key_exists(0, $filters)) {
+					$this->canonicaliseFilter($filters[0],0);
+		}
+		if (array_key_exists(1, $filters)) {
+					$this->canonicaliseFilter($filters[1],1);
+		}
 
 		// Handle nulls passed as values
 		// ['field', '=', null] and ['field', '!=', null]
@@ -593,8 +608,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;
 	}
 
@@ -630,10 +646,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';
@@ -721,14 +738,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;
@@ -753,8 +772,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;
+				}
 			}
 		}
 	}
@@ -773,16 +793,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;
@@ -814,19 +836,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;
 	}
@@ -879,16 +904,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;
 	}
 
@@ -899,10 +926,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);
 	}
 
@@ -937,8 +966,9 @@ 
 	protected function areUUIDs(array $candidates)
 	{
 		foreach ($candidates as $candidate) {
-			if (!$this->isUUID($candidate))
-				return false;
+			if (!$this->isUUID($candidate)) {
+							return false;
+			}
 		}
 		return true;
 	}