newicon / neon

neon/cms/form/fields/Slug.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 			'class' => UniqueValidator::class,
 			'targetClass'=> CmsUrl::class,
 			'targetAttribute'=>'url',
-		],[],'unique');
+		], [], 'unique');
 
 		$this->addValidator([
 			'class' => RegularExpressionValidator::class,

Braces +18 added lines, -6 removed lines

@@ -66,7 +66,9 @@ 
 		]);
 
 		// assuming operation using DDS where form $name maps to dds classType
-		if (!$this->hasForm()) return;
+		if (!$this->hasForm()) {
+			return;
+		}
 		$classType = $this->getForm()->getName();
 		Event::on(DdsObjectManager::class, "dds.afterAdd.$classType", [$this, 'addCmsUrl']);
 		Event::on(DdsObjectManager::class, "dds.afterEdit.$classType", [$this, 'editCmsUrl']);
@@ -91,13 +93,19 @@ 
 	 */
 	public function editCmsUrl(ObjectEditEvent $event)
 	{
-		if (!isset($event->object[$this->name])) return;
+		if (!isset($event->object[$this->name])) {
+			return;
+		}
 		$originalSlug = $event->originalValues[$this->name];
 		$newSlug = $event->object[$this->name];
 		// edit the slug in the cms_url table
 		$url = CmsUrl::findOne(['url' => $originalSlug]);
-		if (empty($newSlug)) return;
-		if ($url === null) $url = new CmsUrl();
+		if (empty($newSlug)) {
+			return;
+		}
+		if ($url === null) {
+			$url = new CmsUrl();
+		}
 		$url->url = $newSlug;
 		$url->nice_id = $this->pageId;
 		$url->save();
@@ -109,9 +117,13 @@ 
 	 */
 	public function addCmsUrl(ObjectAddEvent $event)
 	{
-		if (!isset($event->object[$this->name])) return;
+		if (!isset($event->object[$this->name])) {
+			return;
+		}
 		$slug = $event->object[$this->name];
-		if (empty($slug)) return;
+		if (empty($slug)) {
+			return;
+		}
 		// add a new slug to cms url table
 		$cmsUrl = new CmsUrl();
 		$cmsUrl->url = $slug;

neon/cms/form/fields/PostStats.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	public function getValue()
 	{
 		$form = $this->getParentForm();
-		if ($form===null) return;
+		if ($form === null) return;
 		$field = $form->getField($this->linkedField);
 		$value = $field->getValue();
 		if (!is_string($value))

Braces +6 added lines, -3 removed lines

@@ -45,11 +45,14 @@
 	public function getValue()
 	{
 		$form = $this->getParentForm();
-		if ($form===null) return;
+		if ($form===null) {
+			return;
+		}
 		$field = $form->getField($this->linkedField);
 		$value = $field->getValue();
-		if (!is_string($value))
-			return ['word_count'=>0, 'time_to_read'=>0];
+		if (!is_string($value)) {
+					return ['word_count'=>0, 'time_to_read'=>0];
+		}
 		// calculate post reading time
 		$wordCount = Str::countWords(strip_tags($value));
 		$averageWordsPerMinute = 265;

neon/cms/form/Page.php

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
 			'hint' => 'Mark the page as a collection if this page represents a resource - for example a blog post, an ecommerce product'
 		]);
 
-		$items = collect(neon()->getDaedalus()->getIDdsClassManagement()->listClasses(null,$total))
+		$items = collect(neon()->getDaedalus()->getIDdsClassManagement()->listClasses(null, $total))
 			->flatMap(function($item) { return [$item['class_type'] => $item['label']]; });
 		$this->addFieldSelect('collection_class', [
 			'label' => 'Collection Class',
@@ -126,7 +126,7 @@ 
 	{
 		$theme = neon()->getAlias(neon()->cms->getThemeAlias());
 		$templates = [];
-		foreach(File::findFiles("$theme", ['only' => ['*.tpl', '*.twig']]) as $file) {
+		foreach (File::findFiles("$theme", ['only' => ['*.tpl', '*.twig']]) as $file) {
 			$path = str_replace("$theme/", '', $file);
 			if (Str::startsWith($path, 'pages/') || Str::startsWith($path, 'partials/')) {
 				$templates[$path] = $path;
@@ -193,7 +193,7 @@ 
 		// create a migration file
 		$templateFile = __DIR__.'/templates/ddsMigration.php';
 		$input = file_get_contents($templateFile);
-		$output = str_replace('__MIGRATION__',$this->_classname,$input);
+		$output = str_replace('__MIGRATION__', $this->_classname, $input);
 		file_put_contents($this->_file, $output, LOCK_EX);
 		return $this->_filename;
 

neon/settings/services/SettingsManager.php

Spacing +5 added lines, -5 removed lines

@@ -49,7 +49,7 @@ 
 	 * @param boolean $refresh whether to refresh the cache before fetching this setting defaults to false
 	 * @return string
 	 */
-	public function get($app, $key, $default=null, $refresh=false)
+	public function get($app, $key, $default = null, $refresh = false)
 	{
 		$settings = $this->getSettings($refresh);
 		return isset($settings[$app][$key]) && $settings[$app][$key] !== '' ? $settings[$app][$key] : $default;
@@ -77,7 +77,7 @@ 
 		$result = $setting->save();
 
 		if (!$result) {
-			throw new \Exception('Unable to save setting. ' . print_r($setting->getErrors(), true));
+			throw new \Exception('Unable to save setting. '.print_r($setting->getErrors(), true));
 		}
 		neon()->cache->delete('neon_settings');
 		$this->_settings[$app][$key] = $value;
@@ -90,13 +90,13 @@ 
 	 * @param boolean $refresh if true forces a reload of the the settings
 	 * @return array in the format @see self::$_settings
 	 */
-	public function getAll($refresh=false)
+	public function getAll($refresh = false)
 	{
 		if ($refresh) neon()->cache->delete('neon_settings');
 		return $this->_settings = neon()->cache->getOrSet('neon_settings', function() {
 			$settingRows = Setting::find()->asArray()->all();
 			$this->_settings = [];
-			foreach($settingRows as $setting) {
+			foreach ($settingRows as $setting) {
 				$this->_settings[$setting['app']][$setting['key']] = $this->_decode($setting['value']);
 			}
 			return $this->_settings;
@@ -109,7 +109,7 @@ 
 	 * @param boolean $refresh if true forces a reload of the the settings
 	 * @return array in the format @see self::$_settings
 	 */
-	public function getSettings($refresh=false)
+	public function getSettings($refresh = false)
 	{
 		return $this->getAll($refresh);
 	}

Braces +3 added lines, -1 removed lines

@@ -92,7 +92,9 @@
 	 */
 	public function getAll($refresh=false)
 	{
-		if ($refresh) neon()->cache->delete('neon_settings');
+		if ($refresh) {
+			neon()->cache->delete('neon_settings');
+		}
 		return $this->_settings = neon()->cache->getOrSet('neon_settings', function() {
 			$settingRows = Setting::find()->asArray()->all();
 			$this->_settings = [];

neon/cms/models/CmsPage.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
 	 * @throws \yii\web\HttpException
 	 * @return boolean - whether new url was saved
 	 */
-	public function redirect($newUrl, $createRedirect, $throw=true)
+	public function redirect($newUrl, $createRedirect, $throw = true)
 	{
 		// find urls that link to this page
 		$urls = CmsUrl::find()->where(['nice_id' => $this->nice_id])->limit(10)->all();

Braces +3 added lines, -1 removed lines

@@ -81,7 +81,9 @@
 		// find urls that link to this page
 		$urls = CmsUrl::find()->where(['nice_id' => $this->nice_id])->limit(10)->all();
 		if (count($urls) > 1) {
-			if ($throw) abort(400, 'There must be only one url that links to this page - otherwise the wrong url may be updated');
+			if ($throw) {
+				abort(400, 'There must be only one url that links to this page - otherwise the wrong url may be updated');
+			}
 			return false;
 		}
 		$url = $urls[0];

neon/cms/models/CmsUrl.php

Spacing +1 added lines, -1 removed lines

@@ -133,7 +133,7 @@
 	{
 		return static::cache()->getOrSet('cms_url_pages', function() {
 			return collect(CmsPage::find()->select('id, nice_id')->asArray()->all())
-				->flatMap(function($i){ return [$i['id'] => $i['nice_id']]; })
+				->flatMap(function($i) { return [$i['id'] => $i['nice_id']]; })
 				->all();
 		});
 	}

neon/daedalus/services/ddsManager/models/DdsDataType.php

Indentation +51 added lines, -51 removed lines

@@ -18,59 +18,59 @@
  */
 class DdsDataType extends \yii\db\ActiveRecord
 {
-    /**
-     * @inheritdoc
-     */
-    public static function tableName()
-    {
-        return '{{%dds_data_type}}';
-    }
+	/**
+	 * @inheritdoc
+	 */
+	public static function tableName()
+	{
+		return '{{%dds_data_type}}';
+	}
 
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            [['data_type_ref', 'storage_ref'], 'required'],
-            [['deleted'], 'integer'],
-            [['data_type_ref', 'storage_ref'], 'string', 'max' => 50],
-            [['label'], 'string', 'max' => 300],
-            [['description'], 'string', 'max' => 1000],
-            [['definition'], 'string', 'max' => 2000],
-            [['data_type_ref'], 'unique'],
-            [['storage_ref'], 'exist', 'skipOnError' => true, 'targetClass' => DdsStorage::className(), 'targetAttribute' => ['storage_ref' => 'storage_ref']],
-        ];
-    }
+	/**
+	 * @inheritdoc
+	 */
+	public function rules()
+	{
+		return [
+			[['data_type_ref', 'storage_ref'], 'required'],
+			[['deleted'], 'integer'],
+			[['data_type_ref', 'storage_ref'], 'string', 'max' => 50],
+			[['label'], 'string', 'max' => 300],
+			[['description'], 'string', 'max' => 1000],
+			[['definition'], 'string', 'max' => 2000],
+			[['data_type_ref'], 'unique'],
+			[['storage_ref'], 'exist', 'skipOnError' => true, 'targetClass' => DdsStorage::className(), 'targetAttribute' => ['storage_ref' => 'storage_ref']],
+		];
+	}
 
-    /**
-     * @inheritdoc
-     */
-    public function attributeLabels()
-    {
-        return [
-            'data_type_ref' => 'Data Type Ref',
-            'label' => 'Label',
-            'description' => 'Description',
-            'definition' => 'Definition',
-            'storage_ref' => 'Storage Ref',
-            'deleted' => 'Deleted',
-        ];
-    }
+	/**
+	 * @inheritdoc
+	 */
+	public function attributeLabels()
+	{
+		return [
+			'data_type_ref' => 'Data Type Ref',
+			'label' => 'Label',
+			'description' => 'Description',
+			'definition' => 'Definition',
+			'storage_ref' => 'Storage Ref',
+			'deleted' => 'Deleted',
+		];
+	}
 
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getStorageRef()
-    {
-        return $this->hasOne(DdsStorage::className(), ['storage_ref' => 'storage_ref']);
-    }
+	/**
+	 * @return \yii\db\ActiveQuery
+	 */
+	public function getStorageRef()
+	{
+		return $this->hasOne(DdsStorage::className(), ['storage_ref' => 'storage_ref']);
+	}
 
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getDdsMembers()
-    {
-        return $this->hasMany(DdsMember::className(), ['data_type_ref' => 'data_type_ref']);
-    }
+	/**
+	 * @return \yii\db\ActiveQuery
+	 */
+	public function getDdsMembers()
+	{
+		return $this->hasMany(DdsMember::className(), ['data_type_ref' => 'data_type_ref']);
+	}
 }

neon/daedalus/services/ddsManager/models/DdsStorage.php

Indentation +41 added lines, -41 removed lines

@@ -15,48 +15,48 @@
  */
 class DdsStorage extends \yii\db\ActiveRecord
 {
-    /**
-     * @inheritdoc
-     */
-    public static function tableName()
-    {
-        return '{{%dds_storage}}';
-    }
+	/**
+	 * @inheritdoc
+	 */
+	public static function tableName()
+	{
+		return '{{%dds_storage}}';
+	}
 
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            [['storage_ref', 'label', 'type', 'description'], 'required'],
-            [['type'], 'string'],
-            [['storage_ref'], 'string', 'max' => 50],
-            [['label'], 'string', 'max' => 300],
-            [['description'], 'string', 'max' => 8000],
-            [['storage_ref'], 'unique'],
-        ];
-    }
+	/**
+	 * @inheritdoc
+	 */
+	public function rules()
+	{
+		return [
+			[['storage_ref', 'label', 'type', 'description'], 'required'],
+			[['type'], 'string'],
+			[['storage_ref'], 'string', 'max' => 50],
+			[['label'], 'string', 'max' => 300],
+			[['description'], 'string', 'max' => 8000],
+			[['storage_ref'], 'unique'],
+		];
+	}
 
-    /**
-     * @inheritdoc
-     */
-    public function attributeLabels()
-    {
-        return [
-            'id' => 'ID',
-            'storage_ref' => 'Storage Ref',
-            'label' => 'Label',
-            'type' => 'Type',
-            'description' => 'Description',
-        ];
-    }
+	/**
+	 * @inheritdoc
+	 */
+	public function attributeLabels()
+	{
+		return [
+			'id' => 'ID',
+			'storage_ref' => 'Storage Ref',
+			'label' => 'Label',
+			'type' => 'Type',
+			'description' => 'Description',
+		];
+	}
 
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getDdsDataTypes()
-    {
-        return $this->hasMany(DdsDataType::className(), ['storage_ref' => 'storage_ref']);
-    }
+	/**
+	 * @return \yii\db\ActiveQuery
+	 */
+	public function getDdsDataTypes()
+	{
+		return $this->hasMany(DdsDataType::className(), ['storage_ref' => 'storage_ref']);
+	}
 }

neon/core/grid/column/Button.php

Spacing +8 added lines, -8 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param array $options - additional html attribute options
 	 * @return $this
 	 */
-	public function setEdit($url, array $options=[])
+	public function setEdit($url, array $options = [])
 	{
 		$this->_buttons['edit'] = $options;
 		$this->_buttons['edit']['url'] = $url;
@@ -43,7 +43,7 @@ 
 	 * @param array|string $url
 	 * @param array $options - additional html attribute options
 	 */
-	public function setDelete($url, array $options=[])
+	public function setDelete($url, array $options = [])
 	{
 		$this->_buttons['delete'] = $options;
 		$this->_buttons['delete']['url'] = $url;
@@ -59,7 +59,7 @@ 
 	 *   will append text to the CSS class e.g. btn-$type
 	 * @param array $options - passed to Html::buttonCustom
 	 */
-	public function addButton($key, $url, $text, $icon='', $class='', $options=[])
+	public function addButton($key, $url, $text, $icon = '', $class = '', $options = [])
 	{
 		$this->_buttons[$key] = array_merge(compact('url', 'text', 'icon', 'class'), $options);
 	}
@@ -83,7 +83,7 @@ 
 	 */
 	public function getWidth()
 	{
-		return 'calc(' . (count($this->_buttons)+count($this->_actions)) . ' * ' .$this->buttonWidth . ')';
+		return 'calc('.(count($this->_buttons) + count($this->_actions)).' * '.$this->buttonWidth.')';
 	}
 
 	/**
@@ -97,11 +97,11 @@ 
 				if (!isset($btnOps['data']))
 					$btnOps['data'] = [];
 				if ($this->getGrid()->hasIndexColumn())
-					$btnOps['data'] = ['index' => $model[$this->getGrid()->getIndexColumn()->getKey()] ];
+					$btnOps['data'] = ['index' => $model[$this->getGrid()->getIndexColumn()->getKey()]];
 				$func = 'buttonCustom';
 				if ($buttonKey === 'delete') {
 					$func = 'buttonDelete';
-					$btnOps['data'] = Arr::merge($btnOps['data'], ['data'=> ['delete-ajax' => true ]]);
+					$btnOps['data'] = Arr::merge($btnOps['data'], ['data'=> ['delete-ajax' => true]]);
 				}
 				if ($buttonKey === 'edit') {
 					$func = 'buttonEdit';
@@ -109,10 +109,10 @@ 
 				$text = Arr::remove($btnOps, 'text', '');
 				$url = Arr::remove($btnOps, 'url', '');
 				$url = $this->grid->replaceRowTagsWithValues($url, $model);
-				$btnOps['class'] = Arr::get($btnOps, 'class', '') . ' btn-grid';
+				$btnOps['class'] = Arr::get($btnOps, 'class', '').' btn-grid';
 				$buttons[] = Html::$func($url, $text, $btnOps);
 			}
-			return '<div class="btn-group btn-column">' . implode('', $buttons) . '</div>';
+			return '<div class="btn-group btn-column">'.implode('', $buttons).'</div>';
 		}
 	}
 

Braces +6 added lines, -4 removed lines

@@ -94,10 +94,12 @@
 		if (count($this->_buttons)) {
 			$buttons = [];
 			foreach ($this->_buttons as $buttonKey => $btnOps) {
-				if (!isset($btnOps['data']))
-					$btnOps['data'] = [];
-				if ($this->getGrid()->hasIndexColumn())
-					$btnOps['data'] = ['index' => $model[$this->getGrid()->getIndexColumn()->getKey()] ];
+				if (!isset($btnOps['data'])) {
+									$btnOps['data'] = [];
+				}
+				if ($this->getGrid()->hasIndexColumn()) {
+									$btnOps['data'] = ['index' => $model[$this->getGrid()->getIndexColumn()->getKey()] ];
+				}
 				$func = 'buttonCustom';
 				if ($buttonKey === 'delete') {
 					$func = 'buttonDelete';