newicon / neon

neon/core/helpers/Html.php

Braces +26 added lines, -18 removed lines

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

neon/core/view/SmartySharedPlugins.php

Spacing +32 added lines, -32 removed lines

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

neon/core/grid/column/Column.php

Spacing +19 added lines, -19 removed lines

@@ -164,7 +164,7 @@ 
 		return $this->_width;
 	}
 
-	public function __construct($config=[])
+	public function __construct($config = [])
 	{
 		parent::__construct($config);
 		if (!isset($config['key'])) {
@@ -252,7 +252,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function setIsSortable($bool=true)
+	public function setIsSortable($bool = true)
 	{
 		$this->_sortable = $bool;
 	}
@@ -265,7 +265,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
@@ -333,7 +333,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;
 		}
@@ -399,7 +399,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function setDbField($field){
+	public function setDbField($field) {
 		$this->_dbKey = $field;
 		return $this;
 	}
@@ -407,8 +407,8 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function getDbField(){
-		if ($this->_dbKey === null){
+	public function getDbField() {
+		if ($this->_dbKey === null) {
 			// set to be the key
 			$this->_dbKey = $this->key;
 		}
@@ -457,9 +457,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]);
 	}
 
 	/**
@@ -513,7 +513,7 @@ 
 	public function getFilterField()
 	{
 		$field = $this->getBaseFilterField();
-		foreach($this->filterFieldConfig as $key => $value)
+		foreach ($this->filterFieldConfig as $key => $value)
 			$field[$key] = $value;
 		return $field;
 	}
@@ -529,7 +529,7 @@ 
 
 	public function setMemberConfig($config)
 	{
-		foreach($config as $key => $value) {
+		foreach ($config as $key => $value) {
 			if (isset($this->member->$key))
 				$this->member->$key = $value;
 		}
@@ -539,7 +539,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function getCellData($row, $noValue='-')
+	public function getCellData($row, $noValue = '-')
 	{
 		$data = null;
 		$key = $this->getKey();
@@ -592,7 +592,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);
 	}
@@ -602,7 +602,7 @@ 
 	 */
 	public function getFieldName()
 	{
-		return $this->getGrid()->getId() . '[' . $this->key . '][search]';
+		return $this->getGrid()->getId().'['.$this->key.'][search]';
 	}
 
 	/**
@@ -676,12 +676,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;
@@ -707,7 +707,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'];
@@ -734,7 +734,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);
@@ -759,7 +759,7 @@ 
 			if (count($columnData)) {
 				$this->member->dataMapFilters = ['uuid' => $columnData];
 			}
-			foreach($models as $model) {
+			foreach ($models as $model) {
 				$this->member->makeMapRequest($this->getCellData($model, null));
 			}
 		}