newicon / neon

neon/core/validators/MockModel.php

Spacing +2 added lines, -2 removed lines

@@ -17,9 +17,9 @@
 	 * @param string $label
 	 * @return MockModel|null
 	 */
-	public static function get($label='')
+	public static function get($label = '')
 	{
-		if (self::$mock===null)
+		if (self::$mock === null)
 			self::$mock = new self();
 		self::$mock->label = $label;
 		return self::$mock;

Braces +3 added lines, -2 removed lines

@@ -19,8 +19,9 @@
 	 */
 	public static function get($label='')
 	{
-		if (self::$mock===null)
-			self::$mock = new self();
+		if (self::$mock===null) {
+					self::$mock = new self();
+		}
 		self::$mock->label = $label;
 		return self::$mock;
 	}

neon/core/grid/DdsGrid.php

Spacing +3 added lines, -3 removed lines

@@ -232,7 +232,7 @@ 
 	/**
 	 * Add the edit and delete DDS object buttons to the grid
 	 */
-	public function addActionButtonColumn($title=false)
+	public function addActionButtonColumn($title = false)
 	{
 		$buttonCol = $this->addButtonColumn('edit')->setTitle($title);
 
@@ -246,7 +246,7 @@ 
 
 		if ($this->hasScope('deleted') && $this->isScopeActive('deleted')) {
 			if ($this->showGridUndeleteButton) {
-				$buttonCol->addButton('undelete', '','', 'fa fa-undo', 'btn-default', [
+				$buttonCol->addButton('undelete', '', '', 'fa fa-undo', 'btn-default', [
 					'data-toggle' => 'tooltip',
 					'title' => 'Restore',
 					'data-action' => 'actionUndelete'
@@ -377,7 +377,7 @@ 
 	 * Load appropriate columns based on DDS details
 	 * @deprecated - just set the classType - either in the init or the config
 	 */
-	public function ddsLoadGrid($classType, $includeDeleted=false, $pageSize=50)
+	public function ddsLoadGrid($classType, $includeDeleted = false, $pageSize = 50)
 	{
 		if ($this->title == null)
 			$this->title = $classType;

Braces +18 added lines, -12 removed lines

@@ -148,8 +148,9 @@ 
 	{
 		$this->_classType = $value;
 		// Set a default title
-		if ($this->title === null)
-			$this->title = $this->_classType;
+		if ($this->title === null) {
+					$this->title = $this->_classType;
+		}
 	}
 
 	/**
@@ -191,18 +192,21 @@ 
 		parent::init();
 		// don't configure the grid if the class type has not been set!
 		if ($this->_classType === null) {
-			if (neon()->debug)
-				throw new \RuntimeException('You need to configure the grid class type before calling init');
+			if (neon()->debug) {
+							throw new \RuntimeException('You need to configure the grid class type before calling init');
+			}
 			return null;
 		}
 
 		$this->addColumnsFromClassMembers();
 		$this->addDdsObjectColumns();
 
-		if ($this->useActiveScope)
-			$this->addScope('active', 'Active');
-		if ($this->useDeletedScope)
-			$this->addScope('deleted', 'Deleted');
+		if ($this->useActiveScope) {
+					$this->addScope('active', 'Active');
+		}
+		if ($this->useDeletedScope) {
+					$this->addScope('deleted', 'Deleted');
+		}
 
 	}
 
@@ -369,8 +373,9 @@ 
 			'class' => 'neon\core\grid\column\DefinitionColumn',
 			'member' => new $columnType($member),
 		];
-		if (is_array($config))
-			$colConfig = array_merge($colConfig, $config);
+		if (is_array($config)) {
+					$colConfig = array_merge($colConfig, $config);
+		}
 		return $this->addColumn($member, $colConfig);
 	}
 
@@ -380,8 +385,9 @@ 
 	 */
 	public function ddsLoadGrid($classType, $includeDeleted=false, $pageSize=50)
 	{
-		if ($this->title == null)
-			$this->title = $classType;
+		if ($this->title == null) {
+					$this->title = $classType;
+		}
 		// TODO: should be in constructor can't create a DDS grid without the DDS class ref
 		$this->classType = $classType;
 

neon/core/grid/PhoebeDataProvider.php

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
 			}
 		}
 
-		$paginator =  [
+		$paginator = [
 			'start' => $pagination->getOffset(),
 			'length' => $pagination->getLimit(),
 			'total' => $pagination->totalCount
@@ -75,7 +75,7 @@ 
 		$form = $this->getForm();
 
 		$data = [];
-		foreach($results as $object) {
+		foreach ($results as $object) {
 			$form->reset();
 			$form->loadFromDb($object);
 			$data[] = array_merge($object, $form->getDataDisplay());

Braces +9 added lines, -6 removed lines

@@ -42,10 +42,12 @@ 
 
 	public function init()
 	{
-		if (empty($this->phoebeType))
-			throw new \RuntimeException('PhoebeDataProvider: the phoebe type has not been set. It needs to be set on construction');
-		if (empty($this->classType))
-			throw new \RuntimeException('PhoebeDataProvider: the phoebe class type has not been set. It needs to be set on construction');
+		if (empty($this->phoebeType)) {
+					throw new \RuntimeException('PhoebeDataProvider: the phoebe type has not been set. It needs to be set on construction');
+		}
+		if (empty($this->classType)) {
+					throw new \RuntimeException('PhoebeDataProvider: the phoebe class type has not been set. It needs to be set on construction');
+		}
 	}
 
 	/**
@@ -142,8 +144,9 @@ 
 	 */
 	protected function getFormDefinition()
 	{
-		if ($this->formDefinition == null)
-			$this->formDefinition = neon('phoebe')->getFormDefinition($this->phoebeType, $this->classType);
+		if ($this->formDefinition == null) {
+					$this->formDefinition = neon('phoebe')->getFormDefinition($this->phoebeType, $this->classType);
+		}
 		return $this->formDefinition;
 	}
 

neon/core/grid/YiiActiveDataProvider.php

Braces +3 added lines, -2 removed lines

@@ -40,7 +40,8 @@
 	public function __clone()
 	{
 		parent::__clone();
-		if ($this->_queryBuilder)
-			$this->_queryBuilder = clone $this->_queryBuilder;
+		if ($this->_queryBuilder) {
+					$this->_queryBuilder = clone $this->_queryBuilder;
+		}
 	}
 }
\ No newline at end of file

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.'"';
 	}
 }

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