Inspection of "Simplify searches with `cs\CRUD_helpers` trait" - nazar-pc/CleverStyle-Framework - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( fa65af...9eb297 )

by Nazar

created 2016-04-07 00:05 UTC

Status

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -31,19 +31,19 @@
 block discarded – undo
  * @return string
  */
 function http_build_url ($url, $parts) {
-	$url	= explode('?', $url, 2);
-	$params	= [];
+	$url = explode('?', $url, 2);
+	$params = [];
 	if (isset($url[1])) {
 		foreach (explode('&', $url[1]) as $u) {
-			$params[]	= $u;
+			$params[] = $u;
 		}
 		unset($u, $url[1]);
 	}
-	$url	= $url[0];
+	$url = $url[0];
 	foreach ($parts as $name => $value) {
-		$params[]	= $name.'='.urlencode($value);
+		$params[] = $name.'='.urlencode($value);
 	}
 	unset($parts, $p);
-	$params	= array_unique($params);
+	$params = array_unique($params);
 	return "$url?".implode('&', $params);
 }

Please login to merge, or discard this patch.

Indentation +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -1,19 +1,19 @@  discard block
 block discarded – undo
 <?php
 /**
- * @package		OAuth2
- * @category	modules
- * @author		Nazar Mokrynskyi <[email protected]>
- * @copyright	Copyright (c) 2011-2016, Nazar Mokrynskyi
- * @license		MIT License, see license.txt
- */
+	 * @package		OAuth2
+	 * @category	modules
+	 * @author		Nazar Mokrynskyi <[email protected]>
+	 * @copyright	Copyright (c) 2011-2016, Nazar Mokrynskyi
+	 * @license		MIT License, see license.txt
+	 */
 namespace	cs\modules\OAuth2;
 /**
- * Just replaces first "?" symbol by "#"
- *
- * @param string	$str
- *
- * @return string
- */
+	 * Just replaces first "?" symbol by "#"
+	 *
+	 * @param string	$str
+	 *
+	 * @return string
+	 */
 function uri_for_token ($str) {
 	return implode(
 		'#',
@@ -25,11 +25,11 @@  discard block
 block discarded – undo
 	);
 }
 /**
- * @param string	$url
- * @param string[]	$parts
- *
- * @return string
- */
+	 * @param string	$url
+	 * @param string[]	$parts
+	 *
+	 * @return string
+	 */
 function http_build_url ($url, $parts) {
 	$url	= explode('?', $url, 2);
 	$params	= [];

Please login to merge, or discard this patch.

components/modules/Shop/Items.php 3 patches

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -55,7 +55,7 @@  discard block
 block discarded – undo
 
 	const DEFAULT_IMAGE = 'components/modules/Shop/includes/img/no-image.svg';
 
-	protected $data_model                  = [
+	protected $data_model = [
 		'id'         => 'int',
 		'date'       => 'int',
 		'category'   => 'int',
@@ -443,7 +443,7 @@  discard block
 block discarded – undo
 				'string'  => '',
 				'text'    => ''
 			];
-			$lang       = '';
+			$lang = '';
 			switch ($this->attribute_type_to_value_field($attribute_data['type'])) {
 				case 'numeric_value':
 					$value_type['numeric'] = $value;

Please login to merge, or discard this patch.

Braces +6 added lines, -3 removed lines patch added patch discarded remove patch

@@ -286,17 +286,20 @@
 block discarded – undo
 		$where        = [];
 		$where_params = [];
 		foreach ($search_parameters as $key => $details) {
-			if (isset($this->data_model[$key])) { // Property
+			if (isset($this->data_model[$key])) {
+// Property
 				$where[]        = "`i`.`$key` = '%s'";
 				$where_params[] = $details;
-			} elseif (is_numeric($key)) { // Tag
+			} elseif (is_numeric($key)) {
+// Tag
 				$joins .=
 					"INNER JOIN `{$this->table}_tags` AS `t`
 					ON
 						`i`.`id`	= `t`.`id` AND
 						`t`.`tag`	= '%s'";
 				$where_params[] = $details;
-			} else { // Attribute
+			} else {
+// Attribute
 				$field = @$this->attribute_type_to_value_field($Attributes->get($key)['type']);
 				if (!$field || empty($details)) {
 					continue;

Please login to merge, or discard this patch.

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,11 +1,11 @@
 block discarded – undo
 <?php
 /**
- * @package   Shop
- * @category  modules
- * @author    Nazar Mokrynskyi <[email protected]>
- * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi
- * @license   MIT License, see license.txt
- */
+	 * @package   Shop
+	 * @category  modules
+	 * @author    Nazar Mokrynskyi <[email protected]>
+	 * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi
+	 * @license   MIT License, see license.txt
+	 */
 namespace cs\modules\Shop;
 use
 	h,

Please login to merge, or discard this patch.

components/modules/Shop/Orders.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -67,7 +67,7 @@
 block discarded – undo
 
 	const PAYMENT_METHOD_CASH = 'shop:cash';
 
-	protected $data_model            = [
+	protected $data_model = [
 		'id'                => 'int',
 		'user'              => 'int',
 		'date'              => 'int',

Please login to merge, or discard this patch.

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,11 +1,11 @@
 block discarded – undo
 <?php
 /**
- * @package   Shop
- * @category  modules
- * @author    Nazar Mokrynskyi <[email protected]>
- * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi
- * @license   MIT License, see license.txt
- */
+	 * @package   Shop
+	 * @category  modules
+	 * @author    Nazar Mokrynskyi <[email protected]>
+	 * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi
+	 * @license   MIT License, see license.txt
+	 */
 namespace cs\modules\Shop;
 use
 	h,

Please login to merge, or discard this patch.

components/modules/Shop/categories_.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -113,7 +113,7 @@
 block discarded – undo
 if (!$items) {
 	return;
 }
-$items_total     = $Items->search(
+$items_total = $Items->search(
 	[
 		'listed'      => 1,
 		'category'    => $current_category,

Please login to merge, or discard this patch.

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,11 +1,11 @@
 block discarded – undo
 <?php
 /**
- * @package   Shop
- * @category  modules
- * @author    Nazar Mokrynskyi <[email protected]>
- * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi
- * @license   MIT License, see license.txt
- */
+	 * @package   Shop
+	 * @category  modules
+	 * @author    Nazar Mokrynskyi <[email protected]>
+	 * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi
+	 * @license   MIT License, see license.txt
+	 */
 namespace cs\modules\Shop;
 use
 	h,

Please login to merge, or discard this patch.

components/modules/Shop/items_.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -23,7 +23,7 @@
 block discarded – undo
 	':',
 	array_slice(Route::instance()->path, -1)[0]
 );
-$item       = $Items->get_for_user(array_pop($item));
+$item = $Items->get_for_user(array_pop($item));
 $Page->title($item['title']);
 $Page->Description = description($item['description']);
 $Page->canonical_url(

Please login to merge, or discard this patch.

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,11 +1,11 @@
 block discarded – undo
 <?php
 /**
- * @package   Shop
- * @category  modules
- * @author    Nazar Mokrynskyi <[email protected]>
- * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi
- * @license   MIT License, see license.txt
- */
+	 * @package   Shop
+	 * @category  modules
+	 * @author    Nazar Mokrynskyi <[email protected]>
+	 * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi
+	 * @license   MIT License, see license.txt
+	 */
 namespace cs\modules\Shop;
 use
 	h,

Please login to merge, or discard this patch.

components/modules/Static_pages/Categories.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -20,7 +20,7 @@
 block discarded – undo
 	use
 		CRUD,
 		Singleton;
-	protected $data_model          = [
+	protected $data_model = [
 		'id'     => 'int',
 		'title'  => 'ml:text',
 		'path'   => 'ml:text',

Please login to merge, or discard this patch.

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,11 +1,11 @@
 block discarded – undo
 <?php
 /**
- * @package   Static Pages
- * @category  modules
- * @author    Nazar Mokrynskyi <[email protected]>
- * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi
- * @license   MIT License, see license.txt
- */
+	 * @package   Static Pages
+	 * @category  modules
+	 * @author    Nazar Mokrynskyi <[email protected]>
+	 * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi
+	 * @license   MIT License, see license.txt
+	 */
 namespace cs\modules\Static_pages;
 use
 	cs\CRUD,

Please login to merge, or discard this patch.

components/modules/Static_pages/Pages.php 2 patches

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -21,7 +21,7 @@  discard block
 block discarded – undo
 	use
 		CRUD,
 		Singleton;
-	protected $data_model                  = [
+	protected $data_model = [
 		'id'        => 'int',
 		'category'  => 'int',
 		'title'     => 'ml:text',
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
 				$Categories->get($parent)
 			);
 		}
-		$pages              = $this->db()->qfas(
+		$pages = $this->db()->qfas(
 			[
 				"SELECT `id`
 				FROM `[prefix]static_pages`
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
 			$structure['pages'][$this->get($id)['path']] = $id;
 		}
 		unset($pages);
-		$categories              = $this->db()->qfa(
+		$categories = $this->db()->qfa(
 			[
 				"SELECT
 					`id`,

Please login to merge, or discard this patch.

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,11 +1,11 @@
 block discarded – undo
 <?php
 /**
- * @package   Static Pages
- * @category  modules
- * @author    Nazar Mokrynskyi <[email protected]>
- * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi
- * @license   MIT License, see license.txt
- */
+	 * @package   Static Pages
+	 * @category  modules
+	 * @author    Nazar Mokrynskyi <[email protected]>
+	 * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi
+	 * @license   MIT License, see license.txt
+	 */
 namespace cs\modules\Static_pages;
 use
 	cs\CRUD,

Please login to merge, or discard this patch.

components/modules/System/api/Controller/admin/permissions.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -111,7 +111,7 @@
 block discarded – undo
 				'value',
 				'id'
 			);
-			$data['users']  = array_column(
+			$data['users'] = array_column(
 				$User->db()->qfa(
 					[
 						"SELECT

Please login to merge, or discard this patch.

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -1,12 +1,12 @@
 block discarded – undo
 <?php
 /**
- * @package    CleverStyle CMS
- * @subpackage System module
- * @category   modules
- * @author     Nazar Mokrynskyi <[email protected]>
- * @copyright  Copyright (c) 2015-2016, Nazar Mokrynskyi
- * @license    MIT License, see license.txt
- */
+	 * @package    CleverStyle CMS
+	 * @subpackage System module
+	 * @category   modules
+	 * @author     Nazar Mokrynskyi <[email protected]>
+	 * @copyright  Copyright (c) 2015-2016, Nazar Mokrynskyi
+	 * @license    MIT License, see license.txt
+	 */
 namespace cs;
 
 $Config = Config::instance();

Please login to merge, or discard this patch.

components/modules/WebSockets/Server.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -140,7 +140,7 @@
 block discarded – undo
 		// Disable all versions except RFC6455, which is supported by all modern browsers
 		$ws_server->disableVersion(0);
 		$ws_server->disableVersion(6);
-		$this->io_server        = IoServer::factory(
+		$this->io_server = IoServer::factory(
 			new HttpServer($ws_server),
 			$this->listen_port,
 			$this->listen_locally

Please login to merge, or discard this patch.

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,11 +1,11 @@
 block discarded – undo
 <?php
 /**
- * @package   WebSockets
- * @category  modules
- * @author    Nazar Mokrynskyi <[email protected]>
- * @copyright Copyright (c) 2015-2016, Nazar Mokrynskyi
- * @license   MIT License, see license.txt
- */
+	 * @package   WebSockets
+	 * @category  modules
+	 * @author    Nazar Mokrynskyi <[email protected]>
+	 * @copyright Copyright (c) 2015-2016, Nazar Mokrynskyi
+	 * @license   MIT License, see license.txt
+	 */
 namespace cs\modules\WebSockets;
 use
 	cs\_SERVER,

Please login to merge, or discard this patch.

		@@ -55,7 +55,7 @@ discard block
		block discarded – undo
55	55
56	56	const DEFAULT_IMAGE = 'components/modules/Shop/includes/img/no-image.svg';
57	57
58		- protected $data_model = [
	58	+ protected $data_model = [
59	59	'id' => 'int',
60	60	'date' => 'int',
61	61	'category' => 'int',
		@@ -443,7 +443,7 @@ discard block
		block discarded – undo
443	443	'string' => '',
444	444	'text' => ''
445	445	];
446		- $lang = '';
	446	+ $lang = '';
447	447	switch ($this->attribute_type_to_value_field($attribute_data['type'])) {
448	448	case 'numeric_value':
449	449	$value_type['numeric'] = $value;

		@@ -286,17 +286,20 @@
		block discarded – undo
286	286	$where = [];
287	287	$where_params = [];
288	288	foreach ($search_parameters as $key => $details) {
289		- if (isset($this->data_model[$key])) { // Property
	289	+ if (isset($this->data_model[$key])) {
	290	+// Property
290	291	$where[] = "`i`.`$key` = '%s'";
291	292	$where_params[] = $details;
292		- } elseif (is_numeric($key)) { // Tag
	293	+ } elseif (is_numeric($key)) {
	294	+// Tag
293	295	$joins .=
294	296	"INNER JOIN `{$this->table}_tags` AS `t`
295	297	ON
296	298	`i`.`id` = `t`.`id` AND
297	299	`t`.`tag` = '%s'";
298	300	$where_params[] = $details;
299		- } else { // Attribute
	301	+ } else {
	302	+// Attribute
300	303	$field = @$this->attribute_type_to_value_field($Attributes->get($key)['type']);
301	304	if (!$field \|\| empty($details)) {
302	305	continue;

		@@ -67,7 +67,7 @@
		block discarded – undo
67	67
68	68	const PAYMENT_METHOD_CASH = 'shop:cash';
69	69
70		- protected $data_model = [
	70	+ protected $data_model = [
71	71	'id' => 'int',
72	72	'user' => 'int',
73	73	'date' => 'int',

		@@ -113,7 +113,7 @@
		block discarded – undo
113	113	if (!$items) {
114	114	return;
115	115	}
116		-$items_total = $Items->search(
	116	+$items_total = $Items->search(
117	117	[
118	118	'listed' => 1,
119	119	'category' => $current_category,

		@@ -31,19 +31,19 @@
		block discarded – undo
31	31	* @return string
32	32	*/
33	33	function http_build_url ($url, $parts) {
34		- $url = explode('?', $url, 2);
35		- $params = [];
	34	+ $url = explode('?', $url, 2);
	35	+ $params = [];
36	36	if (isset($url[1])) {
37	37	foreach (explode('&', $url[1]) as $u) {
38		- $params[] = $u;
	38	+ $params[] = $u;
39	39	}
40	40	unset($u, $url[1]);
41	41	}
42		- $url = $url[0];
	42	+ $url = $url[0];
43	43	foreach ($parts as $name => $value) {
44		- $params[] = $name.'='.urlencode($value);
	44	+ $params[] = $name.'='.urlencode($value);
45	45	}
46	46	unset($parts, $p);
47		- $params = array_unique($params);
	47	+ $params = array_unique($params);
48	48	return "$url?".implode('&', $params);
49	49	}

		@@ -1,19 +1,19 @@ discard block
		block discarded – undo
1	1	<?php
2	2	/**
3		- * @package OAuth2
4		- * @category modules
5		- * @author Nazar Mokrynskyi <[email protected]>
6		- * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi
7		- * @license MIT License, see license.txt
8		- */
	3	+ * @package OAuth2
	4	+ * @category modules
	5	+ * @author Nazar Mokrynskyi <[email protected]>
	6	+ * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi
	7	+ * @license MIT License, see license.txt
	8	+ */
9	9	namespace cs\modules\OAuth2;
10	10	/**
11		- * Just replaces first "?" symbol by "#"
12		- *
13		- * @param string $str
14		- *
15		- * @return string
16		- */
	11	+ * Just replaces first "?" symbol by "#"
	12	+ *
	13	+ * @param string $str
	14	+ *
	15	+ * @return string
	16	+ */
17	17	function uri_for_token ($str) {
18	18	return implode(
19	19	'#',
		@@ -25,11 +25,11 @@ discard block
		block discarded – undo
25	25	);
26	26	}
27	27	/**
28		- * @param string $url
29		- * @param string[] $parts
30		- *
31		- * @return string
32		- */
	28	+ * @param string $url
	29	+ * @param string[] $parts
	30	+ *
	31	+ * @return string
	32	+ */
33	33	function http_build_url ($url, $parts) {
34	34	$url = explode('?', $url, 2);
35	35	$params = [];

		@@ -1,11 +1,11 @@
		block discarded – undo
1	1	<?php
2	2	/**
3		- * @package Shop
4		- * @category modules
5		- * @author Nazar Mokrynskyi <[email protected]>
6		- * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi
7		- * @license MIT License, see license.txt
8		- */
	3	+ * @package Shop
	4	+ * @category modules
	5	+ * @author Nazar Mokrynskyi <[email protected]>
	6	+ * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi
	7	+ * @license MIT License, see license.txt
	8	+ */
9	9	namespace cs\modules\Shop;
10	10	use
11	11	h,

		@@ -23,7 +23,7 @@
		block discarded – undo
23	23	':',
24	24	array_slice(Route::instance()->path, -1)[0]
25	25	);
26		-$item = $Items->get_for_user(array_pop($item));
	26	+$item = $Items->get_for_user(array_pop($item));
27	27	$Page->title($item['title']);
28	28	$Page->Description = description($item['description']);
29	29	$Page->canonical_url(

		@@ -20,7 +20,7 @@
		block discarded – undo
20	20	use
21	21	CRUD,
22	22	Singleton;
23		- protected $data_model = [
	23	+ protected $data_model = [
24	24	'id' => 'int',
25	25	'title' => 'ml:text',
26	26	'path' => 'ml:text',

		@@ -21,7 +21,7 @@ discard block
		block discarded – undo
21	21	use
22	22	CRUD,
23	23	Singleton;
24		- protected $data_model = [
	24	+ protected $data_model = [
25	25	'id' => 'int',
26	26	'category' => 'int',
27	27	'title' => 'ml:text',
		@@ -164,7 +164,7 @@ discard block
		block discarded – undo
164	164	$Categories->get($parent)
165	165	);
166	166	}
167		- $pages = $this->db()->qfas(
	167	+ $pages = $this->db()->qfas(
168	168	[
169	169	"SELECT `id`
170	170	FROM `[prefix]static_pages`
		@@ -177,7 +177,7 @@ discard block
		block discarded – undo
177	177	$structure['pages'][$this->get($id)['path']] = $id;
178	178	}
179	179	unset($pages);
180		- $categories = $this->db()->qfa(
	180	+ $categories = $this->db()->qfa(
181	181	[
182	182	"SELECT
183	183	`id`,

		@@ -111,7 +111,7 @@
		block discarded – undo
111	111	'value',
112	112	'id'
113	113	);
114		- $data['users'] = array_column(
	114	+ $data['users'] = array_column(
115	115	$User->db()->qfa(
116	116	[
117	117	"SELECT

		@@ -1,12 +1,12 @@
		block discarded – undo
1	1	<?php
2	2	/**
3		- * @package CleverStyle CMS
4		- * @subpackage System module
5		- * @category modules
6		- * @author Nazar Mokrynskyi <[email protected]>
7		- * @copyright Copyright (c) 2015-2016, Nazar Mokrynskyi
8		- * @license MIT License, see license.txt
9		- */
	3	+ * @package CleverStyle CMS
	4	+ * @subpackage System module
	5	+ * @category modules
	6	+ * @author Nazar Mokrynskyi <[email protected]>
	7	+ * @copyright Copyright (c) 2015-2016, Nazar Mokrynskyi
	8	+ * @license MIT License, see license.txt
	9	+ */
10	10	namespace cs;
11	11
12	12	$Config = Config::instance();

		@@ -140,7 +140,7 @@
		block discarded – undo
140	140	// Disable all versions except RFC6455, which is supported by all modern browsers
141	141	$ws_server->disableVersion(0);
142	142	$ws_server->disableVersion(6);
143		- $this->io_server = IoServer::factory(
	143	+ $this->io_server = IoServer::factory(
144	144	new HttpServer($ws_server),
145	145	$this->listen_port,
146	146	$this->listen_locally

nazar-pc / CleverStyle-Framework

Push — master ( fa65af...9eb297 )

Status

Category

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Indentation +17 added lines, -17 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Braces +6 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch