newicon / neon

neon/phoebe/services/adapters/daedalus/PhoebeClass.php

Braces +29 added lines, -20 removed lines

@@ -54,8 +54,9 @@ 
 	 */
 	public function editClass($changes)
 	{
-		if (!is_array($changes))
-			throw new \RuntimeException('You should pass an array into editClass. You passed in '.print_r($changes,true));
+		if (!is_array($changes)) {
+					throw new \RuntimeException('You should pass an array into editClass. You passed in '.print_r($changes,true));
+		}
 
 		// make the appropriate changes to dds. Any unknown fields are ignored
 		$this->dds()->editClass($this->classType, $changes);
@@ -108,10 +109,11 @@ 
 			if ($f['mapField'] == 1 && $currentData['map_field'] == 0) {
 				$this->dds()->setMemberAsMapField($this->classType, $memberRef);
 			}
-			if ($definition['deleted'] == 1 && $currentData['deleted'] == 0)
-				$this->dds()->deleteMember($this->classType, $memberRef);
-			else if ($definition['deleted'] == 0 && $currentData['deleted'] == 1)
-				$this->dds()->undeleteMember($this->classType, $memberRef);
+			if ($definition['deleted'] == 1 && $currentData['deleted'] == 0) {
+							$this->dds()->deleteMember($this->classType, $memberRef);
+			} else if ($definition['deleted'] == 0 && $currentData['deleted'] == 1) {
+							$this->dds()->undeleteMember($this->classType, $memberRef);
+			}
 			if ($definition['deleted'] == -1) {
 				// remove definition from phoebe
 				unset($changes['definition']['fields'][$k]);
@@ -121,8 +123,9 @@ 
 
 		// and save to phoebe - remove unallowed phoebe values for Daedalus tables
 		$changes = array_diff_key($changes, array_flip(['version', 'volatile', 'object_history', 'version_locked']));
-		if (count($changes)==0)
-			return;
+		if (count($changes)==0) {
+					return;
+		}
 		$hasChanges = parent::editClass($changes);
 		return $hasChanges;
 	}
@@ -132,8 +135,9 @@ 
 	 */
 	public function deleteClass()
 	{
-		if (($result = parent::deleteClass()))
-			$this->dds()->deleteClass($this->classType);
+		if (($result = parent::deleteClass())) {
+					$this->dds()->deleteClass($this->classType);
+		}
 		return $result;
 	}
 
@@ -142,8 +146,9 @@ 
 	 */
 	public function undeleteClass()
 	{
-		if (($result = parent::undeleteClass()))
-			$this->dds()->undeleteClass($this->classType);
+		if (($result = parent::undeleteClass())) {
+					$this->dds()->undeleteClass($this->classType);
+		}
 		return $result;
 	}
 
@@ -152,8 +157,9 @@ 
 	 */
 	public function destroyClass()
 	{
-		if (($result = parent::destroyClass()))
-			$this->dds()->destroyClass($this->classType);
+		if (($result = parent::destroyClass())) {
+					$this->dds()->destroyClass($this->classType);
+		}
 		return $result;
 	}
 
@@ -199,8 +205,9 @@ 
 		$definition = $this->definition;
 		$order = 0;
 		$restrictFields = count($restrictToFields) > 0;
-		if ($restrictFields)
-			$restrictFieldPostion = array_flip($restrictToFields);
+		if ($restrictFields) {
+					$restrictFieldPostion = array_flip($restrictToFields);
+		}
 		if (isset($definition['fields'])) {
 			$fields = $definition['fields'];
 			foreach ($fields as $key=>$field) {
@@ -215,8 +222,9 @@ 
 				if (isset($field['definition'])) {
 					$fields[$key] = $field['definition'];
 					$fields[$key]['mapField'] = $field['mapField'];
-					if (isset($field['deleted']))
-						$fields[$key]['deleted'] = $field['deleted'];
+					if (isset($field['deleted'])) {
+											$fields[$key]['deleted'] = $field['deleted'];
+					}
 					// TODO - 20180522 NJ
 					// THIS WILL GO WRONG WITH DELETED FIELDS WHERE FINAL SUBMIT BUTTON MAY BE IN WRONG PLACE
 					$fields[$key]['order'] = ($restrictFields ? ($restrictFieldPostion[$key]) : $order++);
@@ -232,8 +240,9 @@ 
 	protected $_dds = null;
 	protected function dds()
 	{
-		if ($this->_dds == null)
-			$this->_dds = neon('dds')->iDdsClassManagement;
+		if ($this->_dds == null) {
+					$this->_dds = neon('dds')->iDdsClassManagement;
+		}
 		return $this->_dds;
 	}
 

neon/phoebe/services/adapters/daedalus/PhoebeType.php

Braces +15 added lines, -10 removed lines

@@ -65,8 +65,9 @@ 
 		$class = $this->canonicaliseRef($class);
 
 		// descriptions of a class are stored as hints in the form
-		if (isset($definition['description']))
-			$definition['hint'] = $definition['description'];
+		if (isset($definition['description'])) {
+					$definition['hint'] = $definition['description'];
+		}
 
 		// pass the definition to a form object and then get back the full definition
 		$definition['name'] = $class;
@@ -78,8 +79,9 @@ 
 
 		// save the class information
 		$phoebeClass = $this->getClass($class);
-		if (!$phoebeClass)
-			$phoebeClass = $this->addClass($class, $module);
+		if (!$phoebeClass) {
+					$phoebeClass = $this->addClass($class, $module);
+		}
 		$phoebeClass->editClass($classDefinition);
 
 		// close the migration
@@ -159,8 +161,9 @@ 
 		$ddsObject = $this->ddo()->getObject($objectId);
 
 		$object = $objectId ? $this->createFauxIPhoebeObject($classType, $objectId, $ddsObject) : null;
-		if ($object)
-			$object->changeLogUuid = $changeLogUuid;
+		if ($object) {
+					$object->changeLogUuid = $changeLogUuid;
+		}
 		return $object;
 	}
 
@@ -221,16 +224,18 @@ 
 	protected $_dds = null;
 	protected function dds()
 	{
-		if ($this->_dds == null)
-			$this->_dds = neon('dds')->IDdsClassManagement;
+		if ($this->_dds == null) {
+					$this->_dds = neon('dds')->IDdsClassManagement;
+		}
 		return $this->_dds;
 	}
 
 	protected $_ddo = null;
 	protected function ddo()
 	{
-		if ($this->_ddo == null)
-			$this->_ddo = neon('dds')->IDdsObjectManagement;
+		if ($this->_ddo == null) {
+					$this->_ddo = neon('dds')->IDdsObjectManagement;
+		}
 		return $this->_ddo;
 	}
 

neon/phoebe/plugins/smarty/function.appForm.php

Braces +12 added lines, -8 removed lines

@@ -105,8 +105,9 @@ 
 
 	$appForm = 'applicationForm';
 	// process the parameters
-	if (!isset($params['classType']))
-		throw new \RuntimeException("You must pass in the form's classType otherwise we don't which form it is. You passed in: ".print_r($params,true));
+	if (!isset($params['classType'])) {
+			throw new \RuntimeException("You must pass in the form's classType otherwise we don't which form it is. You passed in: ".print_r($params,true));
+	}
 	$classType = $params['classType'];
 	$uuid = !empty($params['uuid']) ? $params['uuid'] : null;
 	$id = !empty($params['id']) ? $params['id'] : null;
@@ -135,8 +136,9 @@ 
 		$class = $phoebe->getClass($classType);
 		$appFormClasses[$classType] = $class;
 	}
-	if (!$class)
-		throw new \RuntimeException('Error - cannot get hold of the form class '.$classType);
+	if (!$class) {
+			throw new \RuntimeException('Error - cannot get hold of the form class '.$classType);
+	}
 
 	$requiredDataSources = array_keys($class->getRequiredDataSources());
 	$missingDataSources = array_diff($requiredDataSources, array_keys($dataSources));
@@ -147,8 +149,9 @@ 
 	// prefix invalid (HTML5) ids with a letter
 	$id = ($id ? $id : ($uuid ? $uuid : null));
 	if ($id) {
-		if (is_numeric($id[0]) || $id[0] == '-' || $id[0] == '_')
-			$id = 'z' . $id;
+		if (is_numeric($id[0]) || $id[0] == '-' || $id[0] == '_') {
+					$id = 'z' . $id;
+		}
 	}
 
 	// get hold of the form definition
@@ -185,8 +188,9 @@ 
 	} else if ($uuid) {
 		$phoebe = neon('phoebe')->getIPhoebeType($appForm);
 		$object = $phoebe->getObject($uuid);
-		if (!$object)
-			throw new \yii\web\NotFoundHttpException('The requested form was not found. Uuid='.$uuid);
+		if (!$object) {
+					throw new \yii\web\NotFoundHttpException('The requested form was not found. Uuid='.$uuid);
+		}
 		$appFormObjects[$uuid] = $object;
 	}
 	$template->assign($assignSubmitted, false);

neon/phoebe/plugins/smarty/function.ddsForm.php

Braces +9 added lines, -6 removed lines

@@ -144,8 +144,9 @@ 
 	$phoebeType = 'daedalus';
 
 	// process the parameters
-	if (!isset($params['classType']))
-		throw new \RuntimeException("You must pass in the form's classType otherwise we don't which form it is. You passed in: ".print_r($params,true));
+	if (!isset($params['classType'])) {
+			throw new \RuntimeException("You must pass in the form's classType otherwise we don't which form it is. You passed in: ".print_r($params,true));
+	}
 	$classType = $params['classType'];
 	$label = isset($params['label']) ? $params['label'] : null;
 	$id = !empty($params['id']) ? $params['id'] : null;
@@ -173,8 +174,9 @@ 
 	// prefix invalid (HTML5) ids with a letter
 	$id = ($id ? $id : ($uuid ? $uuid : null));
 	if ($id) {
-		if (is_numeric($id[0]) || $id[0] == '-' || $id[0] == '_')
-			$id = 'z' . $id;
+		if (is_numeric($id[0]) || $id[0] == '-' || $id[0] == '_') {
+					$id = 'z' . $id;
+		}
 	}
 	$changeLogUuids = [];
 
@@ -243,8 +245,9 @@ 
 	}
 
 	// assign all of the save results to the template
-	foreach ($saveFormResults as $k=>$v)
-		$template->assign($k,$v);
+	foreach ($saveFormResults as $k=>$v) {
+			$template->assign($k,$v);
+	}
 
 
 	// assign the resulting form

neon/phoebe/controllers/database/IndexController.php

Braces +6 added lines, -4 removed lines

@@ -52,8 +52,9 @@ 
 	 */
 	public function actionEdit($type = null)
 	{
-		if (!$this->canDevelop())
-			throw new HttpException(403, 'This operation is not permitted here');
+		if (!$this->canDevelop()) {
+					throw new HttpException(403, 'This operation is not permitted here');
+		}
 
 		$form = $this->getPhoebeForm($type, $isNewForm, false, true);
 
@@ -130,8 +131,9 @@ 
 			]
 		];
 		$form = new \neon\core\form\Form($formDefinition);
-		if (neon()->request->isAjax)
-			return $form->ajaxValidation();
+		if (neon()->request->isAjax) {
+					return $form->ajaxValidation();
+		}
 		if ($form->processRequest()) {
 			$data = $form->getData();
 			$definition = $this->canonicaliseDefinition($data);

neon/phoebe/controllers/appforms/IndexController.php

Braces +12 added lines, -8 removed lines

@@ -64,8 +64,9 @@ 
 	 */
 	public function actionEdit($type=null)
 	{
-		if (!$this->canDevelop())
-			throw new \HttpException(403, 'This operation is not permitted here');
+		if (!$this->canDevelop()) {
+					throw new \HttpException(403, 'This operation is not permitted here');
+		}
 
 		$builderDefinition = $this->getBuilderDefinition($type);
 		$isNew = ($type === null || count($builderDefinition) == 0);
@@ -140,8 +141,9 @@ 
 	public function actionDeleteObject($type, $id, $redirect=true)
 	{
 		$this->deleteObject($id);
-		if ($redirect)
-			$this->redirect([$this->baseUrl.'list-objects', 'type' => $type]);
+		if ($redirect) {
+					$this->redirect([$this->baseUrl.'list-objects', 'type' => $type]);
+		}
 		return '';
 	}
 
@@ -188,11 +190,13 @@ 
 	public function actionEditObject($type, $id)
 	{
 		$form = $this->getPhoebeForm($type);
-		if (neon()->request->getIsAjax())
-			return $form->ajaxValidation();
+		if (neon()->request->getIsAjax()) {
+					return $form->ajaxValidation();
+		}
 		$object = $this->getObject($id);
-		if (!$object)
-			throw new NotFoundHttpException('The requested form was not found');
+		if (!$object) {
+					throw new NotFoundHttpException('The requested form was not found');
+		}
 		if ($form->processRequest()) {
 			$object->editObject($form->getData());
 			$this->redirect([$this->baseUrl.'list-objects', 'type'=>$type]);

neon/phoebe/controllers/appforms/api/FormController.php

Braces +8 added lines, -6 removed lines

@@ -40,10 +40,11 @@ 
 
 		// temporary hack to sort out uuids being passed in rather than
 		// a human readable definition.
-		if ($this->is_uuid($class))
-			$class=str_replace(['-','_'], ['a','Z'],Hash::uuid2uuid64($class));
-		else
-			$class = $phoebe->canonicaliseRef($class);
+		if ($this->is_uuid($class)) {
+					$class=str_replace(['-','_'], ['a','Z'],Hash::uuid2uuid64($class));
+		} else {
+					$class = $phoebe->canonicaliseRef($class);
+		}
 
 		$definition = neon()->request->getBodyParams();
 		if (!isset($definition['name'])) {
@@ -55,8 +56,9 @@ 
 
 		// save the class information
 		$phoebeClass = $phoebe->getClass($class);
-		if (!$phoebeClass)
-			$phoebeClass = $phoebe->addClass($class, 'phoebe');
+		if (!$phoebeClass) {
+					$phoebeClass = $phoebe->addClass($class, 'phoebe');
+		}
 		$phoebeClass->editClass([
 			'definition' => $definition,
 			'label' => $definition['name']

neon/phoebe/controllers/common/PhoebeController.php

Braces +21 added lines, -14 removed lines

@@ -61,8 +61,9 @@ 
 			$class = $this->getClass($type);
 			if ($builder) {
 				$definition = $class->getClassBuilderDefinition();
-			} else
-				$definition = $class->getClassFormDefinition();
+			} else {
+							$definition = $class->getClassFormDefinition();
+			}
 			$fieldCount = count($definition['fields']);
 			$isNewForm = count($definition) == 0 ? true : false;
 			$form = new \neon\core\form\Form($definition);
@@ -114,8 +115,9 @@ 
 	protected function getBuilderDefinition($classType)
 	{
 		$class = null;
-		if ($classType)
-			$class = $this->getClass($classType);
+		if ($classType) {
+					$class = $this->getClass($classType);
+		}
 		return $class ? $class->getClassBuilderDefinition() : [];
 	}
 
@@ -127,8 +129,9 @@ 
 	protected function getClassDefinition($classType)
 	{
 		$class = null;
-		if ($classType)
-			$class = $this->getClass($classType);
+		if ($classType) {
+					$class = $this->getClass($classType);
+		}
 		return $class ? $class->definition : [];
 	}
 
@@ -151,8 +154,9 @@ 
 	protected function getObject($id)
 	{
 		$object = $this->phoebe()->getObject($id);
-		if (!$object)
-			throw new \yii\web\HttpException(404);
+		if (!$object) {
+					throw new \yii\web\HttpException(404);
+		}
 		return $object;
 	}
 
@@ -164,8 +168,9 @@ 
 	protected function deleteObject($id)
 	{
 		$object = $this->phoebe()->getObject($id);
-		if ($object)
-			return $object->deleteObject();
+		if ($object) {
+					return $object->deleteObject();
+		}
 		return null;
 	}
 
@@ -177,8 +182,9 @@ 
 	protected function undeleteObject($id)
 	{
 		$object = $this->phoebe()->getObject($id);
-		if ($object)
-			return $object->undeleteObject();
+		if ($object) {
+					return $object->undeleteObject();
+		}
 		return null;
 	}
 
@@ -190,8 +196,9 @@ 
 	protected function destroyObject($id)
 	{
 		$object = $this->phoebe()->getObject($id);
-		if ($object)
-			return $object->destroyObject();
+		if ($object) {
+					return $object->destroyObject();
+		}
 		return null;
 	}
 }

neon/phoebe/controllers/common/PhoebeValidator.php

Braces +3 added lines, -2 removed lines

@@ -11,8 +11,9 @@
 	{
 		// get hold of the form
 		$form = neon('phoebe')->getForm($phoebeType, $classType, []);
-		if ($name)
-			$form->setName($name);
+		if ($name) {
+					$form->setName($name);
+		}
 		return $form->ajaxValidation();
 	}
 }