Test Failed
Push — develop ( ff58ad...b8f9b2 )
by steve
13:44 queued 12s
created
neon/core/form/Form.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -670,7 +670,7 @@
 block discarded – undo
670 670
 	/**
671 671
 	 * render the form header html
672 672
 	 * @return string
673
-    */
673
+	 */
674 674
 	public function renderHeader()
675 675
 	{
676 676
 		$options = $this->toArray();
Please login to merge, or discard this patch.
Braces   +50 added lines, -32 removed lines patch added patch discarded remove patch
@@ -205,11 +205,13 @@  discard block
 block discarded – undo
205 205
 	{
206 206
 		$view = ($view === null) ? $this->getView() : $view;
207 207
 		FormAsset::register($view);
208
-		foreach ($this->getFields() as $field)
209
-			$field->registerScripts($view);
208
+		foreach ($this->getFields() as $field) {
209
+					$field->registerScripts($view);
210
+		}
210 211
 		if ($this->isRootForm()) {
211
-			if ($mount)
212
-				$view->registerJs('(new Vue()).$mount("#' . $this->id . '");', $view::POS_END, $this->id . 'vue');
212
+			if ($mount) {
213
+							$view->registerJs('(new Vue()).$mount("#' . $this->id . '");', $view::POS_END, $this->id . 'vue');
214
+			}
213 215
 		}
214 216
 	}
215 217
 
@@ -333,8 +335,9 @@  discard block
 block discarded – undo
333 335
 	{
334 336
 		$errors = [];
335 337
 		foreach($this->getFields() as $name => $field) {
336
-			if ($field->hasError())
337
-				$errors[$name] = $field->getErrors();
338
+			if ($field->hasError()) {
339
+							$errors[$name] = $field->getErrors();
340
+			}
338 341
 		}
339 342
 		return array_merge($this->_errors, $errors);
340 343
 	}
@@ -363,10 +366,11 @@  discard block
 block discarded – undo
363 366
 	 */
364 367
 	public function addError($fieldNameOrError='', $error=null)
365 368
 	{
366
-		if ($error === null)
367
-			$this->_errors[] = $fieldNameOrError;
368
-		else
369
-			$this->getField($fieldNameOrError)->addError($error);
369
+		if ($error === null) {
370
+					$this->_errors[] = $fieldNameOrError;
371
+		} else {
372
+					$this->getField($fieldNameOrError)->addError($error);
373
+		}
370 374
 	}
371 375
 
372 376
 // ============================================================================
@@ -460,8 +464,9 @@  discard block
 block discarded – undo
460 464
 		// multiple versions of the same form can exist on a page
461 465
 		// in these scenarios the forms each can have different root form ids.
462 466
 		$bits = explode('.', $path);
463
-		if (!($bits[0] === $this->name || ($this->isRootForm() && $bits[0] === $this->id)))
464
-			throw new \Exception("The first part of the path should be the form name or the id if this is a root form. The forms name and id is: name={$this->name}, id={$this->id}. The path you used was: path=$path.");
467
+		if (!($bits[0] === $this->name || ($this->isRootForm() && $bits[0] === $this->id))) {
468
+					throw new \Exception("The first part of the path should be the form name or the id if this is a root form. The forms name and id is: name={$this->name}, id={$this->id}. The path you used was: path=$path.");
469
+		}
465 470
 		// remove first item and reindex array : note unset does not update array indexes
466 471
 		array_splice($bits, 0, 1);
467 472
 		$field = $this->getField($bits[0]);
@@ -495,8 +500,9 @@  discard block
 block discarded – undo
495 500
 	public function getFields($names=null)
496 501
 	{
497 502
 		$this->orderFields();
498
-		if ($names === null)
499
-			return $this->_fields;
503
+		if ($names === null) {
504
+					return $this->_fields;
505
+		}
500 506
 
501 507
 		return Arr::only($this->_fields, $names);
502 508
 	}
@@ -818,9 +824,12 @@  discard block
 block discarded – undo
818 824
 	{
819 825
 		$data = [];
820 826
 		foreach ($this->getFields() as $field) {
821
-			if ($field->deleted) continue;
822
-			if ($field->getIsInput())
823
-				$data[$field->getDataKey()] = $field->getData();
827
+			if ($field->deleted) {
828
+				continue;
829
+			}
830
+			if ($field->getIsInput()) {
831
+							$data[$field->getDataKey()] = $field->getData();
832
+			}
824 833
 		}
825 834
 		return $data;
826 835
 	}
@@ -834,8 +843,9 @@  discard block
 block discarded – undo
834 843
 	{
835 844
 		$data = [];
836 845
 		foreach ($this->getFields() as $field) {
837
-			if ($field->getIsInput())
838
-				$data[$field->getName()] = $field->getValueDisplay();
846
+			if ($field->getIsInput()) {
847
+							$data[$field->getName()] = $field->getValueDisplay();
848
+			}
839 849
 		}
840 850
 		return $data;
841 851
 	}
@@ -848,8 +858,9 @@  discard block
 block discarded – undo
848 858
 	 */
849 859
 	public function getDataKey()
850 860
 	{
851
-		if ($this->_dataKey !== null)
852
-			return $this->_dataKey;
861
+		if ($this->_dataKey !== null) {
862
+					return $this->_dataKey;
863
+		}
853 864
 		return $this->getName();
854 865
 	}
855 866
 
@@ -880,8 +891,9 @@  discard block
 block discarded – undo
880 891
 	 */
881 892
 	public function getId($autoGenerate=false)
882 893
 	{
883
-		if ($this->_id)
884
-			return $this->_id;
894
+		if ($this->_id) {
895
+					return $this->_id;
896
+		}
885 897
 		return $this->getName();
886 898
 	}
887 899
 
@@ -915,8 +927,9 @@  discard block
 block discarded – undo
915 927
 		$value = [];
916 928
 		foreach ($this->getFields() as $field) {
917 929
 			if (!$field->deleted) {
918
-				if ($field->getIsInput())
919
-					$value[$field->getDataKey()] = $field->getValue();
930
+				if ($field->getIsInput()) {
931
+									$value[$field->getDataKey()] = $field->getValue();
932
+				}
920 933
 			}
921 934
 		}
922 935
 		return $value;
@@ -1145,8 +1158,9 @@  discard block
 block discarded – undo
1145 1158
 		foreach ($this->getFields() as $key => $field) {
1146 1159
 			$fieldDefinition = $field->exportDefinition();
1147 1160
 
1148
-			if (! is_null($field->ddsDataType) && ! is_null($fieldDefinition) )
1149
-				$fields[$key] = $fieldDefinition;
1161
+			if (! is_null($field->ddsDataType) && ! is_null($fieldDefinition) ) {
1162
+							$fields[$key] = $fieldDefinition;
1163
+			}
1150 1164
 		}
1151 1165
 		$formDefinition['definition']['fields'] = $fields;
1152 1166
 		return $formDefinition;
@@ -1257,8 +1271,9 @@  discard block
 block discarded – undo
1257 1271
 	 */
1258 1272
 	public function getRequest()
1259 1273
 	{
1260
-		if ($this->_request === null)
1261
-			$this->_request = neon()->request;
1274
+		if ($this->_request === null) {
1275
+					$this->_request = neon()->request;
1276
+		}
1262 1277
 		return $this->_request;
1263 1278
 	}
1264 1279
 
@@ -1277,8 +1292,9 @@  discard block
 block discarded – undo
1277 1292
 	 */
1278 1293
 	public function reset()
1279 1294
 	{
1280
-		foreach($this->getFields() as $field)
1281
-			$field->reset();
1295
+		foreach($this->getFields() as $field) {
1296
+					$field->reset();
1297
+		}
1282 1298
 	}
1283 1299
 
1284 1300
 	/**
@@ -1298,7 +1314,9 @@  discard block
 block discarded – undo
1298 1314
 		$fake = [];
1299 1315
 		foreach($this->getFields() as $key => $field) {
1300 1316
 			$val = $field->fake();
1301
-			if (empty($val)) continue;
1317
+			if (empty($val)) {
1318
+				continue;
1319
+			}
1302 1320
 			$fake[$key] = $val;
1303 1321
 		}
1304 1322
 		return $fake;
Please login to merge, or discard this patch.
neon/phoebe/controllers/database/IndexController.php 1 patch
Braces   +12 added lines, -6 removed lines patch added patch discarded remove patch
@@ -54,8 +54,9 @@  discard block
 block discarded – undo
54 54
 	 */
55 55
 	public function actionEdit($type = null)
56 56
 	{
57
-		if (!$this->canDevelop())
58
-			throw new HttpException(403, 'This operation is not permitted here');
57
+		if (!$this->canDevelop()) {
58
+					throw new HttpException(403, 'This operation is not permitted here');
59
+		}
59 60
 
60 61
 		$form = $this->getPhoebeForm($type, $isNewForm, false, true);
61 62
 		return $this->render('edit-fields', [
@@ -95,9 +96,13 @@  discard block
 block discarded – undo
95 96
 				// register all form field js scripts
96 97
 				$f->registerScripts(neon()->view);
97 98
 				$class = substr($class, 1);
98
-				if (in_array($class, $exclude)) continue;
99
+				if (in_array($class, $exclude)) {
100
+					continue;
101
+				}
99 102
 				$details = $f->getComponentDetails();
100
-				if ($details === false) continue;
103
+				if ($details === false) {
104
+					continue;
105
+				}
101 106
 				$defaultField = Arr::except($f->toArray(), ['dataKey']);
102 107
 				$cmp = Arr::merge($defaultField, [
103 108
 					'class' => $class,
@@ -162,8 +167,9 @@  discard block
 block discarded – undo
162 167
 			]
163 168
 		];
164 169
 		$form = new \neon\core\form\Form($formDefinition);
165
-		if (neon()->request->isAjax)
166
-			return $form->ajaxValidation();
170
+		if (neon()->request->isAjax) {
171
+					return $form->ajaxValidation();
172
+		}
167 173
 		if ($form->processRequest()) {
168 174
 			$data = $form->getData();
169 175
 			$definition = $this->canonicaliseDefinition($data);
Please login to merge, or discard this patch.
neon/cms/form/fields/ImageCompare.php 3 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -48,14 +48,14 @@
 block discarded – undo
48 48
 		];
49 49
     }
50 50
     
51
-    public function getValueDisplay($context='')
51
+    public function getValueDisplay($context = '')
52 52
 	{
53 53
 		$json = $this->getValue();
54 54
 		if (empty($json))
55 55
 			return neon()->formatter->asJson($this->getValue());
56
-		if ($context==='grid') {
56
+		if ($context === 'grid') {
57 57
 			$out = '';
58
-			foreach($json as $image) {
58
+			foreach ($json as $image) {
59 59
 				$url = neon()->firefly->getImage($image);
60 60
 				$out .= "<img src='$url' />";
61 61
 			}
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -51,8 +51,9 @@
 block discarded – undo
51 51
     public function getValueDisplay($context='')
52 52
 	{
53 53
 		$json = $this->getValue();
54
-		if (empty($json))
55
-			return neon()->formatter->asJson($this->getValue());
54
+		if (empty($json)) {
55
+					return neon()->formatter->asJson($this->getValue());
56
+		}
56 57
 		if ($context==='grid') {
57 58
 			$out = '';
58 59
 			foreach($json as $image) {
Please login to merge, or discard this patch.
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -14,21 +14,21 @@  discard block
 block discarded – undo
14 14
 
15 15
 class ImageCompare extends ImageMultiple
16 16
 {
17
-    /**
17
+	/**
18 18
 	 * @inheritdoc
19 19
 	 */
20
-    public $ddsDataType = 'json';
20
+	public $ddsDataType = 'json';
21 21
 
22
-    /**
22
+	/**
23 23
 	 * @inheritdoc
24 24
 	 */
25 25
 	public function registerScripts($view)
26 26
 	{
27
-        $view->registerAssetBundle(\neon\cms\assets\CmsFormAsset::class);
27
+		$view->registerAssetBundle(\neon\cms\assets\CmsFormAsset::class);
28 28
 		$view->registerAssetBundle(\neon\firefly\assets\BrowserAsset::class);
29
-    }
29
+	}
30 30
     
31
-    /**
31
+	/**
32 32
 	 * @inheritdoc
33 33
 	 */
34 34
 	public function getFilterField()
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 		return ['class' => 'neon\\core\\form\\fields\\Text'];
37 37
 	}
38 38
     
39
-    /**
39
+	/**
40 40
 	 * @inheritdoc
41 41
 	 */
42 42
 	public function getComponentDetails()
@@ -44,9 +44,9 @@  discard block
 block discarded – undo
44 44
 		return [
45 45
 			'icon' => 'fa fa-image', 'group' => 'Media', 'order' => 80, 'label' => 'Image Compare'
46 46
 		];
47
-    }
47
+	}
48 48
     
49
-    public function getValueDisplay($context='')
49
+	public function getValueDisplay($context='')
50 50
 	{
51 51
 		$json = $this->getValue();
52 52
 		if (empty($json))
Please login to merge, or discard this patch.
neon/firefly/services/FileManager.php 1 patch
Braces   +18 added lines, -9 removed lines patch added patch discarded remove patch
@@ -66,7 +66,9 @@  discard block
 block discarded – undo
66 66
 		neon()->firefly->isFileObjectValid($file);
67 67
 		$stream = fopen($file->getRealPath(), 'r+');
68 68
 		$uuid = $this->save($stream, $file->getFilename(), $meta);
69
-		if (is_resource($stream)) fclose($stream);
69
+		if (is_resource($stream)) {
70
+			fclose($stream);
71
+		}
70 72
 		return $uuid;
71 73
 	}
72 74
 
@@ -105,8 +107,9 @@  discard block
 block discarded – undo
105 107
 			->orWhere(['data_type_ref' => 'file_ref_multi'])
106 108
 			->all();
107 109
 			
108
-		if (empty($all))
109
-			return [];
110
+		if (empty($all)) {
111
+					return [];
112
+		}
110 113
 
111 114
 		$q = new Query();
112 115
 		foreach ($all as $i => $field) {
@@ -249,7 +252,9 @@  discard block
 block discarded – undo
249 252
 	public function destroy($uuid)
250 253
 	{
251 254
 		$file = Model::findWithDeleted()->where(['uuid' => $uuid])->one();
252
-		if ($file === null) return false;
255
+		if ($file === null) {
256
+			return false;
257
+		}
253 258
 		return $file->destroy();
254 259
 	}
255 260
 
@@ -332,7 +337,9 @@  discard block
 block discarded – undo
332 337
 			$driver = $this->getDriveFor($uuid, $file);
333 338
 			$hash = $driver->hash($file['path']);
334 339
 			$model = $this->_get($uuid);
335
-			if (!$hash) return false;
340
+			if (!$hash) {
341
+				return false;
342
+			}
336 343
 			$model->file_hash = $hash;
337 344
 			$model->save();
338 345
 		}
@@ -396,8 +403,9 @@  discard block
 block discarded – undo
396 403
 	{
397 404
 		$model = $this->_get($uuid);
398 405
 		$model->attributes = $updates;
399
-		if (!$model->save())
400
-			throw new HttpException(400, $model->getErrors());
406
+		if (!$model->save()) {
407
+					throw new HttpException(400, $model->getErrors());
408
+		}
401 409
 		return $model->toArray();
402 410
 	}
403 411
 
@@ -411,8 +419,9 @@  discard block
 block discarded – undo
411 419
 	public function findFile($drive, $path)
412 420
 	{
413 421
 		$model = Model::find()->where(['drive' => $drive, 'path' => $path])->one();
414
-		if ($model === null)
415
-			return null;
422
+		if ($model === null) {
423
+					return null;
424
+		}
416 425
 		return $model->toArray();
417 426
 	}
418 427
 
Please login to merge, or discard this patch.
neon/firefly/services/ImageManager.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -81,14 +81,14 @@  discard block
 block discarded – undo
81 81
 
82 82
 		if (Arr::get($params, 'fit', false)) {
83 83
 			// add callback functionality to retain maximal original image size
84
-			$image->fit($width, $height, function ($constraint) {
84
+			$image->fit($width, $height, function($constraint) {
85 85
 				$constraint->aspectRatio();
86 86
 				$constraint->upsize();
87 87
 			}, $params['fit']);
88 88
 		} elseif ($width || $height) {
89 89
 			$width = $width * $pd;
90 90
 			$height = $height * $pd;
91
-			$image->resize($width, $height, function ($constraint) {
91
+			$image->resize($width, $height, function($constraint) {
92 92
 				$constraint->aspectRatio();
93 93
 				$constraint->upsize();
94 94
 			});
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 	{
135 135
 		$filter = Arr::get($params, 'filter', false);
136 136
 		if ($filter) {
137
-			$filters = explode(',',$filter);
137
+			$filters = explode(',', $filter);
138 138
 			if (in_array('greyscale', $filters, true)) {
139 139
 				$image->greyscale();
140 140
 			}
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 				$x = Arr::get($crop, 'x', null);
170 170
 				$y = Arr::get($crop, 'y', null);
171 171
 			}
172
-			if ($w == 0 && $h == 0 && $x == 0 && $y ==0) {
172
+			if ($w == 0 && $h == 0 && $x == 0 && $y == 0) {
173 173
 				return $image;
174 174
 			}
175 175
 			$image->crop($w, $h, $x, $y);
Please login to merge, or discard this patch.
Braces   +9 added lines, -5 removed lines patch added patch discarded remove patch
@@ -38,11 +38,13 @@  discard block
 block discarded – undo
38 38
 	{
39 39
 		// get firefly image if the source is a firefly id
40 40
 		if (Hash::isUuid64($source)) {
41
-			if (!neon()->firefly->fileManager->exists($source))
42
-				throw new HttpException(404);
41
+			if (!neon()->firefly->fileManager->exists($source)) {
42
+							throw new HttpException(404);
43
+			}
43 44
 			$meta = neon()->firefly->fileManager->getMeta($source);
44
-			if ($meta['mime_type'] == 'image/svg')
45
-				return neon()->firefly->fileManager->read($source);
45
+			if ($meta['mime_type'] == 'image/svg') {
46
+							return neon()->firefly->fileManager->read($source);
47
+			}
46 48
 			$source = neon()->firefly->fileManager->readStream($source);
47 49
 		}
48 50
 		$manager = new InterventionImageManager();
@@ -103,7 +105,9 @@  discard block
 block discarded – undo
103 105
 	public function imageRotate(Image & $image, $params)
104 106
 	{
105 107
 		$rotate = Arr::get($params, 'rotate', false);
106
-		if ($rotate) $image->rotate($rotate);
108
+		if ($rotate) {
109
+			$image->rotate($rotate);
110
+		}
107 111
 	}
108 112
 
109 113
 	/**
Please login to merge, or discard this patch.
neon/firefly/controllers/FileController.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 		$id = $request->get('id');
38 38
 		if (!$firefly->fileManager->exists($id)) {
39 39
 			// show placeholder image - should be handled by image manager - controllers should not know
40
-			return neon()->response->sendFile(dirname(__DIR__) . '/assets/placeholder.jpg', 'No File', ['inline' => true]);
40
+			return neon()->response->sendFile(dirname(__DIR__).'/assets/placeholder.jpg', 'No File', ['inline' => true]);
41 41
 		}
42 42
 
43 43
 		// as the url is unique for a file we can be aggressive about caching
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 			return $firefly->fileManager->sendFile($id, (bool) $download);
56 56
 		} catch (\Exception $e) {
57 57
 			// if path unknown respond with a blank placeholder
58
-			return neon()->response->sendFile(dirname(__DIR__) . '/assets/placeholder.jpg', 'No File', ['inline' => true]);
58
+			return neon()->response->sendFile(dirname(__DIR__).'/assets/placeholder.jpg', 'No File', ['inline' => true]);
59 59
 		}
60 60
 	}
61 61
 
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 		$id = neon()->request->getRequired('id');
82 82
 
83 83
 		// create a unique request key - add v2 to force use of new cached version
84
-		$requestKey = neon()->request->absoluteUrl . 'v10';
84
+		$requestKey = neon()->request->absoluteUrl.'v10';
85 85
 
86 86
 		// see if we already have this in cache and the browser already has it too
87 87
 		// We want to remove the need to process images when ever possible
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 	 */
133 133
 	public function generatePublicFile($id, $imageContent)
134 134
 	{
135
-		$dir = substr($id,0, 3);
135
+		$dir = substr($id, 0, 3);
136 136
 		$publicDir = neon()->getAlias("@webroot/assets/firefly/$dir");
137 137
 		if (!file_exists($publicDir)) {
138 138
 			FileHelper::createDirectory($publicDir);
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
 	 * Handle a request that can return a 304 not modified header
168 168
 	 * @param bool|string $cacheKey - default false - if cache key is specified
169 169
 	 */
170
-	public function handleNotModified($cacheKey=false)
170
+	public function handleNotModified($cacheKey = false)
171 171
 	{
172 172
 		$requestHeaders = neon()->request->headers;
173 173
 		$browserHasCache = (isset($requestHeaders['If-Modified-Since']) || isset($requestHeaders['If-None-Match']));
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
 	{
184 184
 		header($_SERVER['SERVER_PROTOCOL'].' 304 Not modified');
185 185
 		header('Cache-Control: private, max-age=30000000, immutable, only-if-cached');
186
-		header('Expires: ' . Carbon::now()->addYear(10)->toRfc1123String());
186
+		header('Expires: '.Carbon::now()->addYear(10)->toRfc1123String());
187 187
 		exit;
188 188
 	}
189 189
 
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -46,8 +46,9 @@  discard block
 block discarded – undo
46 46
 
47 47
 		// set expiry information on the file
48 48
 		$meta = $firefly->fileManager->getMeta($id);
49
-		if ($meta['mime_type'] == 'image/svg')
50
-			$meta['mime_type'] = 'image/svg+xml';
49
+		if ($meta['mime_type'] == 'image/svg') {
50
+					$meta['mime_type'] = 'image/svg+xml';
51
+		}
51 52
 		$this->sendCacheHeaders($meta['mime_type'], $meta['size'], $meta['updated_at'], md5($request->absoluteUrl), $meta['name']);
52 53
 		$download = $request->get('download', $request->get('dl', false));
53 54
 		try {
@@ -110,7 +111,9 @@  discard block
 block discarded – undo
110 111
 			$processedImage = neon()->firefly->imageManager->process($idOrUrl, neon()->request->get());
111 112
 			$mimeType = finfo_buffer(finfo_open(FILEINFO_MIME_TYPE), $processedImage);
112 113
 			// svgs don't seem display in browsers without specifically the svg+xml mime type
113
-			if ($mimeType === 'image/svg') $mimeType = 'image/svg+xml';
114
+			if ($mimeType === 'image/svg') {
115
+				$mimeType = 'image/svg+xml';
116
+			}
114 117
 			return [
115 118
 				// recalculate the mime type in case was spoofed
116 119
 				'size' => strlen($processedImage),
Please login to merge, or discard this patch.
neon/cms/controllers/RenderController.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -82,13 +82,13 @@  discard block
 block discarded – undo
82 82
 	 * slug it uses - without this property the canonical function will return the url of the first blog-post
83 83
 	 * (collection page) it finds.
84 84
 	 */
85
-	public function actionPage($nice_id, $slug='')
85
+	public function actionPage($nice_id, $slug = '')
86 86
 	{
87 87
 		\Neon::beginProfile('COBE::RENDER_ACTION', 'cobe');
88 88
 		$cms = $this->getCms();
89 89
 		$page = $cms->getPage();
90 90
 		// check the page with the nice_id exists
91
-		if (! $page->setById($nice_id)) {
91
+		if (!$page->setById($nice_id)) {
92 92
 			$this->pageNotFound();
93 93
 		}
94 94
 		//return neon()->view->injectHtml('');
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 		}
104 104
 
105 105
 		// Don't display draft pages unless in edit mode.
106
-		if ($page->isStatusDraft() && ! $page->isInEditMode()) {
106
+		if ($page->isStatusDraft() && !$page->isInEditMode()) {
107 107
 			$this->pageNotFound();
108 108
 		}
109 109
 
@@ -135,8 +135,8 @@  discard block
 block discarded – undo
135 135
 			->innerJoin(CmsPage::tableName(), 'cms_page.nice_id = cms_url.nice_id')
136 136
 			->where("status='PUBLISHED'")
137 137
 			->all()
138
-		)->reduce(function($carry, $url){
139
-			return $carry . "\t<url>\n\t\t<loc>" . url($url['url'], true) . "</loc>\n\t</url>" . "\n";
138
+		)->reduce(function($carry, $url) {
139
+			return $carry."\t<url>\n\t\t<loc>".url($url['url'], true)."</loc>\n\t</url>"."\n";
140 140
 		});
141 141
 		header('Content-Type:application/rss+xml');
142 142
 		echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";
Please login to merge, or discard this patch.
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -108,8 +108,9 @@  discard block
 block discarded – undo
108 108
 		}
109 109
 
110 110
 		$render = $page->render();
111
-		if ($render === false)
112
-			throw new \yii\web\HttpException(404, 'No template found');
111
+		if ($render === false) {
112
+					throw new \yii\web\HttpException(404, 'No template found');
113
+		}
113 114
 
114 115
 		\Neon::endProfile('COBE::RENDER_ACTION', 'cobe');
115 116
 
@@ -153,10 +154,12 @@  discard block
 block discarded – undo
153 154
 	{
154 155
 		$request = neon()->request;
155 156
 		$url = $request->get('page');
156
-		if (!$url)
157
-			$this->pageNotFound();
158
-		if (($urlEntry = CmsUrl::findByUrl($url)))
159
-			return $this->actionPage($urlEntry['nice_id']);
157
+		if (!$url) {
158
+					$this->pageNotFound();
159
+		}
160
+		if (($urlEntry = CmsUrl::findByUrl($url))) {
161
+					return $this->actionPage($urlEntry['nice_id']);
162
+		}
160 163
 		$this->pageNotFound();
161 164
 	}
162 165
 
Please login to merge, or discard this patch.
neon/core/web/UrlManager.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
 	public function getCanonical()
23 23
 	{
24 24
 		$params = neon()->controller->actionParams;
25
-        $params[0] = neon()->controller->getRoute();
25
+		$params[0] = neon()->controller->getRoute();
26 26
 		$urlManager = neon()->getUrlManager();
27 27
 		$url = $urlManager->createUrl($params);
28 28
 		if (strpos($url, '://') === false) {
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -28,9 +28,9 @@
 block discarded – undo
28 28
 		if (strpos($url, '://') === false) {
29 29
 			$hostInfo = setting('cms', 'canonical', $urlManager->getHostInfo());
30 30
 			if (strncmp($url, '//', 2) === 0) {
31
-				$url = substr($hostInfo, 0, strpos($hostInfo, '://')) . ':' . $url;
31
+				$url = substr($hostInfo, 0, strpos($hostInfo, '://')).':'.$url;
32 32
 			} else {
33
-				$url = $hostInfo . $url;
33
+				$url = $hostInfo.$url;
34 34
 			}
35 35
 		}
36 36
 		return Url::ensureScheme($url, null);
Please login to merge, or discard this patch.
neon/core/view/SmartySharedPlugins.php 5 patches
Indentation   +1 added lines, -4 removed lines patch added patch discarded remove patch
@@ -923,7 +923,4 @@
 block discarded – undo
923 923
 		if (!empty($params['assign'])) {
924 924
 			$smarty->assign($params['assign'], $output);
925 925
 		} else {
926
-			return $output;
927
-		}
928
-	}
929
-}
926
+			return $output
930 927
\ No newline at end of file
Please login to merge, or discard this patch.
Switch Indentation   +1 added lines, -4 removed lines patch added patch discarded remove patch
@@ -923,7 +923,4 @@
 block discarded – undo
923 923
 		if (!empty($params['assign'])) {
924 924
 			$smarty->assign($params['assign'], $output);
925 925
 		} else {
926
-			return $output;
927
-		}
928
-	}
929
-}
926
+			return $output
930 927
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +4 added lines, -5 removed lines patch added patch discarded remove patch
@@ -126,7 +126,9 @@  discard block
 block discarded – undo
126 126
 	public function googleCode($params)
127 127
 	{
128 128
 		$id = setting('cms', 'google_code');
129
-		if (empty($id)) return '';
129
+		if (empty($id)) {
130
+			return '';
131
+		}
130 132
 		// if using google tag manager
131 133
 		if (substr($id, 0, 3) === 'GTM') {
132 134
 			$head = <<<HEADJS
@@ -923,7 +925,4 @@  discard block
 block discarded – undo
923 925
 		if (!empty($params['assign'])) {
924 926
 			$smarty->assign($params['assign'], $output);
925 927
 		} else {
926
-			return $output;
927
-		}
928
-	}
929
-}
928
+			return $output
930 929
\ No newline at end of file
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -4 removed lines patch added patch discarded remove patch
@@ -923,7 +923,4 @@
 block discarded – undo
923 923
 		if (!empty($params['assign'])) {
924 924
 			$smarty->assign($params['assign'], $output);
925 925
 		} else {
926
-			return $output;
927
-		}
928
-	}
929
-}
926
+			return $output
930 927
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -538,8 +538,8 @@  discard block
 block discarded – undo
538 538
 
539 539
 		$html = [];
540 540
 		$params['loading'] = Arr::get($params, 'loading', 'lazy');
541
-		$params[Arr::get($params, 'srcset-name', 'srcset')] = Arr::get($params, 'srcset', $this->image_srcset(['src' => $id, 'quality'=> $quality, 'widths'=>$widths]));
542
-		$params[Arr::get($params, 'src-name', 'src')] = $this->firefly_image(['id' => $id, 'w' => (int)$srcWidth, 'q' => $quality]);
541
+		$params[Arr::get($params,  'srcset-name', 'srcset')] = Arr::get($params, 'srcset', $this->image_srcset(['src' => $id, 'quality'=> $quality, 'widths'=>$widths]));
542
+		$params[Arr::get($params,  'src-name', 'src')] = $this->firefly_image(['id' => $id, 'w' => (int)$srcWidth, 'q' => $quality]);
543 543
 
544 544
 		// alt
545 545
 		$params['alt'] = Arr::get($params, 'alt', $this->image_alt(['src' => $id]));
@@ -897,7 +897,4 @@  discard block
 block discarded – undo
897 897
 		if (!empty($params['assign'])) {
898 898
 			$smarty->assign($params['assign'], $output);
899 899
 		} else {
900
-			return $output;
901
-		}
902
-	}
903
-}
900
+			return $output
904 901
\ No newline at end of file
Please login to merge, or discard this patch.