newicon / neon

neon/cms/components/Page.php

Braces +59 added lines, -39 removed lines

@@ -74,7 +74,9 @@ 
 	 */
 	public function isInEditMode()
 	{
-		if (neon()->session===null) return false;
+		if (neon()->session===null) {
+			return false;
+		}
 		return neon()->session->get(self::COBE_EDITING, false);
 	}
 
@@ -185,8 +187,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']);
@@ -226,8 +229,9 @@ 
 	 */
 	public function getUrlOfPage($id)
 	{
-		if (!$id)
-			return '';
+		if (!$id) {
+					return '';
+		}
 		$url = $this->loadUrlByPageId($id);
 		return $url ? url($url['url']) : '';
 	}
@@ -241,8 +245,9 @@ 
 	public function getUrlOfPageByNiceId($niceId)
 	{
 		$url = '';
-		if ($niceId)
-			$url = $this->loadUrlByNiceId($niceId);
+		if ($niceId) {
+					$url = $this->loadUrlByNiceId($niceId);
+		}
 		return $url ? url($url['url']) : '';
 	}
 
@@ -253,10 +258,12 @@ 
 	 */
 	public function niceId2PageId($niceId)
 	{
-		if (!$niceId)
-			return null;
-		if (isset($this->_niceId2PageId[$niceId]))
-			return $this->_niceId2PageId[$niceId];
+		if (!$niceId) {
+					return null;
+		}
+		if (isset($this->_niceId2PageId[$niceId])) {
+					return $this->_niceId2PageId[$niceId];
+		}
 		$url = $this->loadUrlByNiceId($niceId);
 		return $url ? $url['page_id'] : null;
 	}
@@ -268,10 +275,12 @@ 
 	 */
 	public function pageId2NiceId($pageId)
 	{
-		if (!$pageId)
-			return null;
-		if (isset($this->_pageId2NiceId[$pageId]))
-			return $this->_pageId2NiceId[$pageId];
+		if (!$pageId) {
+					return null;
+		}
+		if (isset($this->_pageId2NiceId[$pageId])) {
+					return $this->_pageId2NiceId[$pageId];
+		}
 		$url = $this->loadUrlByPageId($pageId);
 		return $url ? $url['page_id'] : null;
 	}
@@ -407,15 +416,17 @@ 
 		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, issue a warning.
 		// Simple cases can result a few renders so take anything over
 		// 4 renders as excessive.
-		if ($numberOfRenders >= 5)
-			\Neon::debug('Excessive number of renders (>=5): ' . $numberOfRenders);
+		if ($numberOfRenders >= 5) {
+					\Neon::debug('Excessive number of renders (>=5): ' . $numberOfRenders);
+		}
 
 		// inject assets into template
 		$html = neon()->view->injectHtml($html);
@@ -446,15 +457,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;
 	}
 
@@ -508,13 +521,16 @@ 
 	 */
 	protected function loadUrlByNiceId($id)
 	{
-		if (!$id)
-			return null;
+		if (!$id) {
+					return null;
+		}
 		$this->loadUrls();
-		if (isset($this->_allUrlsByNiceId[$id]))
-			return $this->_allUrlsByNiceId[$id];
-		if (isset($this->_allUrlsByPageId[$id]))
-			return $this->_allUrlsByPageId[$id];
+		if (isset($this->_allUrlsByNiceId[$id])) {
+					return $this->_allUrlsByNiceId[$id];
+		}
+		if (isset($this->_allUrlsByPageId[$id])) {
+					return $this->_allUrlsByPageId[$id];
+		}
 		return $this->loadUrl($id);
 	}
 
@@ -525,15 +541,17 @@ 
 	 */
 	protected function loadUrl($id)
 	{
-		if (!$id)
-			return null;
+		if (!$id) {
+					return null;
+		}
 		$url = CmsUrl::find()->select("cms_url.*, cms_page.id as page_id")
 			->innerJoin('cms_page','`cms_page`.`nice_id`=`cms_url`.`nice_id`')
 			->where(['cms_page.id' => $id])
 			->orWhere(['cms_url.nice_id' => $id])
 			->asArray()->one();
-		if ($url)
-			$this->storeUrl($url);
+		if ($url) {
+					$this->storeUrl($url);
+		}
 		return $url;
 	}
 
@@ -658,8 +676,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 = [];
 		}
 	}
@@ -702,8 +721,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/cms/components/Theme.php

Braces +6 added lines, -4 removed lines

@@ -29,8 +29,9 @@ 
 			if (is_string($root) && count($themes)) {
 				foreach ($themes as $theme) {
 					$themePath = $root.$theme;
-					if (!isset($hierarchy[$theme]))
-						$hierarchy[$theme] = [];
+					if (!isset($hierarchy[$theme])) {
+											$hierarchy[$theme] = [];
+					}
 
 					// add the default template and plugin directories
 					$hierarchy[$theme]['templates'][] = $themePath;
@@ -104,8 +105,9 @@ 
 	private static function getRoot()
 	{
 		static $root = null;
-		if ($root === null)
-			$root = Neon::getAlias('@root/themes/');
+		if ($root === null) {
+					$root = Neon::getAlias('@root/themes/');
+		}
 		return $root;
 	}
 }

neon/cms/components/Widget.php

Braces +29 added lines, -20 removed lines

@@ -117,11 +117,13 @@ 
 			$defaults['type'] = $params['type'];
 			// path to the file is determined by the theme hierarchy
 			$defaults['file'] = $params['type'] . '.tpl';
-			if (isset($params['key']))
-				self::buildDataFromCmsKeyAttributes($params);
+			if (isset($params['key'])) {
+							self::buildDataFromCmsKeyAttributes($params);
+			}
  		}
-		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 = ArrayHelper::merge($defaults, $params);
 		$out = $widget->render($resolvedParams, $template);
 		return $out;
@@ -170,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);
@@ -207,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);
 		}
@@ -238,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 = [];
 
@@ -257,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;
 	}
 
@@ -314,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;
 	}
 
@@ -338,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/Daedalus.php

Braces +94 added lines, -68 removed lines

@@ -205,10 +205,11 @@ 
 				$result['edit'] = $this->createEditable($data);
 			}
 		}
-		if ($this->renderer)
-			$this->renderer->assign($this->params['assign'], $result);
-		else
-			return $result;
+		if ($this->renderer) {
+					$this->renderer->assign($this->params['assign'], $result);
+		} else {
+					return $result;
+		}
 	}
 
 	/**
@@ -226,19 +227,22 @@ 
 	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);
-		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: if you do not scope the member as class::member then you must provide the class parameter";
+		if (!isset($this->params['member'])) {
+					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: 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']));
-		else {
+		if (strpos($this->params['member'],':') !== false) {
+					list ($class, $member) = explode(':', str_replace('::',':',$this->params['member']));
+		} else {
 			$class = $this->params['class'];
 			$member = $this->params['member'];
 		}
@@ -250,10 +254,11 @@ 
 		if (!isset(self::$_choices[$key])) {
 			$dds = neon('dds')->iDdsClassManagement;
 			$result = $dds->getMember($class, $member, ['choices']);
-			if (!empty($result) && isset($result['choices']))
-				self::$_choices[$key] = $result['choices'];
-			else
-				self::$_choices[$key] = [];
+			if (!empty($result) && isset($result['choices'])) {
+							self::$_choices[$key] = $result['choices'];
+			} else {
+							self::$_choices[$key] = [];
+			}
 		}
 		$choices = self::$_choices[$key];
 		if (isset($this->params['order'])) {
@@ -263,10 +268,11 @@ 
 				asort($choices);
 			}
 		}
-		if ($this->renderer)
-			$this->renderer->assign($this->params['assign'], $choices);
-		else
-			return $choices;
+		if ($this->renderer) {
+					$this->renderer->assign($this->params['assign'], $choices);
+		} else {
+					return $choices;
+		}
 	}
 
 	/**
@@ -284,11 +290,13 @@ 
 	protected function queryMap()
 	{
 		// check usage
-		if (!isset($this->params['class']))
-			return "Usage: you must provide a 'class' parameter. You provided ".print_r($this->params,true);
+		if (!isset($this->params['class'])) {
+					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);
+		if ($this->renderer && !isset($this->params['assign'])) {
+					return "Usage: you must provide an 'assign' parameter. You provided ".print_r($this->params,true);
+		}
 
 		$fields = isset($this->params['fields']) ? $this->params['fields'] : [];
 
@@ -307,11 +315,13 @@ 
 			self::$_maps[$class] = $result;
 		}
 		$map = self::$_maps[$class];
-		if (isset($this->params['flip']))
-			$map = array_flip($map);
+		if (isset($this->params['flip'])) {
+					$map = array_flip($map);
+		}
 
-		if ($this->renderer)
-			$this->renderer->assign($this->params['assign'], $map);
+		if ($this->renderer) {
+					$this->renderer->assign($this->params['assign'], $map);
+		}
 
 		return $map;
 	}
@@ -328,11 +338,13 @@ 
 		$json = trim(str_replace("'", '"', $data));
 		if (strlen($json) > 0) {
 			// for convenience the beginning and ending brackets are optional so add if not supplied
-			if (strpos($json, '{') !== 0)
-				$json = '{'.$json.'}';
+			if (strpos($json, '{') !== 0) {
+							$json = '{'.$json.'}';
+			}
 			$request = json_decode($json, true);
-			if ($request === null)
-				throw new \Exception("Failing to json decode the data request: $json converted from $data. ");
+			if ($request === null) {
+							throw new \Exception("Failing to json decode the data request: $json converted from $data. ");
+			}
 		}
 		return $request;
 	}
@@ -357,10 +369,12 @@ 
 		$dps = array_intersect_key($params, array_flip($dpa));
 		if (count($dps)) {
 			$data = [];
-			if ((isset($dps['dds']) || isset($dps['dds_page'])) && empty($dps['dds_class']))
-				$dps['dds_class'] = $params['type'];
-			if (isset($dps['dds_class']))
-				$data[] = "'class':'$dps[dds_class]'";
+			if ((isset($dps['dds']) || isset($dps['dds_page'])) && empty($dps['dds_class'])) {
+							$dps['dds_class'] = $params['type'];
+			}
+			if (isset($dps['dds_class'])) {
+							$data[] = "'class':'$dps[dds_class]'";
+			}
 
 			// create the filters
 			$filters = [];
@@ -368,51 +382,60 @@ 
 			// create the page specific filter
 			if (!empty($dps['dds_page'])) {
 				$pageId = null;
-				if ($dps['dds_page'] === true || $dps['dds_page'] === 'true')
-					$pageId = self::$page->getId();
-				else {
+				if ($dps['dds_page'] === true || $dps['dds_page'] === 'true') {
+									$pageId = self::$page->getId();
+				} else {
 					// either a nice id or a page id
 					$pageId = self::$page->niceId2PageId($dps['dds_page']);
-					if (!$pageId)
-						$pageId = $dps['dds_page'];
+					if (!$pageId) {
+											$pageId = $dps['dds_page'];
+					}
+				}
+				if ($pageId) {
+									$filters[] = "['page_id','=','$pageId']";
 				}
-				if ($pageId)
-					$filters[] = "['page_id','=','$pageId']";
 			}
 
 			// add other filters
 			if (isset($dps['dds_filter']) && !empty($dps['dds_filter'])) {
-				if (is_array($dps['dds_filter']))
-					$filters[] = json_encode($dps['dds_filter']);
+				if (is_array($dps['dds_filter'])) {
+									$filters[] = json_encode($dps['dds_filter']);
+				}
 				// else deprecated json approach
-				else if (strpos(trim($dps['dds_filter']), '[')!==0)
-					$filters[] = "[$dps[dds_filter]]";
-				else
-					$filters[] = $dps['dds_filter'];
+				else if (strpos(trim($dps['dds_filter']), '[')!==0) {
+									$filters[] = "[$dps[dds_filter]]";
+				} else {
+									$filters[] = $dps['dds_filter'];
+				}
 			}
 
 			// create the filters clause
-			if (count($filters))
-				$data[] = "'filters':".implode(',',$filters);
+			if (count($filters)) {
+							$data[] = "'filters':".implode(',',$filters);
+			}
 
 			// sort out the order
 			if (isset($dps['dds_order'])) {
-				if (is_array($dps['dds_order']))
-					$data[] = "'order':".json_encode($dps['dds_order']);
+				if (is_array($dps['dds_order'])) {
+									$data[] = "'order':".json_encode($dps['dds_order']);
+				}
 				// else deprecated json approach
-				else
-					$data[] = "'order':{".$dps['dds_order']."}";
+				else {
+									$data[] = "'order':{".$dps['dds_order']."}";
+				}
 			}
 
 			// sort out the limit
 			if (isset($dps['dds_limit'])) {
-				if (is_numeric($dps['dds_limit']))
-					$data[] = "'limit':{'length':$dps[dds_limit]}";
-				else if (is_array($dps['dds_limit']))
-					$data[] = "'limit':".json_encode($dps['dds_limit']);
+				if (is_numeric($dps['dds_limit'])) {
+									$data[] = "'limit':{'length':$dps[dds_limit]}";
+				} else if (is_array($dps['dds_limit'])) {
+									$data[] = "'limit':".json_encode($dps['dds_limit']);
+				}
 				// else deprecated json approach
-				else
-					$data[] = "'limit':{".$dps['dds_limit']."}";
+				else {
+									$data[] = "'limit':{".$dps['dds_limit']."}";
+				}
 			}
 			$params['data'] = '{'.implode(', ', $data).'}';
 		}
@@ -429,8 +452,9 @@ 
 	protected function canonicalise($params)
 	{
 		$canon = [];
-		if (empty($params['assign']) && $this->renderer !== null)
-			throw new \InvalidArgumentException("You must set an 'assign' parameter when using the 'dds' tag");
+		if (empty($params['assign']) && $this->renderer !== null) {
+					throw new \InvalidArgumentException("You must set an 'assign' parameter when using the 'dds' tag");
+		}
 		foreach ($params as $k => $v) {
 			if ($k == 'assign') {
 				$canon[$k] = $v;
@@ -458,8 +482,9 @@ 
 				$classType = $d['_class_type'];
 				foreach ($d as $field=>$value) {
 					// ignore all bookkeeping fields
-					if (strpos($field, '_')===0)
-						continue;
+					if (strpos($field, '_')===0) {
+											continue;
+					}
 					$edit[$i][$field] = self::createFieldEditable($classType, $field, $d['_uuid'], $value);
 				}
 			}
@@ -477,8 +502,9 @@ 
 	 */
 	public static function createFieldEditable($classType, $field, $key, $value)
 	{
-		if (is_array($value))
-			return $value;
+		if (is_array($value)) {
+					return $value;
+		}
 
 		/**
 		 * This needs to be changed to generate an appropriate form to edit the

neon/cms/controllers/DataController.php

Braces +13 added lines, -10 removed lines

@@ -39,17 +39,19 @@ 
 	{
 		// see if we have a key and if not we can do nothing
 		$key = neon()->request->post('key');
-		if (empty($key))
-			return;
+		if (empty($key)) {
+					return;
+		}
 		$content = neon()->request->postUnsafe('content');
 		$content = Html::sanitise($content, $this->inlineAllowedTags);
 		$pageId = neon()->request->post('pageId', null);
 		try {
 			$result = neon('cms')->getICmsStaticData()->editStaticContent($key, $pageId, $content);
-			if ($result === true)
-				return ['success'=>true, 'saved'=>$content];
-			else
-				return neon()->debug ? ['success'=>false, 'errors'=>$result] : ['success'=>false];
+			if ($result === true) {
+							return ['success'=>true, 'saved'=>$content];
+			} else {
+							return neon()->debug ? ['success'=>false, 'errors'=>$result] : ['success'=>false];
+			}
 		} catch (\Exception $e) {
 			return neon()->debug ? ['success'=>false, 'errors'=>$e->getMessage()] : ['success'=>false];
 		}
@@ -67,10 +69,11 @@ 
 		$pageId = neon()->request->post('pageId', null);
 		try {
 			$result = neon()->cms->getICmsStaticData()->editStaticContent($key, $pageId, $content);
-			if ($result === true)
-				return ['success'=>true, 'saved'=>$content];
-			else if (neon()->debug)
-				return neon()->debug ? ['success'=>false, 'errors'=>$result] : ['success'=>false];
+			if ($result === true) {
+							return ['success'=>true, 'saved'=>$content];
+			} else if (neon()->debug) {
+							return neon()->debug ? ['success'=>false, 'errors'=>$result] : ['success'=>false];
+			}
 		} catch (\Exception $e) {
 			return neon()->debug ? ['success'=>false, 'errors'=>$e->getMessage()] : ['success'=>false];
 		}

neon/cms/controllers/RenderController.php

Braces +6 added lines, -4 removed lines

@@ -97,8 +97,9 @@ 
 		}
 
 		$render = $page->render();
-		if ($render === false)
-			throw new \yii\web\HttpException(404, 'No template found');
+		if ($render === false) {
+					throw new \yii\web\HttpException(404, 'No template found');
+		}
 
 		\Neon::endProfile('COBE::RENDER_ACTION', 'cobe');
 		return $render;
@@ -112,8 +113,9 @@ 
 	{
 		$request = neon()->request;
 		$url = $request->get('page');
-		if (!$url)
-			$this->pageNotFound();
+		if (!$url) {
+					$this->pageNotFound();
+		}
 		\Neon::app('cms')->page->setByUrl($url);
 		$pageData = neon()->getCms()->getPage()->getPageData();
 		return $this->actionPage($pageData['nice_id']);

neon/cms/App.php

Braces +12 added lines, -8 removed lines

@@ -146,11 +146,13 @@ 
 	public function getThemeHierarchy()
 	{
 		// if we have a theme hierarchy use that
-		if (count($this->_themeHierarchy))
-			return $this->_themeHierarchy;
+		if (count($this->_themeHierarchy)) {
+					return $this->_themeHierarchy;
+		}
 		// otherwise drop back to the themeName
-		if (!empty($this->_themeName))
-			return [$this->_themeName];
+		if (!empty($this->_themeName)) {
+					return [$this->_themeName];
+		}
 		// otherwise return nothing
 		return [];
 	}
@@ -261,8 +263,9 @@ 
 	 */
 	public function getMapResults($requestKey)
 	{
-		if (!isset($this->_mapRequestKey[$requestKey]))
-			throw new \InvalidArgumentException('The provided request key "'.$requestKey.'" does not exist');
+		if (!isset($this->_mapRequestKey[$requestKey])) {
+					throw new \InvalidArgumentException('The provided request key "'.$requestKey.'" does not exist');
+		}
 		list($key, $ids, $fields) = $this->_mapRequestKey[$requestKey];
 		if ($key === 'pages') {
 			$pages = CmsPage::find()->select(array_merge(['id', 'nice_id', 'title'], $fields))
@@ -298,8 +301,9 @@ 
 	public function formatPageMapResults($pages, $fields)
 	{
 		return collect($pages)->mapWithKeys(function ($item, $key) use($fields) {
-			if (empty($fields))
-				return [$item['id'] => $item['nice_id'] . ': ' . $item['title']];
+			if (empty($fields)) {
+							return [$item['id'] => $item['nice_id'] . ': ' . $item['title']];
+			}
 			return [$item['id'] => $item];
 		})->all();
 	}

neon/phoebe/services/PhoebeService.php

Braces +8 added lines, -6 removed lines

@@ -82,13 +82,15 @@
 		$types = $this->listPhoebeTypes();
 		$requested = isset($types[$phoebeKey]) ? $types[$phoebeKey] : null;
 		// check that we can create the requested type
-		if (!($requested && in_array($requested['status'], ['AVAILABLE', 'IN_DEVELOPMENT'])))
-			return null;
+		if (!($requested && in_array($requested['status'], ['AVAILABLE', 'IN_DEVELOPMENT']))) {
+					return null;
+		}
 		$adapter = $requested['adapter'];
-		if (strpos($adapter, '\\') !== false)
-			$type = $adapter;
-		else
-			$type = str_replace('ADAPTER', $requested['adapter'], $this->genericTypePath);
+		if (strpos($adapter, '\\') !== false) {
+					$type = $adapter;
+		} else {
+					$type = str_replace('ADAPTER', $requested['adapter'], $this->genericTypePath);
+		}
 		return $type ? new $type : 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)) {
 			$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;
 	}