newicon / neon

neon/daedalus/controllers/IndexController.php

Spacing +1 added lines, -1 removed lines

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

Braces +21 added lines, -14 removed lines

@@ -101,8 +101,9 @@ 
 	public function actionEditObject($type, $id)
 	{
 		$form = $this->getPhoebeForm($type);
-		if (neon()->request->getIsAjax())
-			return $form->ajaxValidation();
+		if (neon()->request->getIsAjax()) {
+					return $form->ajaxValidation();
+		}
 		if ($form->processRequest()) {
 			$this->ddo()->editObject($id, $form->getData());
 			return $this->redirect(['/daedalus/index/list', 'type'=>$type]);
@@ -126,8 +127,9 @@ 
 	public function actionDeleteObject($type, $id, $redirect = true)
 	{
 		$this->ddo()->deleteObject($id);
-		if ($redirect)
-			$this->redirect(['/daedalus/index/list', 'type' => $type]);
+		if ($redirect) {
+					$this->redirect(['/daedalus/index/list', 'type' => $type]);
+		}
 	}
 
 	/**
@@ -139,8 +141,9 @@ 
 	public function actionUndeleteObject($type, $id, $redirect = true)
 	{
 		$this->ddo()->undeleteObject($id);
-		if ($redirect)
-			$this->redirect(['/daedalus/index/list', 'type' => $type]);
+		if ($redirect) {
+					$this->redirect(['/daedalus/index/list', 'type' => $type]);
+		}
 	}
 
 	/**
@@ -152,8 +155,9 @@ 
 	public function actionDestroyObject($type, $id, $redirect = true)
 	{
 		$this->ddo()->destroyObject($id);
-		if ($redirect)
-			$this->redirect(['/daedalus/index/list', 'type' => $type]);
+		if ($redirect) {
+					$this->redirect(['/daedalus/index/list', 'type' => $type]);
+		}
 	}
 
 
@@ -168,8 +172,9 @@ 
 		while ($rows > 0) {
 			$count = min($rows, 100);
 			$data = [];
-			for ($i = 0; $i < $count; $i++)
-				$data[] = $form->fake();
+			for ($i = 0; $i < $count; $i++) {
+							$data[] = $form->fake();
+			}
 			$this->ddo()->addObjects($type, $data);
 			$rows -= $count;
 		}
@@ -241,8 +246,9 @@ 
 		do {
 			$nextSet = $ddc->listClasses(null, $total, false, $start, $length);
 			$count = count($nextSet);
-			if ($count)
-				$classes = array_merge($classes, $nextSet);
+			if ($count) {
+							$classes = array_merge($classes, $nextSet);
+			}
 			$start += $count;
 		} while ($count>0);
 		$classesByType = array_column($classes, null, 'class_type');
@@ -254,8 +260,9 @@ 
 			foreach ($class['members'] as &$member) {
 				$member['data_type'] = $dataTypeByRef[$member['data_type_ref']];
 				$member['links_to_table'] = null;
-				if ($member['link_class'] && isset($classesByType[$member['link_class']]))
-					$member['links_to_table'] = $classesByType[$member['link_class']]['label'];
+				if ($member['link_class'] && isset($classesByType[$member['link_class']])) {
+									$member['links_to_table'] = $classesByType[$member['link_class']]['label'];
+				}
 			}
 			$definitions[$c['class_type']] = $class;
 		}

neon/daedalus/controllers/common/DaedalusController.php

Braces +9 added lines, -6 removed lines

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

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

Braces +10 added lines, -8 removed lines

@@ -50,12 +50,15 @@ 
 	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;
-		if ($filter && is_string($filter))
-			$mapFilter['_map_field_']=$filter;
+		if (!$class) {
+					throw new HttpException(404, "No class name provided");
+		}
+		if ($member && $value) {
+					$mapFilter[$member]=$value;
+		}
+		if ($filter && is_string($filter)) {
+					$mapFilter['_map_field_']=$filter;
+		}
 		return neon()->getDds()->IDdsObjectManagement->getObjectMap($class, $mapFilter, [], $start, $length);
 	}
 
@@ -83,8 +86,7 @@ 
 					['like', 'label', $filter],
 					['like', 'class_type', $filter]
 				];
-			}
-			else if ($type === 'phoebe_object') {
+			} else if ($type === 'phoebe_object') {
 				$filters = ['like', 'uuid', $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':

Braces +17 added lines, -12 removed lines

@@ -43,8 +43,9 @@ 
 	{
 		// sort out where we're going back to
 		$goBackTo = url(['index/list', 'type'=>$type]);
-		if ($uuid)
-			$goBackTo = url(['index/list', 'type'=>$type, 'uuid' => $uuid]);
+		if ($uuid) {
+					$goBackTo = url(['index/list', 'type'=>$type, 'uuid' => $uuid]);
+		}
 
 		// check the class has a change log
 		$class = ['class_type' => $type, 'label'=>ucwords(str_replace('_',' ',$type))];
@@ -77,16 +78,18 @@ 
 	public function actionViewObject($uuid, $logUuid)
 	{
 		$logEntry = $this->cl->getLogEntry($logUuid);
-		if (!$logEntry)
-			return 'Log not found';
+		if (!$logEntry) {
+					return 'Log not found';
+		}
 		$type = $logEntry['class_type'];
 
 		$class = $this->getClassAsArray($type);
 		$goBackTo = url(['change-log/list', 'type'=>$type, 'uuid' => $uuid]);
-		if ($uuid)
-			$headerTitle = "$class[label] [Object '$uuid'] Change Log";
-		else
-			$headerTitle = "$class[label] Change Log";
+		if ($uuid) {
+					$headerTitle = "$class[label] [Object '$uuid'] Change Log";
+		} else {
+					$headerTitle = "$class[label] Change Log";
+		}
 
 		$title = "Status of $uuid on ".date("d-m-Y \\a\\t H:i:s", strtotime($logEntry['when']));
 		$render = [
@@ -100,10 +103,12 @@ 
 		];
 		switch ($logEntry['change_key']) {
 			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)
-					$render['associated_objects'] = implode(', ', $logEntry['associated_objects']);
+				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) {
+									$render['associated_objects'] = implode(', ', $logEntry['associated_objects']);
+				}
 			case 'DESTROY':
 			case 'DELETE':
 				$renderFile = 'viewLogEntry.tpl';

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`;");
 	}

neon/daedalus/migrations/m170724_112209_dds_link_table_creation.php

Indentation +5 added lines, -5 removed lines

@@ -9,8 +9,8 @@ 
  */
 class m170724_112209_dds_link_table_creation extends Migration
 {
-    public function safeUp()
-    {
+	public function safeUp()
+	{
 		// create a linking table for links
 		$tableOptions = null;
 		if ($this->db->driverName === 'mysql') {
@@ -40,8 +40,8 @@ 
 
 	}
 
-    public function safeDown()
-    {
+	public function safeDown()
+	{
 		$this->dropTable('dds_link');
 		$connection = neon()->db;
 		$sql =<<<EOQ
@@ -52,5 +52,5 @@ 
 		$this->execute($sql);
 		$this->dropColumn('dds_member', 'link_class');
 
-    }
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
 		], $tableOptions);
 
 		// create the new link and link datatypes
-		$sql =<<<EOQ
+		$sql = <<<EOQ
 SET foreign_key_checks = 0;
 REPLACE INTO `dds_data_type` (`data_type_ref`, `label`, `description`, `definition`, `storage_ref`, `deleted`)
 VALUES
@@ -44,7 +44,7 @@ 
     {
 		$this->dropTable('dds_link');
 		$connection = neon()->db;
-		$sql =<<<EOQ
+		$sql = <<<EOQ
 SET foreign_key_checks=0;
 DELETE FROM `dds_data_type` WHERE `data_type_ref`='link';
 SET foreign_key_checks=1;

neon/daedalus/migrations/m161201_170340_dds_add_map_field_to_members.php

Indentation +6 added lines, -6 removed lines

@@ -5,14 +5,14 @@
 class m161201_170340_dds_add_map_field_to_members extends Migration
 {
 
-    public function safeUp()
-    {
+	public function safeUp()
+	{
 		$this->addColumn('dds_member', 'map_field', "TINYINT(1) NOT NULL DEFAULT 0 COMMENT 'If true, then this is field data used in defining maps' AFTER `definition`");
-    }
+	}
 
-    public function safeDown()
-    {
+	public function safeDown()
+	{
 		$this->dropColumn('dds_member', 'map_field');
-    }
+	}
 
 }

neon/daedalus/migrations/deprecatedMigrations/m170103_151935_dds_new_data_types.php

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
 
 		$this->alterColumn('dds_storage', 'type', "enum('INTEGER_TINY','INTEGER_SHORT','INTEGER','INTEGER_LONG','FLOAT','DOUBLE','DATE','DATETIME','TEXT_SHORT','TEXT','TEXT_LONG','BINARY_SHORT','BINARY','BINARY_LONG','CHAR','TIME') COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'the storage type'");
 
-		$sql =<<<EOQ
+		$sql = <<<EOQ
 SET foreign_key_checks = 0;
 REPLACE INTO {{%dds_storage}} (`storage_ref`, `label`, `type`, `description`)
 VALUES
@@ -21,7 +21,7 @@ 
 		$connection->createCommand($sql)->execute();
 
 
-		$sql =<<<EOQ
+		$sql = <<<EOQ
 SET foreign_key_checks = 0;
 REPLACE INTO {{%dds_data_type}} (`data_type_ref`, `label`, `description`, `definition`, `storage_ref`, `deleted`)
 VALUES