newicon / neon

neon/phoebe/controllers/database/IndexController.php

Spacing +3 added lines, -3 removed lines

@@ -144,7 +144,7 @@ 
 			}
 		}
 		return $this->render('create-table-raw.tpl', [
-			'class' => [ 'label' => 'Create Table'],
+			'class' => ['label' => 'Create Table'],
 			'form'=>$form
 		]);
 	}
@@ -162,11 +162,11 @@ 
 			'label' => $data['label'],
 			'fields' => []
 		];
-		$fields = json_decode($data['fields'],true);
+		$fields = json_decode($data['fields'], true);
 		if (is_array($fields)) {
 			foreach ($fields as $field) {
 				$field['classLabel'] = isset($field['classLabel']) ? $field['classLabel'] : ucwords($field['class']);
-				$field['label'] = isset($field['label']) ? $field['label'] : ucwords(str_replace(['_','-'],' ',$field['name']));
+				$field['label'] = isset($field['label']) ? $field['label'] : ucwords(str_replace(['_', '-'], ' ', $field['name']));
 				$definition['fields'][] = $field;
 			}
 			return $definition;

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

Spacing +4 added lines, -4 removed lines

@@ -62,7 +62,7 @@ 
 	 * Start the appForm Builder for this class
 	 * @param string $type  the class type of the object required
 	 */
-	public function actionEdit($type=null)
+	public function actionEdit($type = null)
 	{
 		if (!$this->canDevelop())
 			throw new \HttpException(403, 'This operation is not permitted here');
@@ -122,7 +122,7 @@ 
 		$grid = new \neon\core\grid\PhoebeGrid([
 			'phoebeType'=>$this->phoebeType,
 			'classType'=>$type,
-			'additionalColumns' => ['data','deleted']
+			'additionalColumns' => ['data', 'deleted']
 		]);
 		return $this->render('list', [
 			'grid' => $grid,
@@ -137,7 +137,7 @@ 
 	 * @param string $type the applicationForm class type the object belongs to
 	 * @param string $id the Object id
 	 */
-	public function actionDeleteObject($type, $id, $redirect=true)
+	public function actionDeleteObject($type, $id, $redirect = true)
 	{
 		$this->deleteObject($id);
 		if ($redirect)
@@ -150,7 +150,7 @@ 
 	 * @param type $classType
 	 * @return type
 	 */
-	public function actionValidateForm($classType, $name=null)
+	public function actionValidateForm($classType, $name = null)
 	{
 		return PhoebeValidator::validateForm('applicationForm', $classType, $name);
 	}

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

Spacing +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
 		// 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));
+			$class = str_replace(['-', '_'], ['a', 'Z'], Hash::uuid2uuid64($class));
 		else
 			$class = $phoebe->canonicaliseRef($class);
 
@@ -65,7 +65,7 @@ 
 		// close the migration
 		$this->endMigration();
 
-		$phoebeClass =  $phoebe->getClass($class);
+		$phoebeClass = $phoebe->getClass($class);
 		if ($phoebeClass == null) {
 			$phoebeClass = ['error' => "No class exists with a type of '$class'"];
 		}
@@ -81,7 +81,7 @@ 
 	 */
 	private function is_uuid($str)
 	{
-		return (strlen($str)==36 && substr_count($str, '-')==4);
+		return (strlen($str) == 36 && substr_count($str, '-') == 4);
 	}
 
 	/**

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

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 	 * @param string $type the phoebe class type
 	 * @return \neon\core\form\Form
 	 */
-	protected function getPhoebeForm($type, &$isNewForm=null, $addExtras=true, $builder=false)
+	protected function getPhoebeForm($type, &$isNewForm = null, $addExtras = true, $builder = false)
 	{
 		$form = null;
 		$isNewForm = false;

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

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
  */
 class PhoebeValidator
 {
-	public static function validateForm($phoebeType, $classType, $name=null)
+	public static function validateForm($phoebeType, $classType, $name = null)
 	{
 		// get hold of the form
 		$form = neon('phoebe')->getForm($phoebeType, $classType, []);

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

neon/phoebe/builders/database/assets/FormBuilderAsset.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 class FormBuilderAsset extends \yii\web\AssetBundle
 {
-	public $sourcePath = __DIR__ . '/publish';
+	public $sourcePath = __DIR__.'/publish';
 
 	public $js = [
 		'store.js',

neon/phoebe/builders/appforms/assets/AppFormBuilderAsset.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 
 class AppFormBuilderAsset extends \yii\web\AssetBundle
 {
-	public $sourcePath = __DIR__ . '/publish';
+	public $sourcePath = __DIR__.'/publish';
 
 	public $js = [
 		'manifest.js',

neon/phoebe/migrations/m171011_143735_forms_phoebe.php

Indentation +6 added lines, -6 removed lines

@@ -7,11 +7,11 @@
  */
 class m171011_143735_forms_phoebe extends Migration
 {
-    public function safeUp()
-    {
-    }
+	public function safeUp()
+	{
+	}
 
-    public function safeDown()
-    {
-    }
+	public function safeDown()
+	{
+	}
 }

neon/phoebe/App.php

Spacing +4 added lines, -4 removed lines

@@ -91,7 +91,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function getDataMap($key, $query='', $filters=[], $fields=[], $start=0, $length=100)
+	public function getDataMap($key, $query = '', $filters = [], $fields = [], $start = 0, $length = 100)
 	{
 		// convert generic form builder filters to phoebe class ones
 		$filters = Arr::replaceKeys($filters, ['uuid'=> 'class_type']);
@@ -173,7 +173,7 @@ 
 	 *   that you want to display and in what order
 	 * @return array
 	 */
-	public function getFormDefinition($phoebeType, $classType, array $fields=[])
+	public function getFormDefinition($phoebeType, $classType, array $fields = [])
 	{
 		$cacheKey = md5(serialize(func_get_args()));
 		return neon()->cacheArray->getOrSet($cacheKey, function() use ($classType, $phoebeType, $fields) {
@@ -426,7 +426,7 @@ 
 	 * @return bool - returns true if saved correctly or the set of errors if the
 	 *   form couldn't validate
 	 */
-	public function saveForm($phoebeType, $classType, $form=null, $formName=null, $metaInfo=null, &$uuid=null, &$changeLogUuids=[])
+	public function saveForm($phoebeType, $classType, $form = null, $formName = null, $metaInfo = null, &$uuid = null, &$changeLogUuids = [])
 	{
 		$changeLogUuids = [];
 		if (!$form) {
@@ -509,7 +509,7 @@ 
 					$itemKey = substr($key, strlen($this->formMetaDataSourceString));
 					if (empty($meta['dataSources'][$itemKey]))
 						$meta['dataSources'][$itemKey] = $v;
-				} else if ($key==$this->formMetaReturnUrlString && empty($meta['returnUrl'])) {
+				} else if ($key == $this->formMetaReturnUrlString && empty($meta['returnUrl'])) {
 					$meta['returnUrl'] = $v;
 				}
 			}

Braces +57 added lines, -38 removed lines

@@ -251,16 +251,18 @@ 
 		$formDefinition = [];
 		if (!empty($options['uuid'])) {
 			$object = $phoebe->getObject($options['uuid']);
-			if (!$object)
-				throw new \RuntimeException('The requested form object was not found. Uuid='.$options['uuid']);
+			if (!$object) {
+							throw new \RuntimeException('The requested form object was not found. Uuid='.$options['uuid']);
+			}
 			$class = $object->getIPhoebeClass();
 			$formDefinition = $class->getClassFormDefinition($fields);
 		} else {
 			// otherwise get a clean class
 			if ($classType) {
 				$formDefinition = $this->getFormDefinition($phoebeType, $classType, $fields);
-				if (!count($formDefinition))
-					throw new \RuntimeException('The requested form type was not found. Type='.$classType);
+				if (!count($formDefinition)) {
+									throw new \RuntimeException('The requested form type was not found. Type='.$classType);
+				}
 			}
 		}
 		$fieldCount = count($formDefinition['fields']);
@@ -268,12 +270,14 @@ 
 
 
 		// temporary code to cover problems with differences between appForms and ddsForms
-		if ($phoebeType !== 'applicationForm' && !empty($options['initialiseFromDds']))
-			throw new \RuntimeException('Only applicationForms work with initialiseFromDds');
+		if ($phoebeType !== 'applicationForm' && !empty($options['initialiseFromDds'])) {
+					throw new \RuntimeException('Only applicationForms work with initialiseFromDds');
+		}
 
 		// set the form id
-		if (!empty($options['id']))
-			$form->setId($options['id']);
+		if (!empty($options['id'])) {
+					$form->setId($options['id']);
+		}
 		$formId = $form->getId();
 		if ($printOnly) {
 			$form->printOnly = true;
@@ -284,17 +288,20 @@ 
 		}
 
 		// set the forms label - allow clearing of it via empty string
-		if (isset($options['label']))
-			$form->setLabel($options['label']);
+		if (isset($options['label'])) {
+					$form->setLabel($options['label']);
+		}
 
 
 		// check to see if we are not posting from the client, populate it from the database
 		// !set the form name before checking data set!
-		if (!empty($options['name']))
-			$form->setName($options['name']);
+		if (!empty($options['name'])) {
+					$form->setName($options['name']);
+		}
 		if (!empty($options['initialiseFromDds']) && (!$object || !$object->data)) {
-			if (!$object)
-				$object = $phoebe->createStubObject($classType);
+			if (!$object) {
+							$object = $phoebe->createStubObject($classType);
+			}
 			$object->initialiseFromDds($options['initialiseFromDds']);
 		}
 		if ($object && !$form->hasRequestData()) {
@@ -302,8 +309,9 @@ 
 		}
 
 		if (!($printOnly || $readOnly)) {
-			if (!empty($options['uuid']))
-				$form->addFieldHidden("{$this->formMetaPrefix}{$this->formMetaUuidString}", ['value'=>$options['uuid']]);
+			if (!empty($options['uuid'])) {
+							$form->addFieldHidden("{$this->formMetaPrefix}{$this->formMetaUuidString}", ['value'=>$options['uuid']]);
+			}
 
 			// set any additional data sources
 			if (!empty($options['dataSources'])) {
@@ -311,8 +319,9 @@ 
 					$form->addFieldHidden("{$this->formMetaPrefix}{$this->formMetaDataSourceString}$key", ['value'=>$value]);
 					// for dds forms, set the values on the form too for initial display
 					if ($phoebeType == 'daedalus') {
-						if ($form->hasField($key))
-							$form->getField($key)->setValue($value);
+						if ($form->hasField($key)) {
+													$form->getField($key)->setValue($value);
+						}
 					}
 				}
 			}
@@ -323,8 +332,9 @@ 
 			if (!empty($options['mapFilters'])) {
 				foreach ($options['mapFilters'] as $key=>$filters) {
 					$f = $form->getField($key);
-					if ($f && isset($f->dataMapFilters))
-						$f->dataMapFilters = $filters;
+					if ($f && isset($f->dataMapFilters)) {
+											$f->dataMapFilters = $filters;
+					}
 				}
 			}
 
@@ -334,8 +344,9 @@ 
 			if (!empty($options['mapFields'])) {
 				foreach ($options['mapFields'] as $key=>$mapFields) {
 					$f = $form->getField($key);
-					if ($f && isset($f->dataMapFields))
-						$f->dataMapFields = $mapFields;
+					if ($f && isset($f->dataMapFields)) {
+											$f->dataMapFields = $mapFields;
+					}
 				}
 			}
 
@@ -360,20 +371,24 @@ 
 			}
 
 			// set the forms action
-			if (!empty($options['action']))
-				$form->setAction($options['action']);
+			if (!empty($options['action'])) {
+							$form->setAction($options['action']);
+			}
 
 			// set whether or not ajax validation is required
-			if (isset($options['enableAjaxValidation']))
-				$form->enableAjaxValidation = (boolean) $options['enableAjaxValidation'];
+			if (isset($options['enableAjaxValidation'])) {
+							$form->enableAjaxValidation = (boolean) $options['enableAjaxValidation'];
+			}
 
 			// set whether or not ajax submission is required
-			if (isset($options['enableAjaxSubmission']))
-				$form->enableAjaxSubmission = (boolean) $options['enableAjaxSubmission'];
+			if (isset($options['enableAjaxSubmission'])) {
+							$form->enableAjaxSubmission = (boolean) $options['enableAjaxSubmission'];
+			}
 
 			// set where the form will check itself via ajaxValidation
-			if (!empty($options['ajaxValidationUrl']))
-				$form->validationUrl = $options['ajaxValidationUrl'];
+			if (!empty($options['ajaxValidationUrl'])) {
+							$form->validationUrl = $options['ajaxValidationUrl'];
+			}
 
 			// set where the browser will go to after completion of the form
 			if (!empty($options['returnUrl'])) {
@@ -433,8 +448,9 @@ 
 			$definition = $this->getFormDefinition($phoebeType, $classType);
 			$form = new \neon\core\form\Form($definition);
 		}
-		if (!empty($formName))
-			$form->setName($formName);
+		if (!empty($formName)) {
+					$form->setName($formName);
+		}
 		if ($form->processRequest()) {
 			$data = $form->getData();
 			// prevent multiple renders resulting in multiple saves of the form
@@ -456,13 +472,15 @@ 
 					$changeLogUuids['add'] = $object->getChangeLogUuid();
 				}
 				$uuid = $object->uuid;
-				if (!empty($meta['dataSources']))
-					$object->setDataSources($meta['dataSources']);
+				if (!empty($meta['dataSources'])) {
+									$object->setDataSources($meta['dataSources']);
+				}
 				if ($object->editObject($data) === true) {
 					$alreadySubmitted[$submittedCheck] = $uuid;
 					$changeLogUuids['edit'] = $object->getChangeLogUuid();
-					if (!empty($meta['returnUrl']))
-						neon()->response->redirect(html_entity_decode($meta['returnUrl']));
+					if (!empty($meta['returnUrl'])) {
+											neon()->response->redirect(html_entity_decode($meta['returnUrl']));
+					}
 					return true;
 				}
 			} else {
@@ -507,8 +525,9 @@ 
 					$meta['uuid'] = $v;
 				} else if (strpos($key, $this->formMetaDataSourceString) === 0) {
 					$itemKey = substr($key, strlen($this->formMetaDataSourceString));
-					if (empty($meta['dataSources'][$itemKey]))
-						$meta['dataSources'][$itemKey] = $v;
+					if (empty($meta['dataSources'][$itemKey])) {
+											$meta['dataSources'][$itemKey] = $v;
+					}
 				} else if ($key==$this->formMetaReturnUrlString && empty($meta['returnUrl'])) {
 					$meta['returnUrl'] = $v;
 				}