newicon / neon

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;

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

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,

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

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

neon/core/grid/query/DdsQuery.php

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

neon/core/grid/query/BaseQuery.php

Spacing +13 added lines, -13 removed lines

@@ -17,17 +17,17 @@ 
 	 * @var array
 	 */
 	public $operators = [
-		'=',        // equals or if passed an array an IN => value
-		'!=',       // not equals or for array NOT IN => value
-		'>',        // greater than,
-		'<',        // less than,
-		'>=',       // greater or equal to,
-		'<=',       // less than or equal to,
-		'in',       // value in following array
-		'not in',   // value not in following array
-		'like',     // value for a text search comparison
+		'=', // equals or if passed an array an IN => value
+		'!=', // not equals or for array NOT IN => value
+		'>', // greater than,
+		'<', // less than,
+		'>=', // greater or equal to,
+		'<=', // less than or equal to,
+		'in', // value in following array
+		'not in', // value not in following array
+		'like', // value for a text search comparison
 		'not like', // value for a text search comparison
-		'null',     // set if testing for null [value not required]
+		'null', // set if testing for null [value not required]
 		'not null'  // set if testing for not null [value not required]
 	];
 
@@ -63,8 +63,8 @@ 
 	 */
 	protected function invalidOperatorAndValue($operator, $value)
 	{
-		return is_null($value) && ! $this->invalidOperator($operator) &&
-			! in_array($operator, ['=', '!=']);
+		return is_null($value) && !$this->invalidOperator($operator) &&
+			!in_array($operator, ['=', '!=']);
 	}
 
 	/**
@@ -75,6 +75,6 @@ 
 	 */
 	protected function invalidOperator($operator)
 	{
-		return ! in_array(strtolower($operator), $this->operators, true);
+		return !in_array(strtolower($operator), $this->operators, true);
 	}
 }
\ No newline at end of file

neon/core/grid/query/IQuery.php

Spacing +5 added lines, -5 removed lines

@@ -38,7 +38,7 @@ 
 	 * @param mixed $value
 	 * @return $this - provide a fluent chainable interface
 	 */
-	public function where($column, $operator=null, $value=null);
+	public function where($column, $operator = null, $value = null);
 
 	/**
 	 * Add an array of key (column) => values as simple equality filters
@@ -54,7 +54,7 @@ 
 	 * @param string $column
 	 * @param string $order - 'ASC' | 'DESC'
 	 */
-	public function addOrderBy($column, $order='DESC');
+	public function addOrderBy($column, $order = 'DESC');
 
 	/**
 	 * Sets the order by clause to existing clause
@@ -62,7 +62,7 @@ 
 	 * @param string $column
 	 * @param string $order - 'ASC' | 'DESC'
 	 */
-	public function orderBy($column, $order='DESC');
+	public function orderBy($column, $order = 'DESC');
 
 	/**
 	 * Add a having clause to the query builder
@@ -74,7 +74,7 @@ 
 	 * @param mixed $value
 	 * @return $this - provide a fluent chainable interface
 	 */
-	public function having($column, $operator=null, $value=null);
+	public function having($column, $operator = null, $value = null);
 
 	/**
 	 * Create an orHaving clause
@@ -84,7 +84,7 @@ 
 	 * @param mixed $value
 	 * @return $this - provide a fluent chainable interface
 	 */
-	public function orHaving($column, $operator=null, $value=null);
+	public function orHaving($column, $operator = null, $value = null);
 
 	/**
 	 * return information on the current filters applied - for mysql this may be the raw query string - for

neon/core/db/ActiveRecord.php

Spacing +8 added lines, -8 removed lines

@@ -143,10 +143,10 @@ 
 	 * @param string $message - optional message to display in the exception if the fields don't exist
 	 * @throws \InvalidArgumentException if fields don;t exist on the table
 	 */
-	public function fieldsMustExist($fields, $message='')
+	public function fieldsMustExist($fields, $message = '')
 	{
 		$tableName = $this->tableName();
-		foreach($fields as $field) {
+		foreach ($fields as $field) {
 			if (!$this->hasAttribute($field))
 				throw new \InvalidArgumentException("No '$field' exists on the '$tableName' table. $message");
 		}
@@ -291,7 +291,7 @@ 
 	 */
 	public function hasAttributeGetter($name, &$getter)
 	{
-		$getter = '__get_' . $name;
+		$getter = '__get_'.$name;
 		return method_exists($this, $getter);
 	}
 
@@ -304,7 +304,7 @@ 
 	 */
 	public function hasAttributeSetter($name, &$setter)
 	{
-		$setter = '__set_' . $name;
+		$setter = '__set_'.$name;
 		return method_exists($this, $setter);
 	}
 
@@ -333,11 +333,11 @@ 
 		}
 		// is a string - or lots of string arguments
 		// like $this->isDirty('name', 'title');
-		if (! is_array($attributes)) {
+		if (!is_array($attributes)) {
 			$attributes = func_get_args();
 		}
 
-		foreach($attributes as $attribute) {
+		foreach ($attributes as $attribute) {
 			return $this->isAttributeChanged($attribute);
 		}
 
@@ -352,7 +352,7 @@ 
 	 */
 	public function isClean($attributes = null)
 	{
-		return ! $this->isDirty(...func_get_args());
+		return !$this->isDirty(...func_get_args());
 	}
 
 	/**
@@ -414,7 +414,7 @@ 
 	 * @param boolean $withDeleted
 	 * @return ActiveQuery
 	 */
-	public static function query($withDeleted=false)
+	public static function query($withDeleted = false)
 	{
 		return $withDeleted ? static::findWithDeleted() : static::find();
 	}