newicon / neon

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

Spacing +1 added lines, -1 removed lines

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

neon/daedalus/services/ddsManager/DdsObjectMapManager.php

Spacing +27 added lines, -27 removed lines

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

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

neon/daedalus/services/ddsHelpers/DdsQueryHelpers.php

Spacing +1 added lines, -1 removed lines

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

neon/daedalus/controllers/IndexController.php

Spacing +1 added lines, -1 removed lines

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

neon/daedalus/controllers/api/ClassController.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 		} catch (\Exception $e) {
 			// error occured lets see if it's because the class does not exist
 			if (neon()->getDds()->IDdsClassManagement->getClass($class) === null) {
-				throw new HttpException(404, 'No class exists with name ' . $class);
+				throw new HttpException(404, 'No class exists with name '.$class);
 			}
 			throw new HttpException(500, $e->getMessage());
 		}

neon/daedalus/controllers/api/MapController.php

Spacing +6 added lines, -6 removed lines

@@ -47,15 +47,15 @@ 
 	 * @return array uuid => map field
 	 * @throws
 	 */
-	public function actionObjects($class, $filter='', $length=100, $member='', $value='', $start=0)
+	public function actionObjects($class, $filter = '', $length = 100, $member = '', $value = '', $start = 0)
 	{
 		$mapFilter = [];
 		if (!$class)
 			throw new HttpException(404, "No class name provided");
 		if ($member && $value)
-			$mapFilter[$member]=$value;
+			$mapFilter[$member] = $value;
 		if ($filter && is_string($filter))
-			$mapFilter['_map_field_']=$filter;
+			$mapFilter['_map_field_'] = $filter;
 		return neon()->getDds()->IDdsObjectManagement->getObjectMap($class, $mapFilter, [], $start, $length);
 	}
 
@@ -64,17 +64,17 @@ 
 		return neon('user')->getDataMapTypes();
 	}
 
-	public function actionUsers($filter='')
+	public function actionUsers($filter = '')
 	{
 		return neon('user')->getDataMap('users', $filter);
 	}
 
-	public function actionPages($filter='')
+	public function actionPages($filter = '')
 	{
 		return neon('cms')->getDataMap('pages', $filter);
 	}
 
-	public function actionPhoebe($type='', $filter='')
+	public function actionPhoebe($type = '', $filter = '')
 	{
 		$filters = [];
 		if (!$filter) {

neon/daedalus/controllers/ChangeLogController.php

Spacing +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
 		]);
 	}
 
-	public function actionList($type, $uuid=null)
+	public function actionList($type, $uuid = null)
 	{
 		// sort out where we're going back to
 		$goBackTo = url(['index/list', 'type'=>$type]);
@@ -47,7 +47,7 @@ 
 			$goBackTo = url(['index/list', 'type'=>$type, 'uuid' => $uuid]);
 
 		// check the class has a change log
-		$class = ['class_type' => $type, 'label'=>ucwords(str_replace('_',' ',$type))];
+		$class = ['class_type' => $type, 'label'=>ucwords(str_replace('_', ' ', $type))];
 		$hasChangeLog = $this->cl->hasChangeLog($type);
 		if (!$hasChangeLog) {
 			return $this->render('list.tpl', [
@@ -102,7 +102,7 @@ 
 			case 'COMMENT':
 				if (!$uuid)
 					$render['title'] = "Comment added on ".date("d-m-Y \\a\\t H:i:s", strtotime($logEntry['when']));
-				if (is_array($logEntry['associated_objects']) && count($logEntry['associated_objects'])>0)
+				if (is_array($logEntry['associated_objects']) && count($logEntry['associated_objects']) > 0)
 					$render['associated_objects'] = implode(', ', $logEntry['associated_objects']);
 			case 'DESTROY':
 			case 'DELETE':

neon/daedalus/migrations/m20200119_192834_dds_update_change_log.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 	public function safeDown()
 	{
-		$this->execute("ALTER TABLE dds_change_log MODIFY `object_uuid` char(22) CHARACTER SET latin1 COLLATE latin1_general_cs NOT NULL COMMENT 'The object that was changed'");		$this->execute("ALTER TABLE dds_change_log DROP COLUMN `before`;");
+		$this->execute("ALTER TABLE dds_change_log MODIFY `object_uuid` char(22) CHARACTER SET latin1 COLLATE latin1_general_cs NOT NULL COMMENT 'The object that was changed'"); $this->execute("ALTER TABLE dds_change_log DROP COLUMN `before`;");
 		$this->execute("ALTER TABLE dds_change_log DROP COLUMN `after`;");
 		$this->execute("ALTER TABLE dds_change_log ADD `changes` longblob COMMENT 'What the changes were' AFTER `when`;");
 	}