newicon / neon

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)
@@ -149,7 +149,7 @@ 
 	 * Set whether this column is sortable or not
 	 * @param bool $bool
 	 */
-	public function setIsSortable($bool=true);
+	public function setIsSortable($bool = true);
 
 	/**
 	 * Is the column sortable
@@ -222,7 +222,7 @@ 
 	 *
 	 * @param boolean $bool
 	 */
-	public function setAsIndex($bool=true);
+	public function setAsIndex($bool = true);
 
 	/**
 	 * Set the title of the column
@@ -270,7 +270,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
@@ -314,7 +314,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/core/grid/column/Column.php

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;
 	}
 
@@ -437,10 +438,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);
@@ -451,8 +454,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() ? ' - ' : ' + ';
@@ -482,10 +486,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);
@@ -513,8 +519,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;
 	}
 
@@ -530,8 +537,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;
 	}
@@ -709,7 +717,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]);

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

neon/core/grid/GridAssets.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
  */
 class GridAssets extends AssetBundle
 {
-	public $sourcePath = __DIR__ . '/assets';
+	public $sourcePath = __DIR__.'/assets';
 
 	public $js = [
 		(YII_DEBUG ? 'neon-grid.js' : 'neon-grid.build.js'),

neon/core/grid/GridBase.php

Spacing +24 added lines, -24 removed lines

@@ -375,7 +375,7 @@ 
 	 * @param string $name
 	 * @param callable $function
 	 */
-	public function addScope($key, $name, $function=null)
+	public function addScope($key, $name, $function = null)
 	{
 		$this->_scopes[$key] = compact('key', 'name', 'function');
 	}
@@ -438,7 +438,7 @@ 
 			$this->_filterForm = (new Form($this->getId()))
 				->setId($this->getId().'Filter')
 				->addSubForm('filter');
-			foreach($this->getColumns() as $key => $column) {
+			foreach ($this->getColumns() as $key => $column) {
 				if ($column->getFilter() && $column->getFilterField() !== false) {
 					$field = $column->getFilterField();
 					if (is_object($field))
@@ -548,7 +548,7 @@ 
 	 */
 	public function setColumns($columns)
 	{
-		foreach($columns as $key => $config) {
+		foreach ($columns as $key => $config) {
 			$this->addColumn($key, $config);
 		}
 	}
@@ -561,7 +561,7 @@ 
 	 * @throws \Exception on incorrect column config
 	 * @return \neon\core\grid\column\Text
 	 */
-	public function addTextColumn($key, $config=[])
+	public function addTextColumn($key, $config = [])
 	{
 		$config['class'] = isset($config['class']) ? $config['class'] : 'neon\core\grid\column\Text';
 		return $this->addColumn($key, $config);
@@ -575,7 +575,7 @@ 
 	 * @throws \Exception on incorrect column config
 	 * @return \neon\core\grid\column\Date
 	 */
-	public function addDateColumn($key, $config=[])
+	public function addDateColumn($key, $config = [])
 	{
 		$config['class'] = isset($config['class']) ? $config['class'] : 'neon\core\grid\column\Date';
 		return $this->addColumn($key, $config);
@@ -589,7 +589,7 @@ 
 	 * @throws \Exception on incorrect column config
 	 * @return \neon\core\grid\column\IntColumn
 	 */
-	public function addIntColumn($key, $config=[])
+	public function addIntColumn($key, $config = [])
 	{
 		$config['class'] = isset($config['class']) ? $config['class'] : 'neon\core\grid\column\IntColumn';
 		return $this->addColumn($key, $config);
@@ -603,9 +603,9 @@ 
 	 * @return \neon\core\grid\column\Check
 	 * @throws \Exception
 	 */
-	public function addCheckColumn($key, $config=[])
+	public function addCheckColumn($key, $config = [])
 	{
-		$config['class'] = isset($config['class']) ?  $config['class'] : 'neon\core\grid\column\Check';
+		$config['class'] = isset($config['class']) ? $config['class'] : 'neon\core\grid\column\Check';
 		return $this->addColumn($key, $config);
 	}
 
@@ -617,9 +617,9 @@ 
 	 * @throws \Exception on incorrect column config
 	 * @return \neon\core\grid\column\Button
 	 */
-	public function addButtonColumn($key, $config=[])
+	public function addButtonColumn($key, $config = [])
 	{
-		$config['class'] = isset($config['class']) ?  $config['class'] : 'neon\core\grid\column\Button';
+		$config['class'] = isset($config['class']) ? $config['class'] : 'neon\core\grid\column\Button';
 		return $this->addColumn($key, $config);
 	}
 
@@ -634,9 +634,9 @@ 
 	 * @throws \Exception
 	 * @return Column
 	 */
-	public function addColumnFromDefinition($key, $class, $member=null, $phoebeType='daedalus')
+	public function addColumnFromDefinition($key, $class, $member = null, $phoebeType = 'daedalus')
 	{
-		static $formsDefinitionCache=[];
+		static $formsDefinitionCache = [];
 		$cacheKey = $class.$phoebeType;
 		if (!array_key_exists($cacheKey, $formsDefinitionCache)) {
 			$formDefinition = neon('phoebe')->getFormDefinition($phoebeType, $class);
@@ -683,7 +683,7 @@ 
 	 * @return \neon\core\grid\column\Column
 	 * @throws \Exception if no `$config['class']` is set
 	 */
-	public function addColumn($key, $config=[])
+	public function addColumn($key, $config = [])
 	{
 		if (!isset($config['class'])) {
 			// 99% of the time you just want the standard Column class
@@ -745,7 +745,7 @@ 
 	 */
 	public function hasData()
 	{
-		return ! empty($this->_gridData);
+		return !empty($this->_gridData);
 	}
 
 	/**
@@ -780,7 +780,7 @@ 
 	 */
 	public function gridBoot()
 	{
-		if (! $this->hasData())
+		if (!$this->hasData())
 			$this->_gridData = Arr::get($_REQUEST, $this->id, null);
 		// load the active scope
 		$this->_scope = Arr::get($this->_gridData, "scope", []);
@@ -815,7 +815,7 @@ 
 	 *   and true if you want the data returned as an array
 	 * @return string | array  depending on value of $asRows
 	 */
-	public function exportCsv($page=0, $pageSize=1000, $asRows=false)
+	public function exportCsv($page = 0, $pageSize = 1000, $asRows = false)
 	{
 		// check we're allowed to do this
 		if (!$this->canExportCsv)
@@ -838,14 +838,14 @@ 
 		// Render the rows
 		$dataProvider = $this->getDataProvider();
 		$pagination = $dataProvider->pagination;
-		$pagination->page=$page;
-		$pagination->pageSize = min(1000,$pageSize);
+		$pagination->page = $page;
+		$pagination->pageSize = min(1000, $pageSize);
 		$models = $dataProvider->getModels();
 		if (empty($models))
 			return null;
 
 		$rows = [];
-		foreach($models as $index => $row) {
+		foreach ($models as $index => $row) {
 			$singleRow = [];
 			// use the columns set as not all columns exists in row data e.g. derived ones
 			foreach ($columns as $colKey => $column) {
@@ -858,7 +858,7 @@ 
 		$dataProvider->models = null;
 
 		// Add headers columns as the first row if we are on the first page
-		if ($page==0)
+		if ($page == 0)
 			array_unshift($rows, implode(',', $headerCols));
 
 		return $asRows ? $rows : implode("\n", $rows);
@@ -1066,7 +1066,7 @@ 
 	public function callScope($scope, IQuery $query)
 	{
 		if ($scope['function'] == null) {
-			$func = 'scope' . ucfirst($scope['key']);
+			$func = 'scope'.ucfirst($scope['key']);
 			if ($this->hasMethod($func, false)) {
 				call_user_func(array($this, $func), $query);
 			} else {
@@ -1132,7 +1132,7 @@ 
 	public function getColumnsVisible()
 	{
 		$columns = [];
-		foreach($this->getColumns() as $key => $column) {
+		foreach ($this->getColumns() as $key => $column) {
 			if ($column->visible)
 				$columns[$key] = $column;
 		}
@@ -1219,8 +1219,8 @@ 
 	{
 		$tags = [];
 		foreach ($row as $key => $val) {
-			if (!is_array($val)){
-				$tags['{{' . $key . '}}'] = $val;
+			if (!is_array($val)) {
+				$tags['{{'.$key.'}}'] = $val;
 			}
 		}
 		return $tags;

Braces +42 added lines, -28 removed lines

@@ -311,8 +311,9 @@ 
 			return $scope['key'];
 		}
 		// No url request scope defined check if a default is set
-		if ($this->defaultScope !== null)
-			return $this->defaultScope;
+		if ($this->defaultScope !== null) {
+					return $this->defaultScope;
+		}
 
 		// No default scope so return the first in the list as the default
 		$defaultScope = reset($this->_scopes);
@@ -441,8 +442,9 @@ 
 			foreach($this->getColumns() as $key => $column) {
 				if ($column->getFilter() && $column->getFilterField() !== false) {
 					$field = $column->getFilterField();
-					if (is_object($field))
-						$field = $field->toArray();
+					if (is_object($field)) {
+											$field = $field->toArray();
+					}
 					$field['name'] = $key;
 					$field['dataKey'] = $column->getDbField();
 					$this->_filterForm->add($field);
@@ -643,8 +645,9 @@ 
 			$formsDefinitionCache[$cacheKey] = $formDefinition;
 		}
 		$form = new \neon\core\form\Form($formsDefinitionCache[$cacheKey]);
-		if ($member === null)
-			$member = $key;
+		if ($member === null) {
+					$member = $key;
+		}
 		return $this->addColumn($key, [
 			'title' => $form->getField($member)->getLabel(),
 			'class' => 'neon\core\grid\column\Column',
@@ -706,8 +709,9 @@ 
 	 */
 	public function removeColumn($key)
 	{
-		if ($this->columnExists($key))
-			unset($this->_columns[$key]);
+		if ($this->columnExists($key)) {
+					unset($this->_columns[$key]);
+		}
 	}
 
 	/**
@@ -754,8 +758,9 @@ 
 	 */
 	public function refreshDataProvider()
 	{
-		if ($this->_dataProvider)
-			$this->_dataProvider = clone $this->getDataProvider();
+		if ($this->_dataProvider) {
+					$this->_dataProvider = clone $this->getDataProvider();
+		}
 	}
 
 	/**
@@ -780,8 +785,9 @@ 
 	 */
 	public function gridBoot()
 	{
-		if (! $this->hasData())
-			$this->_gridData = Arr::get($_REQUEST, $this->id, null);
+		if (! $this->hasData()) {
+					$this->_gridData = Arr::get($_REQUEST, $this->id, null);
+		}
 		// load the active scope
 		$this->_scope = Arr::get($this->_gridData, "scope", []);
 		// load request data into the form
@@ -818,8 +824,9 @@ 
 	public function exportCsv($page=0, $pageSize=1000, $asRows=false)
 	{
 		// check we're allowed to do this
-		if (!$this->canExportCsv)
-			return null;
+		if (!$this->canExportCsv) {
+					return null;
+		}
 
 		$this->gridBoot();
 		// Get header column names
@@ -841,8 +848,9 @@ 
 		$pagination->page=$page;
 		$pagination->pageSize = min(1000,$pageSize);
 		$models = $dataProvider->getModels();
-		if (empty($models))
-			return null;
+		if (empty($models)) {
+					return null;
+		}
 
 		$rows = [];
 		foreach($models as $index => $row) {
@@ -858,8 +866,9 @@ 
 		$dataProvider->models = null;
 
 		// Add headers columns as the first row if we are on the first page
-		if ($page==0)
-			array_unshift($rows, implode(',', $headerCols));
+		if ($page==0) {
+					array_unshift($rows, implode(',', $headerCols));
+		}
 
 		return $asRows ? $rows : implode("\n", $rows);
 	}
@@ -956,8 +965,9 @@ 
 	public function processSearch()
 	{
 		$data = $this->getGridData();
-		if (!isset($data['filter']))
-			return;
+		if (!isset($data['filter'])) {
+					return;
+		}
 		foreach ($this->getColumns() as $key => $column) {
 			// check there is a form filter field
 			// check that the filter field has request data
@@ -1041,8 +1051,9 @@ 
 	 */
 	public function getColumn($columnKey)
 	{
-		if (!isset($this->_columns[$columnKey]))
-			throw new \Exception("No column with key '$columnKey' exists in the grid");
+		if (!isset($this->_columns[$columnKey])) {
+					throw new \Exception("No column with key '$columnKey' exists in the grid");
+		}
 		return $this->_columns[$columnKey];
 	}
 
@@ -1133,8 +1144,9 @@ 
 	{
 		$columns = [];
 		foreach($this->getColumns() as $key => $column) {
-			if ($column->visible)
-				$columns[$key] = $column;
+			if ($column->visible) {
+							$columns[$key] = $column;
+			}
 		}
 		return $columns;
 	}
@@ -1179,8 +1191,9 @@ 
 	 */
 	public function getIndexColumn()
 	{
-		if (!isset($this->_columns[$this->_indexedByColumn]))
-			throw new \Exception("No index column exists with key '$this->_indexedByColumn'.");
+		if (!isset($this->_columns[$this->_indexedByColumn])) {
+					throw new \Exception("No index column exists with key '$this->_indexedByColumn'.");
+		}
 		return $this->_columns[$this->_indexedByColumn];
 	}
 
@@ -1242,8 +1255,9 @@ 
 		$plain = html_entity_decode(
 				str_replace(["\n", '"'], ['', '\''], strip_tags($content)),
 				ENT_HTML401 | ENT_QUOTES | ENT_HTML5);
-		if ($plain === $this->emptyCellDisplay)
-			$plain = '';
+		if ($plain === $this->emptyCellDisplay) {
+					$plain = '';
+		}
 		return '"'.$plain.'"';
 	}
 }
\ No newline at end of file

neon/core/grid/DdsDataProvider.php

Spacing +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
 			}
 		}
 
-		$limit =  [
+		$limit = [
 			'start' => $pagination->getOffset(),
 			'length' => $pagination->getLimit(),
 			'total' => $pagination->totalCount
@@ -123,7 +123,7 @@ 
 	 * Store a total count to save multiple recalculations
 	 * @var type
 	 */
-	private $_totalCountCache=[];
+	private $_totalCountCache = [];
 
 	/**
 	 * @inheritDoc

Braces +3 added lines, -2 removed lines

@@ -45,8 +45,9 @@
 	public function __clone()
 	{
 		parent::__clone();
-		if ($this->_queryBuilder)
-			$this->_queryBuilder = clone $this->_queryBuilder;
+		if ($this->_queryBuilder) {
+					$this->_queryBuilder = clone $this->_queryBuilder;
+		}
 	}
 
 	/**

neon/core/grid/GridRenderer.php

Spacing +6 added lines, -6 removed lines

@@ -86,7 +86,7 @@ 
 	 */
 	public function getViewPath()
 	{
-		return __DIR__ . DIRECTORY_SEPARATOR . 'views';
+		return __DIR__.DIRECTORY_SEPARATOR.'views';
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 		}
 
 		$out = '<tr>';
-		foreach($this->_grid->getColumnGroups() as $groupLabel => $details) {
+		foreach ($this->_grid->getColumnGroups() as $groupLabel => $details) {
 			$colspan = count($details['columns']);
 			$out .= "<td colspan='$colspan'>$groupLabel</td>";
 		}
@@ -132,7 +132,7 @@ 
 	{
 		$pagination = $this->_grid->getDataProvider()->getPagination();
 		$filters = [];
-		foreach($this->_grid->getFilterForm()->getFields() as $field) {
+		foreach ($this->_grid->getFilterForm()->getFields() as $field) {
 			if (!empty($field->getValue()))
 				$filters[$field->getInputName()] = $field->getValue();
 		}
@@ -160,7 +160,7 @@ 
 	{
 		$models = array_values($this->_grid->getDataProvider()->getModels());
 		$out = '';
-		foreach($models as $index => $row) {
+		foreach ($models as $index => $row) {
 			$out .= $this->renderRow($row);
 		}
 		return $out;
@@ -200,7 +200,7 @@ 
 		}
 		$first = true;
 		$filtersHTML = '';
-		foreach($this->_grid->getScopes() as $link => $scope) {
+		foreach ($this->_grid->getScopes() as $link => $scope) {
 
 			$count = $this->_grid->getScopeTotalCount($link);
 			$current = '';
@@ -249,7 +249,7 @@ 
 			$page = $pagination->getPage() + 1;
 			$pageCount = $pagination->pageCount;
 			$tagMessage = ' <b>{begin, number}-{end, number}</b> of <b>{totalCount, number}</b> {totalCount, plural, one{item} other{items}}.';
-			return Html::tag($tag, \Yii::t('yii',  $tagMessage, [
+			return Html::tag($tag, \Yii::t('yii', $tagMessage, [
 				'begin' => $begin,
 				'end' => $end,
 				'count' => $count,

Braces +6 added lines, -4 removed lines

@@ -133,13 +133,15 @@
 		$pagination = $this->_grid->getDataProvider()->getPagination();
 		$filters = [];
 		foreach($this->_grid->getFilterForm()->getFields() as $field) {
-			if (!empty($field->getValue()))
-				$filters[$field->getInputName()] = $field->getValue();
+			if (!empty($field->getValue())) {
+							$filters[$field->getInputName()] = $field->getValue();
+			}
 		}
 		$queryParams = neon()->request->queryParams;
 		// remove any pre existing grid specific filters from the url - we don't want to add them twice
-		if (isset($queryParams[$this->_grid->gridName()]))
-			unset($queryParams[$this->_grid->gridName()]);
+		if (isset($queryParams[$this->_grid->gridName()])) {
+					unset($queryParams[$this->_grid->gridName()]);
+		}
 		// gross - we need to remove any pre existing filters from the query params
 		$pagination->params = $queryParams + $filters;
 

neon/core/grid/PhoebeGrid.php

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 	 * e.g. 'data' and 'deleted'. Set during construction via config.
 	 * @var array
 	 */
-	public $additionalColumns=[];
+	public $additionalColumns = [];
 
 	/**
 	 * Default page size
@@ -68,7 +68,7 @@ 
 	}
 
 
-	public function __construct($config=[])
+	public function __construct($config = [])
 	{
 		if (empty($config['phoebeType']) || empty($config['classType'])) {
 			throw new \RuntimeException('You need to provide at least the phoebeType and classType on construction');

Braces +3 added lines, -2 removed lines

@@ -124,8 +124,9 @@
 	 */
 	public function getDataProvider()
 	{
-		if (!$this->_dataProvider)
-			throw new \RuntimeException('You need to call phoebeLoadGrid before the grid can be used');
+		if (!$this->_dataProvider) {
+					throw new \RuntimeException('You need to call phoebeLoadGrid before the grid can be used');
+		}
 		return $this->_dataProvider;
 	}
 

neon/core/grid/query/YiiQuery.php

Spacing +6 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function where($column, $operator=null, $value=null)
+	public function where($column, $operator = null, $value = null)
 	{
 		// If the column is an array, we will assume it is an array of key-value pairs
 		// and can add them each as a where clause. We will maintain the boolean we
@@ -30,7 +30,7 @@ 
 		if (is_array($column)) {
 			return $this->addArrayOfWheres($column);
 		}
-		if ($operator==='=')
+		if ($operator === '=')
 			$this->_activeQuery->andWhere([$column => $value]);
 		else
 			$this->_activeQuery->andWhere([$operator, $column, $value]);
@@ -40,17 +40,17 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function addOrderBy($column, $order='DESC')
+	public function addOrderBy($column, $order = 'DESC')
 	{
-		$this->_activeQuery->addOrderBy([$column => ($order=='DESC') ? SORT_DESC : SORT_ASC]);
+		$this->_activeQuery->addOrderBy([$column => ($order == 'DESC') ? SORT_DESC : SORT_ASC]);
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	public function orderBy($column, $order='DESC')
+	public function orderBy($column, $order = 'DESC')
 	{
-		$this->_activeQuery->orderBy([$column => ($order=='DESC') ? SORT_DESC : SORT_ASC]);
+		$this->_activeQuery->orderBy([$column => ($order == 'DESC') ? SORT_DESC : SORT_ASC]);
 	}
 
 	/**

Braces +5 added lines, -4 removed lines

@@ -30,10 +30,11 @@
 		if (is_array($column)) {
 			return $this->addArrayOfWheres($column);
 		}
-		if ($operator==='=')
-			$this->_activeQuery->andWhere([$column => $value]);
-		else
-			$this->_activeQuery->andWhere([$operator, $column, $value]);
+		if ($operator==='=') {
+					$this->_activeQuery->andWhere([$column => $value]);
+		} else {
+					$this->_activeQuery->andWhere([$operator, $column, $value]);
+		}
 		return $this;
 	}
 

neon/core/grid/query/DdsQuery.php

Indentation +2 added lines, -2 removed lines

@@ -95,8 +95,8 @@
 	}
 
 	/**
-	* @inheritDoc
-	*/
+	 * @inheritDoc
+	 */
 	public function having($column, $operator = null, $value = null)
 	{
 		throw new \Exception('Having clause is currently not supported by DDS - you need to be able to specify custom columns for a start');

Spacing +4 added lines, -4 removed lines

@@ -53,7 +53,7 @@ 
 	 */
 	public function addArrayOfWheres($columns)
 	{
-		foreach($columns as $key => $value) {
+		foreach ($columns as $key => $value) {
 			$this->_filters[] = [$key, '=', $value];
 		}
 		return $this;
@@ -62,7 +62,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function addOrderBy($column, $order='DESC')
+	public function addOrderBy($column, $order = 'DESC')
 	{
 		$this->_order[$column] = $order;
 	}
@@ -70,7 +70,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function orderBy($column, $order='DESC')
+	public function orderBy($column, $order = 'DESC')
 	{
 		$this->_order[$column] = $order;
 	}
@@ -105,7 +105,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function orHaving($column, $operator=null, $value=null)
+	public function orHaving($column, $operator = null, $value = null)
 	{
 		throw new \Exception('Having clause is currently not supported by DDS - you need to be able to specify custom columns for a start');
 	}