newicon / neon

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 {

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

neon/core/view/SmartySharedPlugins.php

Spacing +3 added lines, -6 removed lines

@@ -538,8 +538,8 @@ 
 
 		$html = [];
 		$params['loading'] = Arr::get($params, 'loading', 'lazy');
-		$params[Arr::get($params, 'srcset-name', 'srcset')] = Arr::get($params, 'srcset', $this->image_srcset(['src' => $id, 'quality'=> $quality, 'widths'=>$widths]));
-		$params[Arr::get($params, 'src-name', 'src')] = $this->firefly_image(['id' => $id, 'w' => (int)$srcWidth, 'q' => $quality]);
+		$params[Arr::get($params,  'srcset-name', 'srcset')] = Arr::get($params, 'srcset', $this->image_srcset(['src' => $id, 'quality'=> $quality, 'widths'=>$widths]));
+		$params[Arr::get($params,  'src-name', 'src')] = $this->firefly_image(['id' => $id, 'w' => (int)$srcWidth, 'q' => $quality]);
 
 		// alt
 		$params['alt'] = Arr::get($params, 'alt', $this->image_alt(['src' => $id]));
@@ -897,7 +897,4 @@ 
 		if (!empty($params['assign'])) {
 			$smarty->assign($params['assign'], $output);
 		} else {
-			return $output;
-		}
-	}
-}
+			return $output
\ No newline at end of file

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);
 	}
 
 	/**