newicon / neon

neon/firefly/services/ImageManager.php

Spacing +4 added lines, -4 removed lines

@@ -37,11 +37,11 @@ 
 
 		if (Arr::get($params, 'fit', false)) {
 			// add callback functionality to retain maximal original image size
-			$image->fit($width, $height, function ($constraint) {
+			$image->fit($width, $height, function($constraint) {
 				$constraint->upsize();
 			});
 		} elseif ($width || $height) {
-			$image->resize($width, $height, function ($constraint) {
+			$image->resize($width, $height, function($constraint) {
 				$constraint->aspectRatio();
 				$constraint->upsize();
 			});
@@ -103,7 +103,7 @@ 
 	 */
 	public function runFilter(Image $image, $filter)
 	{
-		$filters = explode(',',$filter);
+		$filters = explode(',', $filter);
 		if (in_array('greyscale', $filters, true)) {
 			$this->runGreyscaleFilter($image);
 		}
@@ -155,7 +155,7 @@ 
 			$x = Arr::get($params, 'x', null);
 			$y = Arr::get($params, 'y', null);
 		}
-		if ($w == 0 && $h == 0 && $x == 0 && $y ==0) {
+		if ($w == 0 && $h == 0 && $x == 0 && $y == 0) {
 			return $image;
 		}
 		$image->crop($w, $h, $x, $y);

neon/core/grid/column/Button.php

Spacing +8 added lines, -8 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param array $options - additional html attribute options
 	 * @return $this
 	 */
-	public function setEdit($url, array $options=[])
+	public function setEdit($url, array $options = [])
 	{
 		$this->_buttons['edit'] = $options;
 		$this->_buttons['edit']['url'] = $url;
@@ -43,7 +43,7 @@ 
 	 * @param array|string $url
 	 * @param array $options - additional html attribute options
 	 */
-	public function setDelete($url, array $options=[])
+	public function setDelete($url, array $options = [])
 	{
 		$this->_buttons['delete'] = $options;
 		$this->_buttons['delete']['url'] = $url;
@@ -59,7 +59,7 @@ 
 	 *   will append text to the CSS class e.g. btn-$type
 	 * @param array $options - passed to Html::buttonCustom
 	 */
-	public function addButton($key, $url, $text, $icon='', $class='', $options=[])
+	public function addButton($key, $url, $text, $icon = '', $class = '', $options = [])
 	{
 		$this->_buttons[$key] = array_merge(compact('url', 'text', 'icon', 'class'), $options);
 	}
@@ -83,7 +83,7 @@ 
 	 */
 	public function getWidth()
 	{
-		return 'calc(' . (count($this->_buttons)+count($this->_actions)) . ' * ' .$this->buttonWidth . ')';
+		return 'calc('.(count($this->_buttons) + count($this->_actions)).' * '.$this->buttonWidth.')';
 	}
 
 	/**
@@ -97,11 +97,11 @@ 
 				if (!isset($btnOps['data']))
 					$btnOps['data'] = [];
 				if ($this->getGrid()->hasIndexColumn())
-					$btnOps['data'] = ['index' => $model[$this->getGrid()->getIndexColumn()->getKey()] ];
+					$btnOps['data'] = ['index' => $model[$this->getGrid()->getIndexColumn()->getKey()]];
 				$func = 'buttonCustom';
 				if ($buttonKey === 'delete') {
 					$func = 'buttonDelete';
-					$btnOps['data'] = Arr::merge($btnOps['data'], ['data'=> ['delete-ajax' => true ]]);
+					$btnOps['data'] = Arr::merge($btnOps['data'], ['data'=> ['delete-ajax' => true]]);
 				}
 				if ($buttonKey === 'edit') {
 					$func = 'buttonEdit';
@@ -109,10 +109,10 @@ 
 				$text = Arr::remove($btnOps, 'text', '');
 				$url = Arr::remove($btnOps, 'url', '');
 				$url = $this->grid->replaceRowTagsWithValues($url, $model);
-				$btnOps['class'] = Arr::get($btnOps, 'class', '') . ' btn-grid';
+				$btnOps['class'] = Arr::get($btnOps, 'class', '').' btn-grid';
 				$buttons[] = Html::$func($url, $text, $btnOps);
 			}
-			return '<div class="btn-group btn-column">' . implode('', $buttons) . '</div>';
+			return '<div class="btn-group btn-column">'.implode('', $buttons).'</div>';
 		}
 	}
 

Braces +6 added lines, -4 removed lines

@@ -94,10 +94,12 @@
 		if (count($this->_buttons)) {
 			$buttons = [];
 			foreach ($this->_buttons as $buttonKey => $btnOps) {
-				if (!isset($btnOps['data']))
-					$btnOps['data'] = [];
-				if ($this->getGrid()->hasIndexColumn())
-					$btnOps['data'] = ['index' => $model[$this->getGrid()->getIndexColumn()->getKey()] ];
+				if (!isset($btnOps['data'])) {
+									$btnOps['data'] = [];
+				}
+				if ($this->getGrid()->hasIndexColumn()) {
+									$btnOps['data'] = ['index' => $model[$this->getGrid()->getIndexColumn()->getKey()] ];
+				}
 				$func = 'buttonCustom';
 				if ($buttonKey === 'delete') {
 					$func = 'buttonDelete';

neon/cms/components/Daedalus.php

Spacing +13 added lines, -13 removed lines

@@ -173,7 +173,7 @@ 
 	 * @param array $params  any paramters from @see dds and dds_choice
 	 * @param object $renderer  the render object
 	 */
-	public function __construct($params, $renderer=null)
+	public function __construct($params, $renderer = null)
 	{
 		$this->params = $params;
 		$this->renderer = $renderer;
@@ -198,7 +198,7 @@ 
 			$request = self::convertDataRequestToJson($this->params['data']);
 			$responded = self::$page->requestWidgetData($request, $data, $id, false, $meta);
 			if ($responded) {
-				$result['hasData'] = count($data)>0;
+				$result['hasData'] = count($data) > 0;
 				$result['hasResponse'] = true;
 				$result['data'] = $data;
 				$result['meta'] = $meta;
@@ -223,21 +223,21 @@ 
 	 * @return null|errors|array  returns errors if not valid, null if called
 	 *   from within a template and the data if from within a plugin
 	 */
-	protected function queryChoice($template=true)
+	protected function queryChoice($template = true)
 	{
 		// check usage
 		if (!isset($this->params['member']))
-			return "Usage: you must provide a 'member' parameter. You provided ".print_r($this->params,true);
+			return "Usage: you must provide a 'member' parameter. You provided ".print_r($this->params, true);
 		if ($this->renderer && !isset($this->params['assign']))
-			return "Usage: you must provide an 'assign' parameter. You provided ".print_r($this->params,true);
-		if (strpos($this->params['member'],':') === false && !isset($this->params['class']))
+			return "Usage: you must provide an 'assign' parameter. You provided ".print_r($this->params, true);
+		if (strpos($this->params['member'], ':') === false && !isset($this->params['class']))
 			return "Usage: if you do not scope the member as class::member then you must provide the class parameter";
 
 		// extract out class and member
 		$class = null;
 		$member = null;
-		if (strpos($this->params['member'],':') !== false)
-			list ($class, $member) = explode(':', str_replace('::',':',$this->params['member']));
+		if (strpos($this->params['member'], ':') !== false)
+			list ($class, $member) = explode(':', str_replace('::', ':', $this->params['member']));
 		else {
 			$class = $this->params['class'];
 			$member = $this->params['member'];
@@ -285,10 +285,10 @@ 
 	{
 		// check usage
 		if (!isset($this->params['class']))
-			return "Usage: you must provide a 'class' parameter. You provided ".print_r($this->params,true);
+			return "Usage: you must provide a 'class' parameter. You provided ".print_r($this->params, true);
 
 		if ($this->renderer && !isset($this->params['assign']))
-			return "Usage: you must provide an 'assign' parameter. You provided ".print_r($this->params,true);
+			return "Usage: you must provide an 'assign' parameter. You provided ".print_r($this->params, true);
 
 		$fields = isset($this->params['fields']) ? $this->params['fields'] : [];
 
@@ -384,7 +384,7 @@ 
 				if (is_array($dps['dds_filter']))
 					$filters[] = json_encode($dps['dds_filter']);
 				// else deprecated json approach
-				else if (strpos(trim($dps['dds_filter']), '[')!==0)
+				else if (strpos(trim($dps['dds_filter']), '[') !== 0)
 					$filters[] = "[$dps[dds_filter]]";
 				else
 					$filters[] = $dps['dds_filter'];
@@ -392,7 +392,7 @@ 
 
 			// create the filters clause
 			if (count($filters))
-				$data[] = "'filters':".implode(',',$filters);
+				$data[] = "'filters':".implode(',', $filters);
 
 			// sort out the order
 			if (isset($dps['dds_order'])) {
@@ -457,7 +457,7 @@ 
 				$classType = $d['_class_type'];
 				foreach ($d as $field=>$value) {
 					// ignore all bookkeeping fields
-					if (strpos($field, '_')===0)
+					if (strpos($field, '_') === 0)
 						continue;
 					$edit[$i][$field] = self::createFieldEditable($classType, $field, $d['_uuid'], $value);
 				}

neon/core/helpers/Html.php

Braces +26 added lines, -18 removed lines

@@ -154,8 +154,9 @@ 
 			self::processTags($allowableTags, $tagsProcessed);
 		}
 		if (is_array($value)) {
-			foreach ($value as $k => $v)
-				$value[$k] = static::sanitise($v, $allowableTags);
+			foreach ($value as $k => $v) {
+							$value[$k] = static::sanitise($v, $allowableTags);
+			}
 		} else {
 			if (!is_null($value)) {
 				if (isset($tagsProcessed[$allowableTags])) {
@@ -189,14 +190,16 @@ 
 	{
 		profile_begin('Html::purify', 'html');
 		if (is_array($value)) {
-			foreach ($value as $k => $v)
-				$value[$k] = static::purify($v, $allowedTags);
+			foreach ($value as $k => $v) {
+							$value[$k] = static::purify($v, $allowedTags);
+			}
 		} else {
 			if (!is_null($value)) {
-				if ($allowedTags === false)
-					$value = trim(HtmlPurifier::process($value));
-				else
-					$value = trim(HtmlPurifier::process(strip_tags($value, $allowedTags)));
+				if ($allowedTags === false) {
+									$value = trim(HtmlPurifier::process($value));
+				} else {
+									$value = trim(HtmlPurifier::process(strip_tags($value, $allowedTags)));
+				}
 			}
 		}
 		profile_end('Html::purify', 'html');
@@ -214,8 +217,9 @@ 
 	public static function encodeEntities($value, $entities = ENT_QUOTES)
 	{
 		if (is_array($value)) {
-			foreach ($value as $k => $v)
-				$value[$k] = static::encodeEntities($v, $entities);
+			foreach ($value as $k => $v) {
+							$value[$k] = static::encodeEntities($v, $entities);
+			}
 		} else {
 			$value = htmlentities($value, $entities);
 		}
@@ -251,18 +255,22 @@ 
 	 */
 	public static function highlight($search, $html, $empty='')
 	{
-		if ($html === null)
-			return neon()->formatter->nullDisplay;
-		if ($html === '')
-			return $empty;
-		if (empty($search))
-			return $html;
+		if ($html === null) {
+					return neon()->formatter->nullDisplay;
+		}
+		if ($html === '') {
+					return $empty;
+		}
+		if (empty($search)) {
+					return $html;
+		}
 
 		profile_begin('Html::Highlight');
 		// escape search and html entities as otherwise the loadHTML or appendXML
 		// can blow up if there are < & > in the data
-		if (!is_array($search))
-			$search = [$search];
+		if (!is_array($search)) {
+					$search = [$search];
+		}
 		try {
 			foreach ($search as $s) {
 				// now search and rebuild the data

neon/core/view/SmartySharedPlugins.php

Spacing +32 added lines, -32 removed lines

@@ -148,7 +148,7 @@ 
 			$params['content'] = $content;
 			if (class_exists($class)) {
 				$widget = new $class();
-				foreach($params as $key => $val) {
+				foreach ($params as $key => $val) {
 					if ($widget->hasProperty($key))
 						$widget->$key = $val;
 				}
@@ -178,7 +178,7 @@ 
 		$type = Arr::getRequired($params, 'type');
 		$options = Arr::get($params, 'options', []);
 		if (!is_array($options))
-			throw new \InvalidArgumentException('"options" property must be an array "' . gettype($options) . '" given');
+			throw new \InvalidArgumentException('"options" property must be an array "'.gettype($options).'" given');
 		$default = Arr::get($params, 'default', '');
 
 		$value = neon()->view->styleManager->add($name, $default, $type, $options);
@@ -215,7 +215,7 @@ 
 		if (!isset($params['route'])) {
 			trigger_error("path: missing 'route' parameter");
 		}
-		array_unshift($params, $params['route']) ;
+		array_unshift($params, $params['route']);
 		unset($params['route']);
 		return Url::toRoute($params, true);
 	}
@@ -233,7 +233,7 @@ 
 	 */
 	public function csrf_element($params)
 	{
-		return '<input type="hidden" name="'.neon()->request->csrfParam.'" value="' . neon()->request->getCsrfToken() . '" />';
+		return '<input type="hidden" name="'.neon()->request->csrfParam.'" value="'.neon()->request->getCsrfToken().'" />';
 	}
 
 	/**
@@ -329,39 +329,39 @@ 
 			$params['widths'] = self::IMG_SRCSET_DEFAULT_WIDTHS;
 		}
 
-		$id = Arr::pull($params,'firefly_id');
-		$widths = array_map('trim',explode(',',Arr::pull($params,'widths')));
+		$id = Arr::pull($params, 'firefly_id');
+		$widths = array_map('trim', explode(',', Arr::pull($params, 'widths')));
 		$srcsetParts = [];
 		$srcSizeParts = [];
 		$useResolutions = [];
 		$minBreak = false;
 		if (isset($params['min-break'])) {
-			$minBreak = Arr::pull($params,'min-break');
-			if (!Str::validateNumericWithUnits($minBreak,['px','vw'])) {
+			$minBreak = Arr::pull($params, 'min-break');
+			if (!Str::validateNumericWithUnits($minBreak, ['px', 'vw'])) {
 				throw new \InvalidArgumentException("The min-break value '".$minBreak."' should be numeric and end with 'px' or 'vw'");
 			}
 		}
 		if (isset($params['breaks'])) {
 			// optionally validate & collate the breaks for the 'sizes' attribute
-			$breaks = array_map('trim',explode(',',Arr::pull($params,'breaks')));
+			$breaks = array_map('trim', explode(',', Arr::pull($params, 'breaks')));
 			foreach ($breaks as $idx=>$break) {
-				if (!Str::validateNumericWithUnits($break, ['px','vw'])) {
+				if (!Str::validateNumericWithUnits($break, ['px', 'vw'])) {
 					throw new \InvalidArgumentException("The break value '".$break."' should be numeric and end with 'px' or 'vw'");
 				}
-				if ($idx==0 && $minBreak) {
+				if ($idx == 0 && $minBreak) {
 					$break = "(min-width: ".$minBreak.") ".$break;
 				}
-				$srcSizeParts[]=$break;
+				$srcSizeParts[] = $break;
 			}
 		}
 		elseif (isset($params['resolutions'])) {
 			// optionally validate & collate any specified resolutions to use (if breaks haven't been specified)
-			$useResolutions = array_map('trim',explode(',',Arr::pull($params,'resolutions')));
-			if (count($useResolutions) != count($widths)-1) {
-				throw new \InvalidArgumentException("Since there are ".count($widths)." widths you should specify ".(count($widths)-1)." resolutions to apply");
+			$useResolutions = array_map('trim', explode(',', Arr::pull($params, 'resolutions')));
+			if (count($useResolutions) != count($widths) - 1) {
+				throw new \InvalidArgumentException("Since there are ".count($widths)." widths you should specify ".(count($widths) - 1)." resolutions to apply");
 			}
 			foreach ($useResolutions as $useResolution) {
-				if (!Str::validateNumericWithUnits($useResolution,['x'])) {
+				if (!Str::validateNumericWithUnits($useResolution, ['x'])) {
 					throw new \InvalidArgumentException("The resolution '".$useResolution."' is not a valid resolution, it should be numeric and then end with an 'x'");
 				}
 			}
@@ -369,7 +369,7 @@ 
 		else {
 			// if neither 'breaks' or 'resolutions' was specified then use the widths
 			foreach ($widths as $idx=>$width) {
-				if ($idx==0 && $minBreak) {
+				if ($idx == 0 && $minBreak) {
 					$width = "(min-width: ".$minBreak.") ".$width;
 				}
 				$srcSizeParts[] = $width."px";
@@ -388,31 +388,31 @@ 
 			if (!is_numeric($width)) {
 				throw new \InvalidArgumentException("One of the widths specified was not numeric '".$width."'");
 			}
-			$useParams = ['id'=>$id, 'w'=>(int)$width];
+			$useParams = ['id'=>$id, 'w'=>(int) $width];
 			if ($useQuality) {
 				$useParams['q'] = $useQuality;
 			}
 			$imageUrl = $this->firefly_image($useParams);
 			if ($useResolutions) {
-				$srcsetParts[] = $imageUrl.( ($idx>=1) ? ' '.$useResolutions[$idx-1] : '' );
+				$srcsetParts[] = $imageUrl.(($idx >= 1) ? ' '.$useResolutions[$idx - 1] : '');
 			}
 			else {
-				$srcsetParts[] = $imageUrl . ' ' . $width . 'w';
+				$srcsetParts[] = $imageUrl.' '.$width.'w';
 			}
-			if ($idx==0 && !isset($params['src-width']) && !isset($params['src'])) {
+			if ($idx == 0 && !isset($params['src-width']) && !isset($params['src'])) {
 				$params['src'] = $imageUrl;
 			}
 		}
 
 		// collate the tag attributes
 		if (isset($params['src-width'])) {
-			$srcWidth = Arr::pull($params,'src-width');
+			$srcWidth = Arr::pull($params, 'src-width');
 			if (!is_numeric($srcWidth)) {
 				throw new \InvalidArgumentException("src-width '".$srcWidth."' must be numeric");
 			}
-			$useParams = ['id'=>$id, 'w'=>(int)$srcWidth];
+			$useParams = ['id'=>$id, 'w'=>(int) $srcWidth];
 			if (isset($params['quality'])) {
-				$useParams = (int)$params['quality'];
+				$useParams = (int) $params['quality'];
 			}
 			if (!isset($params['src'])) {
 				$params['src'] = $this->firefly_image($useParams);
@@ -426,12 +426,12 @@ 
 		}
 
 		// finally generate the tag ... note that these can overwrite the previously generated params
-		$tagAttributes =  [];
+		$tagAttributes = [];
 		foreach ($params as $key=>$value) {
 			$tagAttributes[] = $key."='".htmlspecialchars($value)."'";
 		}
 
-		return "<img ".implode(' ',$tagAttributes).">";
+		return "<img ".implode(' ', $tagAttributes).">";
 	}
 
 	/**
@@ -462,7 +462,7 @@ 
 			else
 				return $value;
 		} else {
-			return "Usage: you must provide an 'app' and a 'name' parameter. You provided ".print_r($params,true);
+			return "Usage: you must provide an 'app' and a 'name' parameter. You provided ".print_r($params, true);
 		}
 	}
 
@@ -484,7 +484,7 @@ 
 	{
 		$format = 'Y-m-d H:i:s';
 		if (isset($params['stamp']))
-			return date($format, (integer)$params['stamp']);
+			return date($format, (integer) $params['stamp']);
 		return date($format);
 	}
 
@@ -496,7 +496,7 @@ 
 	 */
 	public function json($params)
 	{
-		return '<pre>' . json_encode($params, JSON_PRETTY_PRINT) . '</pre>';
+		return '<pre>'.json_encode($params, JSON_PRETTY_PRINT).'</pre>';
 	}
 
 	/**
@@ -511,7 +511,7 @@ 
 	 * @return int
 	 * @throws \Exception
 	 */
-	public function getAssetPosition($params, $default='end')
+	public function getAssetPosition($params, $default = 'end')
 	{
 		$position = Arr::get($params, 'pos', Arr::get($params, 'position', $default));
 		$positions = [
@@ -522,7 +522,7 @@ 
 			'load'  => View::POS_LOAD,
 		];
 		if (!array_key_exists($position, $positions)) {
-			throw new \Exception('The javascript position specified must be one of ' . print_r(array_keys($positions)) . ', you specified "'.$position.'"');
+			throw new \Exception('The javascript position specified must be one of '.print_r(array_keys($positions)).', you specified "'.$position.'"');
 		}
 		return $positions[$position];
 	}
@@ -726,7 +726,7 @@ 
 	public function protectHtmlEntities($params, $smarty)
 	{
 		$input = $params['input'];
-		$output = str_replace('&','&amp;', $input);
+		$output = str_replace('&', '&amp;', $input);
 		if (!empty($params['assign'])) {
 			$smarty->assign($params['assign'], $output);
 		} else {

neon/core/grid/column/IColumn.php

Spacing +6 added lines, -6 removed lines

@@ -14,9 +14,9 @@ 
 
 interface IColumn
 {
-	public function __construct($config=[]);
+	public function __construct($config = []);
 
-	public function renderDataCell($model, $key, $index);  // GRID: called by grid
+	public function renderDataCell($model, $key, $index); // GRID: called by grid
 
 	/**
 	 * Renders the contents of the cell (can be overriden by setting self::setDataCellContentFunction)
@@ -149,7 +149,7 @@ 
 	 * Set whether this column is sortable or not
 	 * @param bool $bool
 	 */
-	public function setIsSortable($bool=true);
+	public function setIsSortable($bool = true);
 
 	/**
 	 * Is the column sortable
@@ -250,7 +250,7 @@ 
 	 *
 	 * @param boolean $bool
 	 */
-	public function setAsIndex($bool=true);
+	public function setAsIndex($bool = true);
 
 	/**
 	 * Set the title of the column
@@ -299,7 +299,7 @@ 
 	 *
 	 * @return null|callable
 	 */
-	public function getSearchFunction();  // GRID: called by grid
+	public function getSearchFunction(); // GRID: called by grid
 
 	/**
 	 * Set the database field name. This is used to lookup the row data, and in filters and ordering
@@ -362,7 +362,7 @@ 
 	 * @param array $linkOptions
 	 * @return mixed
 	 */
-	public function addRowAction($key, $text, $linkOptions=[]);
+	public function addRowAction($key, $text, $linkOptions = []);
 
 	public function renderRowActions($model, $key, $index);
 

neon/core/grid/column/Column.php

Spacing +22 added lines, -22 removed lines

@@ -173,7 +173,7 @@ 
 		return $this->_width;
 	}
 
-	public function __construct($config=[])
+	public function __construct($config = [])
 	{
 		parent::__construct($config);
 		if (!isset($config['key'])) {
@@ -273,7 +273,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function setIsSortable($bool=true)
+	public function setIsSortable($bool = true)
 	{
 		$this->_sortable = $bool;
 	}
@@ -286,7 +286,7 @@ 
 		return $this->_sortable;
 	}
 
-	public function setAsIndex($bool=true)
+	public function setAsIndex($bool = true)
 	{
 		$this->grid->setIndexedByColumn($this->key);
 		// thi is a bit gnarly but tests for yii Active record data providers specifically
@@ -354,7 +354,7 @@ 
 			return $this->_dataCellContentFunction;
 		}
 		// check for convention
-		$functionName = 'render' . $this->key;
+		$functionName = 'render'.$this->key;
 		if (method_exists($this->grid, $functionName) && $functionName !== 'renderfile') {
 			return $functionName;
 		}
@@ -425,7 +425,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function setDbField($field){
+	public function setDbField($field) {
 		$this->_dbField = $field;
 		return $this;
 	}
@@ -433,8 +433,8 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function getDbField(){
-		if ($this->_dbField === null){
+	public function getDbField() {
+		if ($this->_dbField === null) {
 			// set to be the key
 			$this->_dbField = $this->key;
 		}
@@ -451,7 +451,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function setDbSortField($field){
+	public function setDbSortField($field) {
 		$this->_dbSortField = $field;
 		return $this;
 	}
@@ -459,8 +459,8 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function getDbSortField(){
-		if ($this->_dbSortField === null){
+	public function getDbSortField() {
+		if ($this->_dbSortField === null) {
 			// set to be the key
 			$this->_dbSortField = $this->dbField;
 		}
@@ -509,9 +509,9 @@ 
 		if ($this->grid->hasSort($this->key)) {
 			$sort = $this->grid->hasSortDescending() ? ' - ' : ' + ';
 		}
-		$sortParam = $this->grid->hasSortDescending() ? $this->key : '-' . $this->key;
+		$sortParam = $this->grid->hasSortDescending() ? $this->key : '-'.$this->key;
 		$url = neon()->getUrlManager()->createUrl([\Yii::$app->controller->getRoute(), $this->grid->id => ['sort' => $sortParam]]);
-		return Html::a($this->getTitle() . $sort, $url, ['data-sort'=>$sortParam]);
+		return Html::a($this->getTitle().$sort, $url, ['data-sort'=>$sortParam]);
 	}
 
 	/**
@@ -565,7 +565,7 @@ 
 	public function getFilterField()
 	{
 		$field = $this->getBaseFilterField();
-		foreach($this->filterFieldConfig as $key => $value)
+		foreach ($this->filterFieldConfig as $key => $value)
 			$field[$key] = $value;
 		return $field;
 	}
@@ -581,7 +581,7 @@ 
 
 	public function setMemberConfig($config)
 	{
-		foreach($config as $key => $value) {
+		foreach ($config as $key => $value) {
 			if (isset($this->member->$key))
 				$this->member->$key = $value;
 		}
@@ -591,7 +591,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function getCellData($row, $noValue='-')
+	public function getCellData($row, $noValue = '-')
 	{
 		$data = null;
 		$key = $this->getKey();
@@ -644,7 +644,7 @@ 
 			if (is_array($display)) {
 				$display = implode(',', $display);
 			}
-			return "<span title=\"".str_replace('"',"'", html_entity_decode(strip_tags($display)))."\">$out</span>";
+			return "<span title=\"".str_replace('"', "'", html_entity_decode(strip_tags($display)))."\">$out</span>";
 		}
 		return $this->getCellData($model);
 	}
@@ -654,7 +654,7 @@ 
 	 */
 	public function getFieldName()
 	{
-		return $this->getGrid()->getId() . '[' . $this->key . '][search]';
+		return $this->getGrid()->getId().'['.$this->key.'][search]';
 	}
 
 	/**
@@ -728,12 +728,12 @@ 
 		throw new \Exception('Unable to call a valid search function');
 	}
 
-	protected $_actions =[];
+	protected $_actions = [];
 
 	/**
 	 * @inheritDoc
 	 */
-	public function addRowAction($key, $text, $linkOptions=[])
+	public function addRowAction($key, $text, $linkOptions = [])
 	{
 		$linkOptions['text'] = $text;
 		$linkOptions['data-action'] = $key;
@@ -759,7 +759,7 @@ 
 		}
 		$out = '<div class="neonGrid_rowActions">';
 		$i = 0;
-		foreach($this->_actions as $actionKey => $linkOptions) {
+		foreach ($this->_actions as $actionKey => $linkOptions) {
 			if ($i > 0) $out .= ' | ';
 			if (isset($linkOptions['function'])) {
 				$func = $linkOptions['function'];
@@ -786,7 +786,7 @@ 
 	 * @param array $arguments of arguments
 	 * @return mixed
 	 */
-	public function callFunction($function, $arguments=[])
+	public function callFunction($function, $arguments = [])
 	{
 		if (is_string($function)) {
 			return call_user_func_array([$this->grid, $function], $arguments);
@@ -811,7 +811,7 @@ 
 			if (count($columnData)) {
 				$this->member->dataMapFilters = ['uuid' => $columnData];
 			}
-			foreach($models as $model) {
+			foreach ($models as $model) {
 				$this->member->makeMapRequest($this->getCellData($model, null));
 			}
 		}

neon/phoebe/services/adapters/appforms/PhoebeObject.php

Braces +33 added lines, -22 removed lines

@@ -41,8 +41,9 @@ 
 	public function editObject($changes)
 	{
 		// check if there's anything to do
-		if (empty($changes) || $changes == $this->data)
-			return true;
+		if (empty($changes) || $changes == $this->data) {
+					return true;
+		}
 
 		// extract the data and save appropriately to
 		// the associated database tables ... if any
@@ -59,8 +60,9 @@ 
 	public function setDataSources($sources)
 	{
 		foreach ($sources as $key=>$value) {
-			if (empty($value))
-				unset($sources[$key]);
+			if (empty($value)) {
+							unset($sources[$key]);
+			}
 		}
 		$this->dataSourceIds = $sources;
 	}
@@ -97,8 +99,9 @@ 
 	 */
 	protected function getDataSources()
 	{
-		foreach ($this->dataSourceIds as $key=>$id)
-			$this->dataSourceObjects[$key] = $this->getDds()->getObject($id);
+		foreach ($this->dataSourceIds as $key=>$id) {
+					$this->dataSourceObjects[$key] = $this->getDds()->getObject($id);
+		}
 	}
 
 	/**
@@ -118,8 +121,9 @@ 
 				$object = array_merge($this->getAllowedFieldsForClass($object['_classType']), $object);
 				// now update the object with the data from daedalus
 				$data = $dds->getObject($object['_uuid']);
-				if ($data)
-					$object = array_replace($object, array_intersect_key($data, $object));
+				if ($data) {
+									$object = array_replace($object, array_intersect_key($data, $object));
+				}
 			}
 			// recursively update if this is in a tree structure
 			if ($isTree && is_array($object)) {
@@ -179,8 +183,9 @@ 
 				}
 			}
 		}
-		if (count($relations))
-			$this->saveLinkedObjects($relations);
+		if (count($relations)) {
+					$this->saveLinkedObjects($relations);
+		}
 	}
 
 	/**
@@ -216,8 +221,9 @@ 
 							$relations = $renderables[$subRenderable]['relations'];
 							foreach ($relations as $relation) {
 								$memberRef = $relation['memberRef'];
-								if (!isset($extracted['__relations'][$objId][$memberRef]))
-									$extracted['__relations'][$objId][$memberRef] = [];
+								if (!isset($extracted['__relations'][$objId][$memberRef])) {
+																	$extracted['__relations'][$objId][$memberRef] = [];
+								}
 								$extracted['__relations'][$objId][$memberRef] = array_merge($extracted['__relations'][$objId][$memberRef], $newObjectIds);
 							}
 						}
@@ -259,8 +265,9 @@ 
 		if (empty($fieldsForClass[$classType])) {
 			$definition = $this->getDefinition();
 			foreach ($definition['renderables'] as $r) {
-				if ($r['type'] == 'MemberComponent')
-					$fieldsForClass[$r['class_type']][$r['member_ref']] = null;
+				if ($r['type'] == 'MemberComponent') {
+									$fieldsForClass[$r['class_type']][$r['member_ref']] = null;
+				}
 			}
 		}
 		return $fieldsForClass[$classType];
@@ -322,8 +329,9 @@ 
 			if (isset($renderables[$phoebeKey])) {
 				// check the renderable exists and is a class component
 				$ren = $renderables[$phoebeKey];
-				if ($ren['type'] != 'ClassComponent')
-					continue;
+				if ($ren['type'] != 'ClassComponent') {
+									continue;
+				}
 
 				// create the object and any required data params
 				$object = [
@@ -334,8 +342,9 @@ 
 				foreach ($ren['items'] as $item) {
 					if (isset($renderables[$item])) {
 						$iRen = $renderables[$item];
-						if ($iRen['type'] != 'MemberComponent')
-							continue;
+						if ($iRen['type'] != 'MemberComponent') {
+													continue;
+						}
 						$object[$iRen['member_ref']] = null;
 					}
 				}
@@ -455,8 +464,9 @@ 
 	private $_class = null;
 	private function getClass()
 	{
-		if (!$this->_class)
-			$this->_class = neon('phoebe')->getIPhoebeType($this->phoebeType)->getClass($this->classType);
+		if (!$this->_class) {
+					$this->_class = neon('phoebe')->getIPhoebeType($this->phoebeType)->getClass($this->classType);
+		}
 		return $this->_class;
 	}
 
@@ -469,8 +479,9 @@ 
 	private $_dds = null;
 	private function getDds()
 	{
-		if (!$this->_dds)
-			$this->_dds = neon('dds')->getIDdsObjectManagement();
+		if (!$this->_dds) {
+					$this->_dds = neon('dds')->getIDdsObjectManagement();
+		}
 		return $this->_dds;
 	}