newicon / neon

neon/core/view/SmartySharedPlugins.php

Braces +35 added lines, -25 removed lines

@@ -148,8 +148,9 @@ 
 			if (class_exists($class)) {
 				$widget = new $class();
 				foreach($params as $key => $val) {
-					if ($widget->hasProperty($key))
-						$widget->$key = $val;
+					if ($widget->hasProperty($key)) {
+											$widget->$key = $val;
+					}
 				}
 				return $widget->run();
 			} else {
@@ -176,8 +177,9 @@ 
 		$name = Arr::getRequired($params, 'name');
 		$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');
+		if (!is_array($options)) {
+					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);
@@ -259,8 +261,9 @@ 
 	 */
 	public function firefly_url($params)
 	{
-		if (isset($params['id']))
-			return neon()->firefly->getUrl($params['id']);
+		if (isset($params['id'])) {
+					return neon()->firefly->getUrl($params['id']);
+		}
 	}
 
 	/**
@@ -285,8 +288,9 @@ 
 	 */
 	public function firefly_image($params)
 	{
-		if (isset($params['id']))
-			return neon()->firefly->getImage(Arr::pull($params, 'id'), $params);
+		if (isset($params['id'])) {
+					return neon()->firefly->getImage(Arr::pull($params, 'id'), $params);
+		}
 	}
 
 	/**
@@ -352,8 +356,7 @@ 
 				}
 				$srcSizeParts[]=$break;
 			}
-		}
-		elseif (isset($params['resolutions'])) {
+		} 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) {
@@ -364,8 +367,7 @@ 
 					throw new \InvalidArgumentException("The resolution '".$useResolution."' is not a valid resolution, it should be numeric and then end with an 'x'");
 				}
 			}
-		}
-		else {
+		} else {
 			// if neither 'breaks' or 'resolutions' was specified then use the widths
 			foreach ($widths as $idx=>$width) {
 				if ($idx==0 && $minBreak) {
@@ -394,8 +396,7 @@ 
 			$imageUrl = $this->firefly_image($useParams);
 			if ($useResolutions) {
 				$srcsetParts[] = $imageUrl.( ($idx>=1) ? ' '.$useResolutions[$idx-1] : '' );
-			}
-			else {
+			} else {
 				$srcsetParts[] = $imageUrl . ' ' . $width . 'w';
 			}
 			if ($idx==0 && !isset($params['src-width']) && !isset($params['src'])) {
@@ -456,10 +457,11 @@ 
 		$assign = isset($params['assign']) ? $params['assign'] : null;
 		if ($app && $name) {
 			$value = neon('settings')->manager->get($app, $name, $default);
-			if ($assign)
-				$smarty->assign($assign, $value);
-			else
-				return $value;
+			if ($assign) {
+							$smarty->assign($assign, $value);
+			} else {
+							return $value;
+			}
 		} else {
 			return "Usage: you must provide an 'app' and a 'name' parameter. You provided ".print_r($params,true);
 		}
@@ -482,8 +484,9 @@ 
 	public function time($params)
 	{
 		$format = 'Y-m-d H:i:s';
-		if (isset($params['stamp']))
-			return date($format, (integer)$params['stamp']);
+		if (isset($params['stamp'])) {
+					return date($format, (integer)$params['stamp']);
+		}
 		return date($format);
 	}
 
@@ -555,7 +558,9 @@ 
 	 */
 	public function js($params, $content)
 	{
-		if ($content == null) return;
+		if ($content == null) {
+			return;
+		}
 		$key = Arr::get($params, 'key', null);
 		$content = str_replace(['<script>', '</script>'], '', $content);
 		neon()->view->registerJs($content, $this->getAssetPosition($params), $key);
@@ -578,7 +583,9 @@ 
 	 */
 	public function css($params, $content)
 	{
-		if ($content == null) return;
+		if ($content == null) {
+			return;
+		}
 		$key = Arr::get($params, 'key', null);
 		$content = str_replace(['<style>', '</style>'], '', $content);
 		neon()->view->registerCss($content, ['position'=>$this->getAssetPosition($params, 'head')], $key);
@@ -605,7 +612,9 @@ 
 	{
 		// get the bundle - will look for `name` or `bundle` or `path` keys
 		$class = Arr::get($params, 'name', Arr::get($params, 'path', null));
-		if ($class == null) return;
+		if ($class == null) {
+			return;
+		}
 
 		// get the position - will looks for `pos` or `position` keys - defaults View::POS_END
 		$position = Arr::get($params, 'pos', Arr::get($params, 'position', 'end'));
@@ -703,8 +712,9 @@ 
 	 */
 	public function hasPermission($params, $smarty)
 	{
-		if (empty($params['permission']))
-			trigger_error("permission: missing 'permission' parameter");
+		if (empty($params['permission'])) {
+					trigger_error("permission: missing 'permission' parameter");
+		}
 		$permission = $params['permission'];
 		$assign = empty($params['assign']) ? $permission : $params['assign'];
 		$canDo = neon()->user->can($permission, $params);

neon/core/ApplicationTrait.php

Braces +18 added lines, -12 removed lines

@@ -413,8 +413,9 @@ 
 		$this->setModule($name, $config);
 
 		// set up any alternatives for this
-		if (isset($config['appAliases']))
-			$this->setModuleAliases($name, $config['appAliases']);
+		if (isset($config['appAliases'])) {
+					$this->setModuleAliases($name, $config['appAliases']);
+		}
 	}
 
 	/**
@@ -468,8 +469,9 @@ 
 		foreach($apps as $app => $config) {
 			$appObject = $this->getApp($app);
 			// apps that are disabled will return null
-			if ($appObject !== null)
-				$ret[$app] = $this->getApp($app);
+			if ($appObject !== null) {
+							$ret[$app] = $this->getApp($app);
+			}
 		}
 		return $ret;
 	}
@@ -485,8 +487,9 @@ 
 	public function orderAppsByRequired($apps, &$ordered = null, &$read = null)
 	{
 		static $initialApps = null;
-		if ($ordered == null)
-			$initialApps = $apps;
+		if ($ordered == null) {
+					$initialApps = $apps;
+		}
 		$ordered = $ordered == null ? [] : $ordered;
 		$read = $read == null ? [] : $read;
 		foreach ($apps as $key=>$app) {
@@ -497,15 +500,17 @@ 
 				foreach ($requires as $r) {
 					$r = trim($r);
 					// prevent circular references breaking the system
-					if (!array_key_exists($r, $read))
-						$required[$r] = $initialApps[$r];
+					if (!array_key_exists($r, $read)) {
+											$required[$r] = $initialApps[$r];
+					}
 				}
 				if (count($required)) {
 					$this->orderAppsByRequired($required, $ordered, $read);
 				}
 			}
-			if (!array_key_exists($key, $ordered))
-				$ordered[$key] = $app;
+			if (!array_key_exists($key, $ordered)) {
+							$ordered[$key] = $app;
+			}
 		}
 	}
 
@@ -677,8 +682,9 @@ 
 	 */
 	private function setModuleAliases($name, $aliases)
 	{
-		foreach($aliases as $alias)
-			static::$_moduleAliases[$alias] = $name;
+		foreach($aliases as $alias) {
+					static::$_moduleAliases[$alias] = $name;
+		}
 	}
 
 	/**

neon/core/web/Request.php

Braces +18 added lines, -10 removed lines

@@ -151,10 +151,12 @@ 
 	 */
 	public function get($name = null, $defaultValue = null)
 	{
-		if ($this->_sanitisedQueryParams == null)
-			$this->sanitiseBodyQueryParams();
-		if ($name == null)
-			return $this->_sanitisedQueryParams;
+		if ($this->_sanitisedQueryParams == null) {
+					$this->sanitiseBodyQueryParams();
+		}
+		if ($name == null) {
+					return $this->_sanitisedQueryParams;
+		}
 		return isset($this->_sanitisedQueryParams[$name]) ? $this->_sanitisedQueryParams[$name] : $defaultValue;
 	}
 
@@ -167,10 +169,12 @@ 
 	 */
 	public function post($name = null, $defaultValue = null)
 	{
-		if ($this->_sanitisedBodyParams == null)
-			$this->sanitiseBodyQueryParams();
-		if ($name == null)
-			return $this->_sanitisedBodyParams;
+		if ($this->_sanitisedBodyParams == null) {
+					$this->sanitiseBodyQueryParams();
+		}
+		if ($name == null) {
+					return $this->_sanitisedBodyParams;
+		}
 		return isset($this->_sanitisedBodyParams[$name]) ? $this->_sanitisedBodyParams[$name] : $defaultValue;
 	}
 
@@ -304,10 +308,14 @@ 
 		$route = neon()->controller->getRoute();
 		$match = Str::is(ltrim($pattern, '/'), $route);
 		// we can return imidiately if the route does not match the pattern
-		if (!$match) return false;
+		if (!$match) {
+			return false;
+		}
 
 		// if no param search specified then return the match
-		if (empty($params)) return $match;
+		if (empty($params)) {
+			return $match;
+		}
 
 		// Finally check if $params exist in request params
 		return Arr::isSubset($params, neon()->request->getQueryParams());

neon/core/web/StyleManager.php

Braces +3 added lines, -2 removed lines

@@ -72,8 +72,9 @@
 		// check if a style property already exists
 		$styleValue = $this->getStyleValue($name, $default);
 		$options['name'] = $name;
-		if (!isset($options['class']))
-			$options['class'] = $type;
+		if (!isset($options['class'])) {
+					$options['class'] = $type;
+		}
 		$options['label'] = Arr::get($options, 'label', Str::humanize($name));
 		$this->set($name, $styleValue, $options);
 		return $styleValue;

neon/core/web/View.php

Braces +21 added lines, -13 removed lines

@@ -189,8 +189,9 @@ 
 	public function renderHeadHtml()
 	{
 		profile_begin('renderHeadHtml');
-		if ($this->cssConcatenate)
-			$this->cssFiles = $this->resolveFiles($this->cssFiles, 'css');
+		if ($this->cssConcatenate) {
+					$this->cssFiles = $this->resolveFiles($this->cssFiles, 'css');
+		}
 		$out = parent::renderHeadHtml() . "\n" . $this->getHtmlFragment(self::POS_HEAD);
 		profile_end('renderHeadHtml');
 		return $out;
@@ -211,8 +212,9 @@ 
 	{
 		profile_begin('renderBodyEndHtml');
 		if ($this->jsConcatenate) {
-			if (isset($this->jsFiles[self::POS_END]))
-				$this->jsFiles[self::POS_END] = $this->resolveFiles($this->jsFiles[self::POS_END], 'js');
+			if (isset($this->jsFiles[self::POS_END])) {
+							$this->jsFiles[self::POS_END] = $this->resolveFiles($this->jsFiles[self::POS_END], 'js');
+			}
 		}
 		$out = parent::renderBodyEndHtml($ajaxMode) . "\n" . $this->getHtmlFragment(self::POS_END);
 		profile_end('renderBodyEndHtml');
@@ -260,7 +262,9 @@ 
 		$concatFiles = $this->findFilesToConcatenate($files);
 		$url = ($type === 'css') ? $this->cssConcatenateFiles($concatFiles) : $this->jsConcatenateFiles($concatFiles);
 		// replace css/js files to be output with the one concatenated file
-		foreach($concatFiles as $fileKey) unset($files[$fileKey]);
+		foreach($concatFiles as $fileKey) {
+			unset($files[$fileKey]);
+		}
 		$files[$url] = ($type === 'css') ? Html::cssFile($url) : Html::jsFile($url);
 		return $files;
 	}
@@ -359,11 +363,13 @@ 
 		$concatenateFiles = [];
 		foreach ($files as $fileKey => $tag) {
 			// Do not concatenate externally loaded files (for e.g. from cdns)
-			if (Url::isAbsolute($fileKey))
-				continue;
+			if (Url::isAbsolute($fileKey)) {
+							continue;
+			}
 			// remove excluded files - files we do not want to concatenate
-			if (Str::contains($tag, 'concatenate="false"'))
-				continue;
+			if (Str::contains($tag, 'concatenate="false"')) {
+							continue;
+			}
 			$concatenateFiles[] = $fileKey;
 		}
 		profile_end('_findFilesToConcatenate');
@@ -383,8 +389,9 @@ 
 	private function _assetManagerGenerate($path, $callback)
 	{
 		$file = neon()->getAlias(neon()->assetManager->basePath . $path);
-		if (! file_exists($file))
-			File::createFile($file, $callback());
+		if (! file_exists($file)) {
+					File::createFile($file, $callback());
+		}
 		return neon()->assetManager->baseUrl . $path;
 	}
 
@@ -407,8 +414,9 @@ 
 			$this->renderFile($file, $this->getStyleData($styleKey))
 			: file_get_contents(neon()->getAlias($file));
 		// minify css file
-		if (neon()->view->cssMinify)
-			$css = Css::minify($css);
+		if (neon()->view->cssMinify) {
+					$css = Css::minify($css);
+		}
 		return $css;
 	}
 

neon/core/controllers/GridController.php

Braces +3 added lines, -2 removed lines

@@ -29,8 +29,9 @@
 			unset($rows);
 		} while ($hasRows === true);
 		$handle = fopen($csvFile, 'r');
-		if ($handle)
-			neon()->response->sendStreamAsFile($handle, $grid->title.'.csv')->send();
+		if ($handle) {
+					neon()->response->sendStreamAsFile($handle, $grid->title.'.csv')->send();
+		}
 		@unlink($csvFile);
 	}
 

neon/core/helpers.php

Braces +17 added lines, -12 removed lines

@@ -31,10 +31,11 @@ 
 	{
 		echo dp_string(...$dump);
 		$backtrace = backtrace_line_by_function('dp');
-		if (neon()->debug)
-			echo $backtrace;
-		else
-			\Neon::error($backtrace);
+		if (neon()->debug) {
+					echo $backtrace;
+		} else {
+					\Neon::error($backtrace);
+		}
 	}
 }
 
@@ -85,8 +86,9 @@ 
 			$str .= "<pre>$debug</pre>";
 		}
 
-		if (neon()->debug)
-			return $str;
+		if (neon()->debug) {
+					return $str;
+		}
 		\Neon::error($str);
 		return '';
 	}
@@ -124,8 +126,9 @@ 
 	function debug_message(...$dump)
 	{
 		// security feature to ensure debug is not displayed unless in debug mode
-		if (!neon()->debug)
-			return '';
+		if (!neon()->debug) {
+					return '';
+		}
 		return dp_string(...$dump);
 	}
 }
@@ -242,8 +245,9 @@ 
 	 */
 	function truthy($value)
 	{
-		if ($value && strtolower($value) !== "false")
-			return true;
+		if ($value && strtolower($value) !== "false") {
+					return true;
+		}
 		return false;
 	}
 }
@@ -450,8 +454,9 @@ 
 	function faker()
 	{
 		static $faker = null;
-		if ($faker === null)
-			$faker = \Faker\Factory::create();
+		if ($faker === null) {
+					$faker = \Faker\Factory::create();
+		}
 		return $faker;
 	}
 }

neon/core/test/Unit.php

Braces +3 added lines, -2 removed lines

@@ -38,8 +38,9 @@
 		$source = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
 		$sourceLen = strlen($source);
 		$string = '';
-		for ($i=0; $i<$size; $i++)
-			$string .= substr($source, rand(0, $sourceLen-1), 1);
+		for ($i=0; $i<$size; $i++) {
+					$string .= substr($source, rand(0, $sourceLen-1), 1);
+		}
 		return $string;
 	}
 

neon/core/BaseApp.php

Braces +3 added lines, -2 removed lines

@@ -106,8 +106,9 @@
 	public function getMenu()
 	{
 		// if the menu has been overridden
-		if ($this->_menu !== null)
-			return $this->_menu;
+		if ($this->_menu !== null) {
+					return $this->_menu;
+		}
 		return $this->getDefaultMenu();
 	}