newicon / neon

neon/core/form/fields/el/SwitchInput.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 	public function getComponentDetails()
 	{
 		return [
-			'name' => 'switch',  'icon' => 'fa fa-toggle-on', 'group' => 'element ui',
+			'name' => 'switch', 'icon' => 'fa fa-toggle-on', 'group' => 'element ui',
 		];
 	}
 

neon/core/helpers/Html.php

Spacing +18 added lines, -18 removed lines

@@ -19,7 +19,7 @@ 
 	public static function displayAsTags($tagsArray, $class = 'label label-info')
 	{
 		$out = '';
-		foreach($tagsArray as $tag) {
+		foreach ($tagsArray as $tag) {
 			$out .= "<span class=\"$class\">$tag</span>";
 		}
 		return $out;
@@ -36,9 +36,9 @@ 
 	 *  - specify $options['icon']
 	 * @return string Html for the custom button
 	 */
-	public static function buttonCustom($url, $text, array $options=[])
+	public static function buttonCustom($url, $text, array $options = [])
 	{
-		$options['class'] = 'btn '. Arr::get($options, 'class', '');
+		$options['class'] = 'btn '.Arr::get($options, 'class', '');
 		$icon = Arr::remove($options, 'icon', '');
 		return self::a("<i class=\"$icon\"></i> ".$text, $url, $options);
 	}
@@ -50,10 +50,10 @@ 
 	 * @param string $text - button text
 	 * @return string Html for an edit button
 	 */
-	public static function buttonEdit($url, $text='Edit', $options=[])
+	public static function buttonEdit($url, $text = 'Edit', $options = [])
 	{
 		$options['icon'] = 'fa fa-pencil';
-		$options['class'] = 'btn-default ' . Arr::get($options, 'class', '');
+		$options['class'] = 'btn-default '.Arr::get($options, 'class', '');
 		return self::buttonCustom($url, $text, $options);
 	}
 
@@ -65,10 +65,10 @@ 
 	 * @see \yii\helpers\Url::to
 	 * @return string Html
 	 */
-	public static function buttonDelete($url, $text='Delete', $options=[])
+	public static function buttonDelete($url, $text = 'Delete', $options = [])
 	{
 		$options['icon'] = 'fa fa-trash';
-		$options['class'] =  'btn-danger ' . Arr::get($options, 'class', '');
+		$options['class'] = 'btn-danger '.Arr::get($options, 'class', '');
 		return self::buttonCustom($url, $text, $options);
 	}
 
@@ -80,7 +80,7 @@ 
 	 * @see \yii\helpers\Url::to
 	 * @return string Html
 	 */
-	public static function buttonAdd($url, $text='Add', $options=[])
+	public static function buttonAdd($url, $text = 'Add', $options = [])
 	{
 		$options['icon'] = 'fa fa-plus';
 		$options['class'] = 'btn-primary btn-add';
@@ -94,7 +94,7 @@ 
 	 * @param string $text button text
 	 * @return string Html
 	 */
-	public static function buttonCancel($url='', $text='Cancel', $options=[])
+	public static function buttonCancel($url = '', $text = 'Cancel', $options = [])
 	{
 		$options['icon'] = 'fa fa-arrow-left';
 		$options['class'] = 'btn-default btn-cancel';
@@ -130,7 +130,7 @@ 
 	public static function checkbox($name, $checked = false, $options = [])
 	{
 		$checkbox = parent::checkbox($name, $checked, $options);
-		return '<div class="checkbox">' . $checkbox . '</div>';
+		return '<div class="checkbox">'.$checkbox.'</div>';
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	public static function radio($name, $checked = false, $options = [])
 	{
 		$radio = parent::radio($name, $checked, $options);
-		return '<div class="radio">' . $radio . '</div>';
+		return '<div class="radio">'.$radio.'</div>';
 	}
 
 	/**
@@ -239,13 +239,13 @@ 
 	protected static function processTags($openingTags, &$tagsProcessed)
 	{
 		// append the closing tags to the list and add a comma for splitting later
-		$tagsStr = str_replace('>','>,',($openingTags.str_replace('<','</',$openingTags)));
+		$tagsStr = str_replace('>', '>,', ($openingTags.str_replace('<', '</', $openingTags)));
 		// create the replacement code with a highly unlikely set of strings
 		$replaceStr = str_replace(['</', '<', '/>', '>'], ['__NEWICON_CLOSELT__', '__NEWICON_LT__', '__NEWICON_CLOSERT__', '__NEWICON_RT__'], $tagsStr);
 
 		// now create the replacement and returned tags
-		$replaceTags = explode(',', substr($replaceStr,0,-1)); // ignore trailing comma
-		$returnTags = explode(',', substr($tagsStr,0,-1)); // ignore trailing comma
+		$replaceTags = explode(',', substr($replaceStr, 0, -1)); // ignore trailing comma
+		$returnTags = explode(',', substr($tagsStr, 0, -1)); // ignore trailing comma
 		$tagsProcessed[$openingTags] = ['replace'=>$replaceTags, 'return'=>$returnTags];
 	}
 
@@ -258,7 +258,7 @@ 
 	 * @param string $empty - what to show if the field is empty
 	 * @return string html
 	 */
-	public static function highlight($search, $html, $empty='')
+	public static function highlight($search, $html, $empty = '')
 	{
 		if ($html === null)
 			return neon()->formatter->nullDisplay;
@@ -280,7 +280,7 @@ 
 				// loadHtml seems to ignore the LIBXML_ERR_NONE setting
 				// we don;t care if we are not given perfectly formed html
 				// Even if we have serious issues in the html `$dom->saveHtml` makes a good expected effort
-				@$dom->loadHTML('<?xml encoding="utf-8" ?>' . $html, LIBXML_HTML_NOIMPLIED + LIBXML_HTML_NODEFDTD + LIBXML_NONET + LIBXML_ERR_NONE);
+				@$dom->loadHTML('<?xml encoding="utf-8" ?>'.$html, LIBXML_HTML_NOIMPLIED + LIBXML_HTML_NODEFDTD + LIBXML_NONET + LIBXML_ERR_NONE);
 				$xpath = new DOMXPath($dom);
 				$s = htmlentities($s);
 				$findStack = [];
@@ -290,8 +290,8 @@ 
 					// appendXml is useless and will break easily when exposed to characters
 					// preg_replace is a million times more robust....
 					// So keep the dom parser happy by replacing its internal text with an md5 key
-					$replace = preg_replace('/(' . preg_quote($s) . ')/i', '<span class="neonSearchHighlight">$1</span>', htmlentities($node->nodeValue));
-					$key = '{[' . md5($replace) . ']}';
+					$replace = preg_replace('/('.preg_quote($s).')/i', '<span class="neonSearchHighlight">$1</span>', htmlentities($node->nodeValue));
+					$key = '{['.md5($replace).']}';
 					$findStack[$key] = $replace;
 					$f->appendXML($key);
 					$node->parentNode->replaceChild($f, $node);

Braces +21 added lines, -14 removed lines

@@ -157,8 +157,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])) {
@@ -192,8 +193,9 @@ 
 	{
 		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) {
@@ -223,8 +225,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);
 		}
@@ -260,18 +263,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/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($sortable=true)
+	public function setIsSortable($sortable = true)
 	{
 		$this->_sortable = $sortable;
 		return $this;
@@ -287,7 +287,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
@@ -355,7 +355,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;
 		}
@@ -426,7 +426,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function setDbField($field){
+	public function setDbField($field) {
 		$this->_dbField = $field;
 		return $this;
 	}
@@ -434,8 +434,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;
 		}
@@ -452,7 +452,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function setDbSortField($field){
+	public function setDbSortField($field) {
 		$this->_dbSortField = $field;
 		return $this;
 	}
@@ -460,8 +460,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;
 		}
@@ -510,9 +510,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]);
 	}
 
 	/**
@@ -566,7 +566,7 @@ 
 	public function getFilterField()
 	{
 		$field = $this->getBaseFilterField();
-		foreach($this->filterFieldConfig as $key => $value)
+		foreach ($this->filterFieldConfig as $key => $value)
 			$field[$key] = $value;
 		return $field;
 	}
@@ -582,7 +582,7 @@ 
 
 	public function setMemberConfig($config)
 	{
-		foreach($config as $key => $value) {
+		foreach ($config as $key => $value) {
 			if (isset($this->member->$key))
 				$this->member->$key = $value;
 		}
@@ -592,7 +592,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function getCellData($row, $noValue='-')
+	public function getCellData($row, $noValue = '-')
 	{
 		$data = null;
 		$key = $this->getKey();
@@ -643,7 +643,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);
 	}
@@ -653,7 +653,7 @@ 
 	 */
 	public function getFieldName()
 	{
-		return $this->getGrid()->getId() . '[' . $this->key . '][search]';
+		return $this->getGrid()->getId().'['.$this->key.'][search]';
 	}
 
 	/**
@@ -727,12 +727,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;
@@ -758,7 +758,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'];
@@ -785,7 +785,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);
@@ -810,7 +810,7 @@ 
 			if (count($columnData)) {
 				$this->member->dataMapFilters = ['uuid' => $columnData];
 			}
-			foreach($models as $model) {
+			foreach ($models as $model) {
 				$this->member->makeMapRequest($this->getCellData($model, null));
 			}
 		}

Braces +27 added lines, -17 removed lines

@@ -105,8 +105,9 @@ 
 	 */
 	public function getEmptyCellDisplay()
 	{
-		if ($this->_emptyCellDisplay !== null)
-			return $this->_emptyCellDisplay;
+		if ($this->_emptyCellDisplay !== null) {
+					return $this->_emptyCellDisplay;
+		}
 		return $this->getGrid()->emptyCellDisplay;
 	}
 
@@ -490,10 +491,12 @@ 
 	public function renderHeaderCell()
 	{
 		$options = $this->getHeaderCellAttributes();
-		if ($this->grid->hasSort($this->key))
-			Html::addCssClass($options, ($this->grid->hasSortDescending() ? 'desc' : 'asc'));
-		if (trim($this->width) != '')
-			Html::addCssStyle($options, ["width" => $this->width]);
+		if ($this->grid->hasSort($this->key)) {
+					Html::addCssClass($options, ($this->grid->hasSortDescending() ? 'desc' : 'asc'));
+		}
+		if (trim($this->width) != '') {
+					Html::addCssStyle($options, ["width" => $this->width]);
+		}
 		Html::addCssStyle($options, $this->_style);
 
 		return Html::tag('th', $this->renderHeaderCellContent(), $options);
@@ -504,8 +507,9 @@ 
 	 */
 	public function renderHeaderCellContent()
 	{
-		if (!$this->isSortable)
-			return $this->getTitle();
+		if (!$this->isSortable) {
+					return $this->getTitle();
+		}
 		$sort = '';
 		if ($this->grid->hasSort($this->key)) {
 			$sort = $this->grid->hasSortDescending() ? ' - ' : ' + ';
@@ -535,10 +539,12 @@ 
 	 */
 	public function renderFilterCellContent()
 	{
-		if ($this->filter === false)
-			return '';
-		if (!$this->getGrid()->getFilterForm()->hasField($this->getKey()))
-			return '';
+		if ($this->filter === false) {
+					return '';
+		}
+		if (!$this->getGrid()->getFilterForm()->hasField($this->getKey())) {
+					return '';
+		}
 		$field = $this->getGrid()->getFilterForm()->getField($this->getKey());
 		// remove any automatic validators
 		$field->setValidators([], true);
@@ -566,8 +572,9 @@ 
 	public function getFilterField()
 	{
 		$field = $this->getBaseFilterField();
-		foreach($this->filterFieldConfig as $key => $value)
-			$field[$key] = $value;
+		foreach($this->filterFieldConfig as $key => $value) {
+					$field[$key] = $value;
+		}
 		return $field;
 	}
 
@@ -583,8 +590,9 @@ 
 	public function setMemberConfig($config)
 	{
 		foreach($config as $key => $value) {
-			if (isset($this->member->$key))
-				$this->member->$key = $value;
+			if (isset($this->member->$key)) {
+							$this->member->$key = $value;
+			}
 		}
 		return $this;
 	}
@@ -759,7 +767,9 @@ 
 		$out = '<div class="neonGrid_rowActions">';
 		$i = 0;
 		foreach($this->_actions as $actionKey => $linkOptions) {
-			if ($i > 0) $out .= ' | ';
+			if ($i > 0) {
+				$out .= ' | ';
+			}
 			if (isset($linkOptions['function'])) {
 				$func = $linkOptions['function'];
 				$out .= $this->callFunction($func, [$model, $key, $index]);

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)
@@ -153,7 +153,7 @@ 
 	 * @param bool $sortable
 	 * @return $this
 	 */
-	public function setIsSortable($sortable=true);
+	public function setIsSortable($sortable = true);
 
 	/**
 	 * Is the column sortable
@@ -254,7 +254,7 @@ 
 	 *
 	 * @param boolean $bool
 	 */
-	public function setAsIndex($bool=true);
+	public function setAsIndex($bool = true);
 
 	/**
 	 * Set the title of the column
@@ -303,7 +303,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
@@ -366,7 +366,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/cms/components/Widget.php

Spacing +4 added lines, -4 removed lines

@@ -117,7 +117,7 @@ 
 		if (isset($params['type'])) {
 			$defaults['type'] = $params['type'];
 			// path to the file is determined by the theme hierarchy
-			$defaults['file'] = $params['type'] . '.tpl';
+			$defaults['file'] = $params['type'].'.tpl';
 			if (isset($params['key'])) {
 				self::buildDataFromCmsKeyAttributes($params);
 			}
@@ -232,7 +232,7 @@ 
 			return $this->createStaticEditable($content);
 		} else {
 			$file = $this->params['file'];
-			$this->params['hasData'] = count($this->data)>0;
+			$this->params['hasData'] = count($this->data) > 0;
 			$this->params['hasResponse'] = true;
 			$this->params['data'] = $this->data;
 			$this->params['edit'] = $this->createDynamicEditable();
@@ -298,7 +298,7 @@ 
 	public function getId()
 	{
 		if ($this->_id === null) {
-			$this->_id = $this->getPage()->getId() . '_' . static::$autoIdPrefix . static::$counter++;
+			$this->_id = $this->getPage()->getId().'_'.static::$autoIdPrefix.static::$counter++;
 		}
 		return $this->_id;
 	}
@@ -340,7 +340,7 @@ 
 			$dataKey = $this->params['data-key'];
 			$dataPageId = $this->params['data-page-id'];
 			if ((isset($this->params['wys']) || isset($this->params['wysiwyg'])) || (isset($this->params['editor']) && strpos('wys', $this->params['editor'] === 0)))
-				return '<div id="'.$this->getId().'" data-id="'.$this->getId().'" data-key="'.$dataKey.'" data-page-id="'.$dataPageId.'" class="cobe-editable cobe-static-block" contenteditable="true">' . $value . '</div>';
+				return '<div id="'.$this->getId().'" data-id="'.$this->getId().'" data-key="'.$dataKey.'" data-page-id="'.$dataPageId.'" class="cobe-editable cobe-static-block" contenteditable="true">'.$value.'</div>';
 			else
 				return "<div style='display:inline-block;' class='cobe-editable cobe-static'  data-key='$dataKey' data-page-id='$dataPageId' contenteditable='true' />$value</div>";
 		} else {

Braces +26 added lines, -18 removed lines

@@ -123,8 +123,9 @@ 
 			}
  		}
 		 
-		if (isset($params['dds']) || isset($params['dds_page']) || isset($params['dds_class']))
-			Daedalus::buildDataFromDdsAttributes($params);
+		if (isset($params['dds']) || isset($params['dds_page']) || isset($params['dds_class'])) {
+					Daedalus::buildDataFromDdsAttributes($params);
+		}
 		$resolvedParams = Arr::merge($defaults, $params);
 		return $widget->render($resolvedParams, $template);
 	}
@@ -171,8 +172,9 @@ 
 		}
 		// scb = static content block
 		$params['type'] = '_scb';
-		if (isset($params['key']))
-			self::buildDataFromCmsKeyAttributes($params);
+		if (isset($params['key'])) {
+					self::buildDataFromCmsKeyAttributes($params);
+		}
 		$params['content'] = $content;
 		$params['wys'] = (isset($params['wys']) ? $params['wys'] : true);
 		return $widget->render($params, $template);
@@ -208,8 +210,9 @@ 
 		$data = [];
 		if (($dataRequest = $this->getDataRequest()) !== null) {
 			$id = $meta = null;
-			if (!$this->getPage()->requestWidgetData($dataRequest, $data, $id, $this->isStatic, $meta))
-				return $id;
+			if (!$this->getPage()->requestWidgetData($dataRequest, $data, $id, $this->isStatic, $meta)) {
+							return $id;
+			}
 			$this->saveData($data);
 			$this->saveDataMetaInformation($meta);
 		}
@@ -239,8 +242,9 @@ 
 			$this->params['meta'] = $this->meta;
 
 			// createTemplate is an expensive call so only call it once per file and reset all variables on the stored template.
-			if (!isset($templates[$file]))
-				$templates[$file] = $this->renderer->createTemplate($file);
+			if (!isset($templates[$file])) {
+							$templates[$file] = $this->renderer->createTemplate($file);
+			}
 			$tpl = $templates[$file];
 			$tpl->tpl_vars = $tpl->config_vars = [];
 
@@ -258,8 +262,9 @@ 
 	 */
 	protected function getDataRequest()
 	{
-		if (isset($this->params['data']))
-			return Daedalus::convertDataRequestToJson($this->params['data']);
+		if (isset($this->params['data'])) {
+					return Daedalus::convertDataRequestToJson($this->params['data']);
+		}
 		return null;
 	}
 
@@ -315,15 +320,17 @@ 
 	 */
 	protected static function buildDataFromCmsKeyAttributes(&$params)
 	{
-		if (!isset($params['type'], $params['key']))
-			return;
+		if (!isset($params['type'], $params['key'])) {
+					return;
+		}
 		$key = "$params[type]_$params[key]";
 		$pageId = isset($params['page']) ? self::$page->getId() : null;
 		$params['data-key'] = $key;
 		$params['data-page-id'] = $pageId;
 		$params['data'] = "'key':'$key','pageId':'$pageId'";
-		if (!isset($params['content']))
-			$params['content'] = "Add Content for $params[key] here";
+		if (!isset($params['content'])) {
+					$params['content'] = "Add Content for $params[key] here";
+		}
 		$params['is_static'] = true;
 	}
 
@@ -339,10 +346,11 @@ 
 		if ($this->getPage()->isInEditMode()) {
 			$dataKey = $this->params['data-key'];
 			$dataPageId = $this->params['data-page-id'];
-			if ((isset($this->params['wys']) || isset($this->params['wysiwyg'])) || (isset($this->params['editor']) && strpos('wys', $this->params['editor'] === 0)))
-				return '<div id="'.$this->getId().'" data-id="'.$this->getId().'" data-key="'.$dataKey.'" data-page-id="'.$dataPageId.'" class="cobe-editable cobe-static-block" contenteditable="true">' . $value . '</div>';
-			else
-				return "<div style='display:inline-block;' class='cobe-editable cobe-static'  data-key='$dataKey' data-page-id='$dataPageId' contenteditable='true' />$value</div>";
+			if ((isset($this->params['wys']) || isset($this->params['wysiwyg'])) || (isset($this->params['editor']) && strpos('wys', $this->params['editor'] === 0))) {
+							return '<div id="'.$this->getId().'" data-id="'.$this->getId().'" data-key="'.$dataKey.'" data-page-id="'.$dataPageId.'" class="cobe-editable cobe-static-block" contenteditable="true">' . $value . '</div>';
+			} else {
+							return "<div style='display:inline-block;' class='cobe-editable cobe-static'  data-key='$dataKey' data-page-id='$dataPageId' contenteditable='true' />$value</div>";
+			}
 		} else {
 			return $value;
 		}

neon/cms/components/Editor.php

Spacing +13 added lines, -13 removed lines

@@ -40,7 +40,7 @@ 
 
 	public static function render($vdom)
 	{
-		foreach($vdom as $element) {
+		foreach ($vdom as $element) {
 			$element[1]($element[2], $element['children']);
 		}
 	}
@@ -68,14 +68,14 @@ 
 			// dd($domArray);
 			// Editor::vdom($domArray);
 
-			$ele=dom_import_simplexml($x);
+			$ele = dom_import_simplexml($x);
 			$dom = new DOMDocument('1.0', 'utf-8');
-			$element=$dom->importNode($ele,true);
+			$element = $dom->importNode($ele, true);
 			$element->normalize();
 
 
 			$vdom = [];
-			foreach($x as $n) {
+			foreach ($x as $n) {
 				Editor::node($vdom, $n);
 			}
 			
@@ -95,7 +95,7 @@ 
 		$props = '{"components":null, "contentKey": "'.$id.'"}';
 		if ($content !== null) {
 			// read the json data serialised inside the <!-- ni:editor {json data} --> tag
-			$pattern  = '/<!--\s+(?P<closer>\/)?ni:editor\s+(?P<attrs>{(?:(?:[^}]+|}+(?=})|(?!}\s+\/?-->).)*+)?}\s+)?(?P<void>\/)?-->/s';
+			$pattern = '/<!--\s+(?P<closer>\/)?ni:editor\s+(?P<attrs>{(?:(?:[^}]+|}+(?=})|(?!}\s+\/?-->).)*+)?}\s+)?(?P<void>\/)?-->/s';
 			preg_match($pattern, $content, $matches);
 			if ($matches) {
 				$props = $matches['attrs'];
@@ -182,18 +182,18 @@ 
 	 * [children] => Array
 	 * [props] => Array
 	 */
-	public static function renderAsSmarty($node, &$depth=0)
+	public static function renderAsSmarty($node, &$depth = 0)
 	{
 		$depth++;
 		$cmp = $node['cmp'];
 		$uuid = $node['uuid'];
 		$children = $node['children'];
 		$props = $node['props'];
-		$out = '{'."$cmp " . static::formatProps($props) . " uuid=\"$uuid\" }\n";
-		foreach($children as $child) {
-			$out .= str_repeat('    ', $depth) . static::renderAsSmarty($child, $depth);
+		$out = '{'."$cmp ".static::formatProps($props)." uuid=\"$uuid\" }\n";
+		foreach ($children as $child) {
+			$out .= str_repeat('    ', $depth).static::renderAsSmarty($child, $depth);
 		}
-		$out .= str_repeat('    ', $depth-1) . '{/'.$cmp."}\n";
+		$out .= str_repeat('    ', $depth - 1).'{/'.$cmp."}\n";
 		$depth--;
 		return $out;
 	}
@@ -202,9 +202,9 @@ 
 	{
 		unset($props['children']);
 		$formatParams = '';
-		foreach($props as $key => $value) {
+		foreach ($props as $key => $value) {
 			if (is_array($value)) $value = var_export($value, true);
-			$formatParams .= $key.'="'. $value .'" ';
+			$formatParams .= $key.'="'.$value.'" ';
 		}
 		return $formatParams;
 	}
@@ -218,7 +218,7 @@ 
 	 */
 	public static function createFromTree($cmpIndex, $root) {
 		$out = $root;
-		foreach($root['children'] as $key => $childId) {
+		foreach ($root['children'] as $key => $childId) {
 			if (!empty($out['children'])) {
 				$out['children'][$key] = static::createFromTree($cmpIndex, $cmpIndex[$childId]);
 			}

Braces +6 added lines, -2 removed lines

@@ -55,7 +55,9 @@ 
 	 */
 	public static function editor($params, $content, \Smarty_Internal_Template $template, &$repeat)
 	{
-		if ($repeat) return;
+		if ($repeat) {
+			return;
+		}
 		$id = Arr::get($params, 'id', neon()->cms->getPage()->getId());
 		$dbContent = neon()->getCms()->getICmsStaticData()->getStaticContent($id, null);
 		if (!$dbContent) {
@@ -203,7 +205,9 @@ 
 		unset($props['children']);
 		$formatParams = '';
 		foreach($props as $key => $value) {
-			if (is_array($value)) $value = var_export($value, true);
+			if (is_array($value)) {
+				$value = var_export($value, true);
+			}
 			$formatParams .= $key.'="'. $value .'" ';
 		}
 		return $formatParams;

neon/cms/components/Page.php

Spacing +9 added lines, -9 removed lines

@@ -79,7 +79,7 @@ 
 	 */
 	public function isInEditMode()
 	{
-		if (neon()->session===null) return false;
+		if (neon()->session === null) return false;
 		return neon()->session->get(self::COBE_EDITING, false);
 	}
 
@@ -217,7 +217,7 @@ 
 		$params = array_merge($data['page_params'], neon()->request->get(), neon()->request->post());
 		unset($data['page_params']);
 		$data['params'] = Html::encodeEntities($params);
-		$data['url'] = '/' . neon()->request->pathInfo;
+		$data['url'] = '/'.neon()->request->pathInfo;
 		$data['uri'] = $_SERVER['REQUEST_URI'];
 		$data['host'] = Url::base(true);
 		$data['editing'] = $this->isInEditMode();
@@ -359,7 +359,7 @@ 
 
 		// If the number of renders are excessive (4+), issue a warning.
 		if ($numberOfRenders >= 4)
-			\Neon::debug('Excessive number of renders (>=4): ' . $numberOfRenders);
+			\Neon::debug('Excessive number of renders (>=4): '.$numberOfRenders);
 
 		// inject assets into template
 		$html = neon()->view->injectHtml($html);
@@ -433,7 +433,7 @@ 
 	 * @param
 	 * @return string
 	 */
-	protected function canonicaliseRequest(&$dataRequest, $isStatic=false)
+	protected function canonicaliseRequest(&$dataRequest, $isStatic = false)
 	{
 		if ($isStatic) {
 			$id = $this->createStaticContentId($dataRequest);
@@ -441,7 +441,7 @@ 
 		} else {
 			$request = array('class'=>null, 'filters'=>[], 'order'=>[], 'limit'=>[]);
 			$dataRequest = array_merge($request, $dataRequest);
-			$id = md5(str_replace([' '],'', json_encode($dataRequest)));
+			$id = md5(str_replace([' '], '', json_encode($dataRequest)));
 		}
 		return $id;
 	}
@@ -466,7 +466,7 @@ 
 	 */
 	protected function makeDynamicDataRequests()
 	{
-		if (count($this->dynamicDataRequests)>0) {
+		if (count($this->dynamicDataRequests) > 0) {
 			$dds = $this->getIDdsObjectManagement();
 			foreach ($this->dynamicDataRequests as $id=>$dr) {
 				$dds->addObjectRequest($dr['class'], $dr['filters'], $dr['order'], $dr['limit'], $id);
@@ -492,11 +492,11 @@ 
 	 */
 	protected function makeStaticDataRequests()
 	{
-		if (count($this->staticDataRequests)>0) {
+		if (count($this->staticDataRequests) > 0) {
 			$cms = $this->getICmsStaticData();
 			$data = $cms->bulkStaticContentRequest($this->staticDataRequests);
 			foreach ($data as $i=>$d)
-				$this->requestedData[$i] = ($d===null ? 'not found' : $d);
+				$this->requestedData[$i] = ($d === null ? 'not found' : $d);
 			$this->staticDataRequests = [];
 		}
 	}
@@ -507,7 +507,7 @@ 
 	 */
 	protected function hasDataRequests()
 	{
-		return (count($this->staticDataRequests)+count($this->dynamicDataRequests) > 0);
+		return (count($this->staticDataRequests) + count($this->dynamicDataRequests) > 0);
 	}
 
 	/**

Braces +29 added lines, -18 removed lines

@@ -79,7 +79,9 @@ 
 	 */
 	public function isInEditMode()
 	{
-		if (neon()->session===null) return false;
+		if (neon()->session===null) {
+			return false;
+		}
 		return neon()->session->get(self::COBE_EDITING, false);
 	}
 
@@ -211,8 +213,9 @@ 
 			$data = $this->_page;
 			// add the nice_id as CmnUrRoute will add this on first parse through Cobe without gets but
 			// not on requests with get parameters which has led to hard-to-debug runtime coding errors
-			if (!isset($data['page_params']['nice_id']) && isset($data['nice_id']))
-				$data['page_params']['nice_id'] = $data['nice_id'];
+			if (!isset($data['page_params']['nice_id']) && isset($data['nice_id'])) {
+							$data['page_params']['nice_id'] = $data['nice_id'];
+			}
 		}
 		$params = array_merge($data['page_params'], neon()->request->get(), neon()->request->post());
 		unset($data['page_params']);
@@ -255,7 +258,9 @@ 
 	 */
 	public function getUrlOfPage($id)
 	{
-		if (!$id) return '';
+		if (!$id) {
+			return '';
+		}
 		return $url = url(['/cms/render/page', 'nice_id'=>$id]);
 	}
 
@@ -353,13 +358,15 @@ 
 		do {
 			$numberOfRenders++;
 			$html = $renderer->renderTemplate($template);
-			if (($hasDataRequests = $this->hasDataRequests()))
-				$this->makeDataRequests();
+			if (($hasDataRequests = $this->hasDataRequests())) {
+							$this->makeDataRequests();
+			}
 		} while ($hasDataRequests == true);
 
 		// If the number of renders are excessive (4+), issue a warning.
-		if ($numberOfRenders >= 4)
-			\Neon::debug('Excessive number of renders (>=4): ' . $numberOfRenders);
+		if ($numberOfRenders >= 4) {
+					\Neon::debug('Excessive number of renders (>=4): ' . $numberOfRenders);
+		}
 
 		// inject assets into template
 		$html = neon()->view->injectHtml($html);
@@ -390,15 +397,17 @@ 
 		// see if we have the data
 		if (isset($this->requestedData[$id])) {
 			$data = $this->requestedData[$id];
-			if (!$isStatic && isset($this->requestedDataMeta[$id]))
-				$meta = $this->requestedDataMeta[$id];
+			if (!$isStatic && isset($this->requestedDataMeta[$id])) {
+							$meta = $this->requestedDataMeta[$id];
+			}
 			return true;
 		}
 		// if not then add it to the list of requested data
-		if ($isStatic)
-			$this->staticDataRequests[$id] = $dataRequest;
-		else
-			$this->dynamicDataRequests[$id] = $dataRequest;
+		if ($isStatic) {
+					$this->staticDataRequests[$id] = $dataRequest;
+		} else {
+					$this->dynamicDataRequests[$id] = $dataRequest;
+		}
 		return false;
 	}
 
@@ -495,8 +504,9 @@ 
 		if (count($this->staticDataRequests)>0) {
 			$cms = $this->getICmsStaticData();
 			$data = $cms->bulkStaticContentRequest($this->staticDataRequests);
-			foreach ($data as $i=>$d)
-				$this->requestedData[$i] = ($d===null ? 'not found' : $d);
+			foreach ($data as $i=>$d) {
+							$this->requestedData[$i] = ($d===null ? 'not found' : $d);
+			}
 			$this->staticDataRequests = [];
 		}
 	}
@@ -539,8 +549,9 @@ 
 	private $cmsStaticData = null;
 	private function getICmsStaticData()
 	{
-		if ($this->cmsStaticData === null)
-			$this->cmsStaticData = neon('cms')->ICmsStaticData;
+		if ($this->cmsStaticData === null) {
+					$this->cmsStaticData = neon('cms')->ICmsStaticData;
+		}
 		return $this->cmsStaticData;
 	}
 

neon/daedalus/services/ddsManager/DdsCore.php

Spacing +33 added lines, -33 removed lines

@@ -112,7 +112,7 @@ 
 		$member = $storage[$memberRef];
 		// handle some storage differences
 		$columnCheck = substr($member['column'], 0, 4);
-		if ($columnCheck=='CHAR' || $columnCheck=='UUID') {
+		if ($columnCheck == 'CHAR' || $columnCheck == 'UUID') {
 			$size = (isset($member['definition']['size'])) ? $member['definition']['size'] : 150;
 			$member['column'] = str_replace($columnCheck, "CHAR($size)", $member['column']);
 		}
@@ -161,10 +161,10 @@ 
 	 * @return []  array of ['member_ref']=>['data_type_ref', 'column', 'index']
 	 *  where column is the db column type
 	 */
-	protected function getMemberStorage($classType, $memberRef=null)
+	protected function getMemberStorage($classType, $memberRef = null)
 	{
 		$boundValues = [];
-		$query =<<<EOQ
+		$query = <<<EOQ
 SELECT `m`.`member_ref`, `s`.`type`, d.`definition` FROM dds_member m
 JOIN `dds_data_type` d ON `m`.`data_type_ref`=d.`data_type_ref`
 JOIN `dds_storage` s ON `d`.`storage_ref`=s.`storage_ref`
@@ -183,7 +183,7 @@ 
 			$memberStorage[$r['member_ref']] = [
 				'column' => $this->getColumnType($r['type']),
 				'index' => $this->getIndexType($r['type']),
-				'definition' => empty($r['definition']) ? null : json_decode($r['definition'],true)
+				'definition' => empty($r['definition']) ? null : json_decode($r['definition'], true)
 			];
 		}
 		return $memberStorage;
@@ -210,7 +210,7 @@ 
 			case 'BINARY_LONG': $type = 'LONGBLOB'; break;
 			case 'CHAR': $type = 'CHAR'; break;
 			case 'UUID': $type = 'UUID'; break;
-			default: $type="UNKNOWN STORAGE TYPE $storageType"; break;
+			default: $type = "UNKNOWN STORAGE TYPE $storageType"; break;
 		}
 		$collation = $this->getCollation($storageType);
 		if ($collation)
@@ -285,7 +285,7 @@ 
 	 * @throws InvalidArgumentException if class not found and $throwException is true
 	 * @return bool  whether or not found
 	 */
-	protected function findClass($classType, &$class=null, $throwException=false)
+	protected function findClass($classType, &$class = null, $throwException = false)
 	{
 		$ct = $this->canonicaliseRef($classType);
 		if (empty(self::$_classCache[$ct])) {
@@ -334,13 +334,13 @@ 
 	/**
 	 * @see IDdsClassManagement::listMembers
 	 */
-	protected function listMembersForClass($classType, $includeDeleted=false, $keyBy='member_ref')
+	protected function listMembersForClass($classType, $includeDeleted = false, $keyBy = 'member_ref')
 	{
 		if (!is_string($classType))
 			throw new InvalidArgumentException('The class type $classType parameter should be a string');
 		$select = ['member_ref', 'label', 'data_type_ref', 'description', 'choices', 'map_field', 'link_class'];
 		if (!empty($keyBy) && !in_array($keyBy, $select))
-			throw new InvalidArgumentException('Parameter keyBy must be empty or one of ' .print_r($select, true));
+			throw new InvalidArgumentException('Parameter keyBy must be empty or one of '.print_r($select, true));
 
 		// see if we have a cached version or getting from the database
 		if (empty(static::$_classMembersCache[$classType][$includeDeleted])) {
@@ -391,7 +391,7 @@ 
 	 */
 	protected function setClassMapMemberCache($classType, $member)
 	{
-		static::$_classMemberMapCache[$classType]=$member;
+		static::$_classMemberMapCache[$classType] = $member;
 	}
 
 	/**
@@ -400,7 +400,7 @@ 
 	 * @param DdsDataType &$dataType
 	 * @return bool  whether or not found
 	 */
-	protected function findDataType($dataTypeRef, &$dataType=null)
+	protected function findDataType($dataTypeRef, &$dataType = null)
 	{
 		$dataType = DdsDataType::findOne(['data_type_ref'=>$dataTypeRef]);
 		return ($dataType !== null);
@@ -454,7 +454,7 @@ 
 	 * @param char $separator  the single character separator to split the string into its parts
 	 * @return string  the canonicalised result
 	 */
-	protected function canonicaliseRefByParts($ref, $separator= '.')
+	protected function canonicaliseRefByParts($ref, $separator = '.')
 	{
 		$parts = explode($separator, $ref);
 		$canons = [];
@@ -468,7 +468,7 @@ 
 	 * @param $ref
 	 * @return string
 	 */
-	protected function quoteField($ref, $ddsObjectAlias='o')
+	protected function quoteField($ref, $ddsObjectAlias = 'o')
 	{
 		if (in_array($ref, ['_uuid', '_created', '_updated', '_class_ref'])) {
 			return "`$ddsObjectAlias`.`$ref`";
@@ -488,7 +488,7 @@ 
 		try {
 			$this->canonicaliseFiltersRecursive($filters);
 		} catch (InvalidArgumentException $ex) {
-			throw new InvalidArgumentException($ex->getMessage(). ' Filters passed in: ' .print_r($filters, true));
+			throw new InvalidArgumentException($ex->getMessage().' Filters passed in: '.print_r($filters, true));
 		}
 		return $filters;
 	}
@@ -503,7 +503,7 @@ 
 	protected function canonicaliseFiltersRecursive(&$filters)
 	{
 		// is this a filter clause or set of filter clauses??
-		if (!is_array($filters) || count($filters)==0)
+		if (!is_array($filters) || count($filters) == 0)
 			return;
 
 		// recursively descend until one finds a filter clause
@@ -514,9 +514,9 @@ 
 		}
 		// so canonicalise a filter clause
 		if (array_key_exists(0, $filters))
-			$this->canonicaliseFilter($filters[0],0);
+			$this->canonicaliseFilter($filters[0], 0);
 		if (array_key_exists(1, $filters))
-			$this->canonicaliseFilter($filters[1],1);
+			$this->canonicaliseFilter($filters[1], 1);
 
 		// Handle nulls passed as values
 		// ['field', '=', null] and ['field', '!=', null]
@@ -545,7 +545,7 @@ 
 		}
 		if ($key === 1) {
 			// accept only these operators
-			switch(strtolower($item)) {
+			switch (strtolower($item)) {
 				case '=': case '!=':
 				case '<': case '<=':
 				case '>': case '>=':
@@ -580,7 +580,7 @@ 
 	{
 		// check there are no integer keys as this means not all keys are in the logic
 		foreach ($keys as $k) {
-			if ((int)$k === $k) {
+			if ((int) $k === $k) {
 				throw new InvalidArgumentException(
 					'Daedalus: You have provided a logic string to the query, but it looks like not all filter clauses have a logic name added to them. All filter clauses need to represented in the logic statement.'
 				);
@@ -593,8 +593,8 @@ 
 			['AND', 'and', 'NOT', 'not', 'OR', 'or', ' ', ')', '('],
 			'', $subLogic
 		);
-		if (strlen($subLogic)>0)
-			throw new InvalidArgumentException("Daedalus: Invalid logic operator provided. Maybe you haven't defined all keys or have other logic than 'AND', 'OR', 'NOT' and '(',')' characters in your logic? You have defined the keys as ".print_r($keys, true). ' for a logic statement of ' .print_r($logic, true). ' The remaining characters are ' .print_r($subLogic, true));
+		if (strlen($subLogic) > 0)
+			throw new InvalidArgumentException("Daedalus: Invalid logic operator provided. Maybe you haven't defined all keys or have other logic than 'AND', 'OR', 'NOT' and '(',')' characters in your logic? You have defined the keys as ".print_r($keys, true).' for a logic statement of '.print_r($logic, true).' The remaining characters are '.print_r($subLogic, true));
 		return $logic;
 	}
 
@@ -630,7 +630,7 @@ 
 				switch ($drn) {
 					case 'ASC': case 'DESC':
 						// allow -ve key starts for nulls last in MySql
-						if (strpos($k,'-') === 0)
+						if (strpos($k, '-') === 0)
 							$canon['-'.$this->quoteField($k)] = $drn;
 						else
 							$canon[$this->quoteField($k)] = $drn;
@@ -654,10 +654,10 @@ 
 	protected function canonicaliseLimit($limit, &$total, &$calculateTotal)
 	{
 		$canon = [];
-		$total=null;
+		$total = null;
 		$calculateTotal = false;
 		if (is_array($limit)) {
-			$canon = ['start'=>0,'length'=>self::MAX_LENGTH];
+			$canon = ['start'=>0, 'length'=>self::MAX_LENGTH];
 			foreach ($limit as $k=>$v) {
 				$key = strtolower($k);
 				switch ($key) {
@@ -670,7 +670,7 @@ 
 					case 'total':
 						// $v can be truthy or the previous integer
 						$total = is_numeric($v) ? (int) $v : null;
-						$calculateTotal = ($v===true || $v==='true');
+						$calculateTotal = ($v === true || $v === 'true');
 					break;
 				}
 			}
@@ -685,14 +685,14 @@ 
 	 * @param [] $row  the row of data to be converted
 	 * @param string $classTypeKey the key in the data that will give the class type
 	 */
-	protected function convertFromDBToPHP(&$row, $links=[], $classTypeKey='_class_type')
+	protected function convertFromDBToPHP(&$row, $links = [], $classTypeKey = '_class_type')
 	{
 		$classType = $row[$classTypeKey];
 		$members = $this->getClassMembers($classType);
 		// now process only the member defined fields:
 		foreach ($row as $key => &$value) {
 			if (isset($members[$key])) {
-				$memberLinks = isset($links[$key])?$links[$key]:[];
+				$memberLinks = isset($links[$key]) ? $links[$key] : [];
 				$this->doConversionFromDBToPHP($members[$key], $value, $memberLinks);
 			}
 		}
@@ -704,9 +704,9 @@ 
 	 * @param string $dataType the data type ref of the value
 	 * @param mixed $value  the value returned by the database
 	 */
-	protected function doConversionFromDBToPHP($member, &$value, $memberLinks=[])
+	protected function doConversionFromDBToPHP($member, &$value, $memberLinks = [])
 	{
-		switch($member['data_type_ref']) {
+		switch ($member['data_type_ref']) {
 			case 'choice':
 				// silently ignore deleted old choice as no longer valid
 				if (is_array($member['choices']) && isset($member['choices'][$value])) {
@@ -769,7 +769,7 @@ 
 	protected function doConversionFromPHPToDB($member, &$value, &$links)
 	{
 		$links = null;
-		switch($member['data_type_ref']) {
+		switch ($member['data_type_ref']) {
 			case 'choice':
 				// convert from the value array to the key if the array
 				// the array was returned
@@ -805,7 +805,7 @@ 
 	 * @param array $dataTypes  add to restrict members to certain types
 	 * @return array the members
 	 */
-	protected function getClassMembers($classType, array $dataTypes=[])
+	protected function getClassMembers($classType, array $dataTypes = [])
 	{
 		static $_classMembers = [];
 		if (!array_key_exists($classType, $_classMembers)) {
@@ -838,7 +838,7 @@ 
 	 */
 	protected function getTableFromClassType($classType)
 	{
-		return 'ddt_' .$this->canonicaliseRef($classType);
+		return 'ddt_'.$this->canonicaliseRef($classType);
 	}
 
 	/**
@@ -884,11 +884,11 @@ 
 		$fields = [];
 		$values = [];
 		foreach ($row as $f=>$v) {
-			$fields[]=$f;
+			$fields[] = $f;
 			$values[] = $this->pdoQuote($v);
 		}
 		if (count($fields))
-			return "REPLACE INTO `$table` (`".(implode('`,`',$fields)).'`) VALUES ('.(implode(',', $values)). ');';
+			return "REPLACE INTO `$table` (`".(implode('`,`', $fields)).'`) VALUES ('.(implode(',', $values)).');';
 		return null;
 	}
 

Braces +94 added lines, -64 removed lines

@@ -100,8 +100,9 @@ 
 		$tableName = $this->getTableFromClassType($classType);
 		$upSql = $this->getDropTableSql($classType);
 		$downSql = $this->getCreateTableSql($tableName);
-		foreach ($upSql as $up)
-			neon()->db->createCommand($up)->execute();
+		foreach ($upSql as $up) {
+					neon()->db->createCommand($up)->execute();
+		}
 		$this->storeMigration($upSql, $downSql);
 	}
 
@@ -213,8 +214,9 @@ 
 			default: $type="UNKNOWN STORAGE TYPE $storageType"; break;
 		}
 		$collation = $this->getCollation($storageType);
-		if ($collation)
-			return "$type $collation DEFAULT NULL ";
+		if ($collation) {
+					return "$type $collation DEFAULT NULL ";
+		}
 		return "$type DEFAULT NULL ";
 	}
 
@@ -292,8 +294,9 @@ 
 			self::$_classCache[$ct] = DdsClass::findOne(['class_type' => $ct]);
 		}
 		$class = self::$_classCache[$ct];
-		if (!$class && $throwException)
-			throw new InvalidArgumentException('Unknown class type "'.$ct.'"');
+		if (!$class && $throwException) {
+					throw new InvalidArgumentException('Unknown class type "'.$ct.'"');
+		}
 		return ($class !== null);
 	}
 
@@ -336,32 +339,38 @@ 
 	 */
 	protected function listMembersForClass($classType, $includeDeleted=false, $keyBy='member_ref')
 	{
-		if (!is_string($classType))
-			throw new InvalidArgumentException('The class type $classType parameter should be a string');
+		if (!is_string($classType)) {
+					throw new InvalidArgumentException('The class type $classType parameter should be a string');
+		}
 		$select = ['member_ref', 'label', 'data_type_ref', 'description', 'choices', 'map_field', 'link_class'];
-		if (!empty($keyBy) && !in_array($keyBy, $select))
-			throw new InvalidArgumentException('Parameter keyBy must be empty or one of ' .print_r($select, true));
+		if (!empty($keyBy) && !in_array($keyBy, $select)) {
+					throw new InvalidArgumentException('Parameter keyBy must be empty or one of ' .print_r($select, true));
+		}
 
 		// see if we have a cached version or getting from the database
 		if (empty(static::$_classMembersCache[$classType][$includeDeleted])) {
 			$query = DdsMember::find()->where(['class_type' => $classType]);
-			if ($includeDeleted)
-				$select[] = 'deleted';
-			else
-				$query->andWhere(['deleted' => 0]);
+			if ($includeDeleted) {
+							$select[] = 'deleted';
+			} else {
+							$query->andWhere(['deleted' => 0]);
+			}
 			$rows = $query->select($select)->orderBy('created')->asArray()->all();
-			foreach ($rows as $k=>$r)
-				$rows[$k]['choices'] = json_decode($r['choices'], true);
+			foreach ($rows as $k=>$r) {
+							$rows[$k]['choices'] = json_decode($r['choices'], true);
+			}
 			static::$_classMembersCache[$classType][$includeDeleted] = $rows;
 		}
 
-		if (empty($keyBy))
-			return static::$_classMembersCache[$classType][$includeDeleted];
+		if (empty($keyBy)) {
+					return static::$_classMembersCache[$classType][$includeDeleted];
+		}
 
 		// key by a particular ref
 		$results = [];
-		foreach (static::$_classMembersCache[$classType][$includeDeleted] as $r)
-			$results[$r[$keyBy]] = $r;
+		foreach (static::$_classMembersCache[$classType][$includeDeleted] as $r) {
+					$results[$r[$keyBy]] = $r;
+		}
 
 		return $results;
 	}
@@ -458,8 +467,9 @@ 
 	{
 		$parts = explode($separator, $ref);
 		$canons = [];
-		foreach ($parts as $p)
-			$canons[] = $this->canonicaliseRef($p);
+		foreach ($parts as $p) {
+					$canons[] = $this->canonicaliseRef($p);
+		}
 		return implode($separator, $canons);
 	}
 
@@ -483,8 +493,9 @@ 
 	 */
 	protected function canonicaliseFilters($filters)
 	{
-		if (!is_array($filters))
-			return [];
+		if (!is_array($filters)) {
+					return [];
+		}
 		try {
 			$this->canonicaliseFiltersRecursive($filters);
 		} catch (InvalidArgumentException $ex) {
@@ -503,20 +514,24 @@ 
 	protected function canonicaliseFiltersRecursive(&$filters)
 	{
 		// is this a filter clause or set of filter clauses??
-		if (!is_array($filters) || count($filters)==0)
-			return;
+		if (!is_array($filters) || count($filters)==0) {
+					return;
+		}
 
 		// recursively descend until one finds a filter clause
 		if (is_array($filters[0])) {
-			foreach ($filters as &$f)
-				$this->canonicaliseFiltersRecursive($f);
+			foreach ($filters as &$f) {
+							$this->canonicaliseFiltersRecursive($f);
+			}
 			return;
 		}
 		// so canonicalise a filter clause
-		if (array_key_exists(0, $filters))
-			$this->canonicaliseFilter($filters[0],0);
-		if (array_key_exists(1, $filters))
-			$this->canonicaliseFilter($filters[1],1);
+		if (array_key_exists(0, $filters)) {
+					$this->canonicaliseFilter($filters[0],0);
+		}
+		if (array_key_exists(1, $filters)) {
+					$this->canonicaliseFilter($filters[1],1);
+		}
 
 		// Handle nulls passed as values
 		// ['field', '=', null] and ['field', '!=', null]
@@ -593,8 +608,9 @@ 
 			['AND', 'and', 'NOT', 'not', 'OR', 'or', ' ', ')', '('],
 			'', $subLogic
 		);
-		if (strlen($subLogic)>0)
-			throw new InvalidArgumentException("Daedalus: Invalid logic operator provided. Maybe you haven't defined all keys or have other logic than 'AND', 'OR', 'NOT' and '(',')' characters in your logic? You have defined the keys as ".print_r($keys, true). ' for a logic statement of ' .print_r($logic, true). ' The remaining characters are ' .print_r($subLogic, true));
+		if (strlen($subLogic)>0) {
+					throw new InvalidArgumentException("Daedalus: Invalid logic operator provided. Maybe you haven't defined all keys or have other logic than 'AND', 'OR', 'NOT' and '(',')' characters in your logic? You have defined the keys as ".print_r($keys, true). ' for a logic statement of ' .print_r($logic, true). ' The remaining characters are ' .print_r($subLogic, true));
+		}
 		return $logic;
 	}
 
@@ -630,10 +646,11 @@ 
 				switch ($drn) {
 					case 'ASC': case 'DESC':
 						// allow -ve key starts for nulls last in MySql
-						if (strpos($k,'-') === 0)
-							$canon['-'.$this->quoteField($k)] = $drn;
-						else
-							$canon[$this->quoteField($k)] = $drn;
+						if (strpos($k,'-') === 0) {
+													$canon['-'.$this->quoteField($k)] = $drn;
+						} else {
+													$canon[$this->quoteField($k)] = $drn;
+						}
 					break;
 					case 'RAND':
 						$canon['RAND'] = 'RAND';
@@ -721,14 +738,16 @@ 
 				if (!empty($choices) && is_array($choices)) {
 					foreach ($choices as $choice) {
 						// silently ignore deleted old choice as no longer valid
-						if (isset($member['choices'][$choice]))
-							$value[] = ['key'=>$choice, 'value'=>$member['choices'][$choice]];
+						if (isset($member['choices'][$choice])) {
+													$value[] = ['key'=>$choice, 'value'=>$member['choices'][$choice]];
+						}
 					}
 				}
 			break;
 			case 'boolean':
-				if ($value === NULL)
-					return;
+				if ($value === NULL) {
+									return;
+				}
 				$value = !!$value;
 			break;
 			case 'json': $value = json_decode($value, true); break;
@@ -753,8 +772,9 @@ 
 			$itemLinks = null;
 			if (isset($members[$key])) {
 				$this->doConversionFromPHPToDB($members[$key], $value, $itemLinks);
-				if ($itemLinks !== null)
-					$links[$key] = $itemLinks;
+				if ($itemLinks !== null) {
+									$links[$key] = $itemLinks;
+				}
 			}
 		}
 	}
@@ -773,16 +793,18 @@ 
 			case 'choice':
 				// convert from the value array to the key if the array
 				// the array was returned
-				if (is_array($value) && isset($value['key']))
-					$value = $value['key'];
+				if (is_array($value) && isset($value['key'])) {
+									$value = $value['key'];
+				}
 			break;
 			case 'choice_multiple':
 				$value = json_encode($value);
 			break;
 			case 'boolean':
 				// check for null values
-				if ($value === null)
-					return;
+				if ($value === null) {
+									return;
+				}
 				// convert from truthy to database 1 or 0
 				$value = $value ? 1 : 0;
 			break;
@@ -814,19 +836,22 @@ 
 				// make sure model afterFind has been run
 				$members = DdsMember::find()->where(['class_type'=>$classType])->all();
 				$membersByRef = [];
-				foreach ($members as $member)
-					$membersByRef[$member['member_ref']] = $member->attributes;
+				foreach ($members as $member) {
+									$membersByRef[$member['member_ref']] = $member->attributes;
+				}
 				$_classMembers[$classType] = $membersByRef;
 			} catch (Exception $e) {
 				throw new InvalidArgumentException("Error attempting to get members for $classType.");
 			}
 		}
-		if (empty($dataTypes))
-			return $_classMembers[$classType];
+		if (empty($dataTypes)) {
+					return $_classMembers[$classType];
+		}
 		$dataMembers = [];
 		foreach ($_classMembers[$classType] as $k=>$m) {
-			if (in_array($m['data_type_ref'], $dataTypes))
-				$dataMembers[$k] = $m;
+			if (in_array($m['data_type_ref'], $dataTypes)) {
+							$dataMembers[$k] = $m;
+			}
 		}
 		return $dataMembers;
 	}
@@ -879,16 +904,18 @@ 
 	 */
 	protected function getTableRowReplaceSql($table, $row)
 	{
-		if (!is_array($row))
-			$row = $row->toArray();
+		if (!is_array($row)) {
+					$row = $row->toArray();
+		}
 		$fields = [];
 		$values = [];
 		foreach ($row as $f=>$v) {
 			$fields[]=$f;
 			$values[] = $this->pdoQuote($v);
 		}
-		if (count($fields))
-			return "REPLACE INTO `$table` (`".(implode('`,`',$fields)).'`) VALUES ('.(implode(',', $values)). ');';
+		if (count($fields)) {
+					return "REPLACE INTO `$table` (`".(implode('`,`',$fields)).'`) VALUES ('.(implode(',', $values)). ');';
+		}
 		return null;
 	}
 
@@ -899,10 +926,12 @@ 
 	 */
 	private function pdoQuote($value)
 	{
-		if (is_array($value))
-			$value = json_encode($value);
-		if (is_null($value))
-			return 'null';
+		if (is_array($value)) {
+					$value = json_encode($value);
+		}
+		if (is_null($value)) {
+					return 'null';
+		}
 		return neon()->db->pdo->quote($value);
 	}
 
@@ -937,8 +966,9 @@ 
 	protected function areUUIDs(array $candidates)
 	{
 		foreach ($candidates as $candidate) {
-			if (!$this->isUUID($candidate))
-				return false;
+			if (!$this->isUUID($candidate)) {
+							return false;
+			}
 		}
 		return true;
 	}

neon/user/forms/Login.php

Spacing +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
 	 * @param boolean $activeOnly whether to fetch only active users
 	 * @return User|null
 	 */
-	public function getUser($activeOnly=false)
+	public function getUser($activeOnly = false)
 	{
 		if ($this->_user === false) {
 			$this->_user = call_user_func(