Inspection of "Always create new instances of MySqlDatabase" - smrealms/smr - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Pull Request — master (#951)

unknown

created 2020-12-13 23:39 UTC

Status

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

@@ -7,7 +7,7 @@  discard block
 block discarded – undo
 	$db3 = MySqlDatabase::getInstance();
 
 	// get current entry
-	$db->query('SELECT * FROM manual WHERE topic_id = '.$db->escapeNumber($topic_id));
+	$db->query('SELECT * FROM manual WHERE topic_id = ' . $db->escapeNumber($topic_id));
 	if ($db->nextRecord()) {
 		$parent_topic_id = $db->getInt('parent_topic_id');
 		$order_id = $db->getInt('order_id');
@@ -19,17 +19,17 @@  discard block
 block discarded – undo
 		// **************************
 		// **  PREVIOUS
 		// **************************
-		$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id - 1));
+		$db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($parent_topic_id) . ' AND order_id = ' . $db2->escapeNumber($order_id - 1));
 
 		// no result?
 		if (!$db2->getNumRows())
-			$db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id));
+			$db2->query('SELECT * FROM manual WHERE topic_id = ' . $db2->escapeNumber($parent_topic_id));
 
 		echo ('<th width="32">');
 		if ($db2->nextRecord()) {
 			$previous_topic_id = $db2->getInt('topic_id');
 			$previous_topic = stripslashes($db2->getField('topic'));
-			echo ('<a href="/manual.php?'.$previous_topic_id.'"><img src="/images/help/previous.jpg" width="32" height="32" border="0"></a>');
+			echo ('<a href="/manual.php?' . $previous_topic_id . '"><img src="/images/help/previous.jpg" width="32" height="32" border="0"></a>');
 		} else
 			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
 		echo ('</th>');
@@ -37,12 +37,12 @@  discard block
 block discarded – undo
 		// **************************
 		// **  UP
 		// **************************
-		$db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id));
+		$db2->query('SELECT * FROM manual WHERE topic_id = ' . $db2->escapeNumber($parent_topic_id));
 		echo ('<th width="32">');
 		if ($db2->nextRecord()) {
 			$up_topic_id = $db2->getInt('topic_id');
 			$up_topic = stripslashes($db2->getField('topic'));
-			echo ('<a href="/manual.php?'.$up_topic_id.'"><img src="/images/help/up.jpg" width="32" height="32" border="0"></a>');
+			echo ('<a href="/manual.php?' . $up_topic_id . '"><img src="/images/help/up.jpg" width="32" height="32" border="0"></a>');
 		} else
 			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
 		echo ('</th>');
@@ -50,35 +50,35 @@  discard block
 block discarded – undo
 		// **************************
 		// **  NEXT
 		// **************************
-		$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($topic_id).' AND order_id = 1');
+		$db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($topic_id) . ' AND order_id = 1');
 
 		if (!$db2->getNumRows())
-			$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id + 1));
+			$db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($parent_topic_id) . ' AND order_id = ' . $db2->escapeNumber($order_id + 1));
 
 		$seenParentIDs = array(0);
 		$curr_parent_topic_id = $parent_topic_id;
 		while (!$db2->getNumRows() && !in_array($curr_parent_topic_id, $seenParentIDs)) {
 			$seenParentIDs[] = $curr_parent_topic_id;
-			$db3->query('SELECT * FROM manual WHERE topic_id = '.$db3->escapeNumber($parent_topic_id));
+			$db3->query('SELECT * FROM manual WHERE topic_id = ' . $db3->escapeNumber($parent_topic_id));
 			$db3->nextRecord();
 			$curr_order_id = $db3->getInt('order_id');
 			$curr_parent_topic_id = $db3->getInt('parent_topic_id');
 
-			$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($curr_order_id + 1));
+			$db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($parent_topic_id) . ' AND order_id = ' . $db2->escapeNumber($curr_order_id + 1));
 		}
 
 		echo ('<th width="32">');
 		if ($db2->nextRecord()) {
 			$next_topic_id = $db2->getInt('topic_id');
 			$next_topic = stripslashes($db2->getField('topic'));
-			echo ('<a href="/manual.php?'.$next_topic_id.'"><img src="/images/help/next.jpg" width="32" height="32" border="0"></a>');
+			echo ('<a href="/manual.php?' . $next_topic_id . '"><img src="/images/help/next.jpg" width="32" height="32" border="0"></a>');
 		}
 		else {
 			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
 		}
 		echo ('</th>');
 
-		echo ('<th width="100%" class="center" validn="middle" style="font-size:18pt;font-weight:bold;">' . get_numbering($topic_id) . $topic.'</th>');
+		echo ('<th width="100%" class="center" validn="middle" style="font-size:18pt;font-weight:bold;">' . get_numbering($topic_id) . $topic . '</th>');
 		echo ('<th width="32"><a href="/manual_toc.php"><img src="/images/help/contents.jpg" width="32" height="32" border="0"></a></th>');
 
 		echo ('</tr>');
@@ -86,11 +86,11 @@  discard block
 block discarded – undo
 		echo ('<tr>');
 		echo ('<td colspan="5">');
 		if (isset($previous_topic_id) && $previous_topic_id > 0)
-			echo ('<b>Previous:</b> <a href="/manual.php?'.$previous_topic_id.'">' . get_numbering($previous_topic_id) . $previous_topic.'</a>&nbsp;&nbsp;&nbsp;');
+			echo ('<b>Previous:</b> <a href="/manual.php?' . $previous_topic_id . '">' . get_numbering($previous_topic_id) . $previous_topic . '</a>&nbsp;&nbsp;&nbsp;');
 		if (isset($up_topic_id) && $up_topic_id > 0)
-			echo ('<b>Up:</b> <a href="/manual.php?'.$up_topic_id.'">' . get_numbering($up_topic_id) . $up_topic.'</a>&nbsp;&nbsp;&nbsp;');
+			echo ('<b>Up:</b> <a href="/manual.php?' . $up_topic_id . '">' . get_numbering($up_topic_id) . $up_topic . '</a>&nbsp;&nbsp;&nbsp;');
 		if (isset($next_topic_id) && $next_topic_id > 0)
-			echo ('<b>Next:</b> <a href="/manual.php?'.$next_topic_id.'">' . get_numbering($next_topic_id) . $next_topic.'</a>');
+			echo ('<b>Next:</b> <a href="/manual.php?' . $next_topic_id . '">' . get_numbering($next_topic_id) . $next_topic . '</a>');
 		echo ('</tr>');
 
 		echo ('</table>');
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
 	$db = MySqlDatabase::getInstance();
 
 	// get current entry
-	$db->query('SELECT * FROM manual WHERE topic_id = '.$topic_id);
+	$db->query('SELECT * FROM manual WHERE topic_id = ' . $topic_id);
 	if ($db->nextRecord()) {
 		$parent_topic_id = $db->getInt('parent_topic_id');
 		$order_id = $db->getInt('order_id');
@@ -111,8 +111,8 @@  discard block
 block discarded – undo
 		$text = stripslashes($db->getField('text'));
 
 		echo ('<div id="help_content">');
-		echo ('<h1>' . get_numbering($topic_id) . $topic.'</h1>');
-		echo ('<p>'.$text.'<p>');
+		echo ('<h1>' . get_numbering($topic_id) . $topic . '</h1>');
+		echo ('<p>' . $text . '<p>');
 		echo ('</div>');
 	} else
 		echo ('Invalid Topic!');
@@ -121,9 +121,9 @@  discard block
 block discarded – undo
 function echo_subsection($topic_id) {
 	// database object
 	$db = MySqlDatabase::getInstance();
-	$return='';
+	$return = '';
 	// check if there are subsections
-	$db->query('SELECT * FROM manual WHERE parent_topic_id = '.$db->escapeNumber($topic_id).' ORDER BY order_id');
+	$db->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db->escapeNumber($topic_id) . ' ORDER BY order_id');
 	if ($db->getNumRows()) {
 		echo ('<hr noshade width="75%" size="1" class="center"/>');
 		echo ('<div id="help_menu">');
@@ -137,19 +137,19 @@  discard block
 block discarded – undo
 }
 
 function echo_menu($topic_id) {
-	$return='';
+	$return = '';
 	// database object
 	$db = MySqlDatabase::getInstance();
 
-	$db->query('SELECT * FROM manual WHERE parent_topic_id = '.$db->escapeNumber($topic_id).' ORDER BY order_id');
+	$db->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db->escapeNumber($topic_id) . ' ORDER BY order_id');
 	if ($db->getNumRows()) {
 		echo ('<ul type="disc">');
-		while($db->nextRecord()) {
+		while ($db->nextRecord()) {
 			$sub_topic_id = $db->getInt('topic_id');
 			$order_id = $db->getInt('order_id');
 			$sub_topic = stripslashes($db->getField('topic'));
 
-			echo ('<li><a href="/manual.php?'.$sub_topic_id.'">' . get_numbering($sub_topic_id) . $sub_topic.'</a></li>');
+			echo ('<li><a href="/manual.php?' . $sub_topic_id . '">' . get_numbering($sub_topic_id) . $sub_topic . '</a></li>');
 			echo_menu($sub_topic_id);
 		}
 		echo ('</ul>');
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
 function get_numbering($topic_id) {
 	$db = MySqlDatabase::getInstance();
 
-	$db->query('SELECT * FROM manual WHERE topic_id = '.$db->escapeNumber($topic_id));
+	$db->query('SELECT * FROM manual WHERE topic_id = ' . $db->escapeNumber($topic_id));
 	if ($db->nextRecord()) {
 		$up_topic_id = $db->getInt('parent_topic_id');
 		$order_id = $db->getInt('order_id');

Please login to merge, or discard this patch.

lib/Default/MySqlDatabase.class.php 1 patch

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

@@ -38,7 +38,7 @@
 block discarded – undo
 	}
 
 	public static function mysqliFactory(MySqlProperties $mysqlProperties): mysqli {
-		if (!mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT)) {
+		if (!mysqli_report(MYSQLI_REPORT_ERROR|MYSQLI_REPORT_STRICT)) {
 			throw new RuntimeException('Failed to enable mysqli error reporting');
 		}
 		$mysql = new mysqli(

Please login to merge, or discard this patch.

		@@ -7,7 +7,7 @@ discard block
		block discarded – undo
7	7	$db3 = MySqlDatabase::getInstance();
8	8
9	9	// get current entry
10		- $db->query('SELECT * FROM manual WHERE topic_id = '.$db->escapeNumber($topic_id));
	10	+ $db->query('SELECT * FROM manual WHERE topic_id = ' . $db->escapeNumber($topic_id));
11	11	if ($db->nextRecord()) {
12	12	$parent_topic_id = $db->getInt('parent_topic_id');
13	13	$order_id = $db->getInt('order_id');
		@@ -19,17 +19,17 @@ discard block
		block discarded – undo
19	19	// **************************
20	20	// ** PREVIOUS
21	21	// **************************
22		- $db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id - 1));
	22	+ $db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($parent_topic_id) . ' AND order_id = ' . $db2->escapeNumber($order_id - 1));
23	23
24	24	// no result?
25	25	if (!$db2->getNumRows())
26		- $db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id));
	26	+ $db2->query('SELECT * FROM manual WHERE topic_id = ' . $db2->escapeNumber($parent_topic_id));
27	27
28	28	echo ('<th width="32">');
29	29	if ($db2->nextRecord()) {
30	30	$previous_topic_id = $db2->getInt('topic_id');
31	31	$previous_topic = stripslashes($db2->getField('topic'));
32		- echo ('<a href="/manual.php?'.$previous_topic_id.'"><img src="/images/help/previous.jpg" width="32" height="32" border="0"></a>');
	32	+ echo ('<a href="/manual.php?' . $previous_topic_id . '"><img src="/images/help/previous.jpg" width="32" height="32" border="0"></a>');
33	33	} else
34	34	echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
35	35	echo ('</th>');
		@@ -37,12 +37,12 @@ discard block
		block discarded – undo
37	37	// **************************
38	38	// ** UP
39	39	// **************************
40		- $db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id));
	40	+ $db2->query('SELECT * FROM manual WHERE topic_id = ' . $db2->escapeNumber($parent_topic_id));
41	41	echo ('<th width="32">');
42	42	if ($db2->nextRecord()) {
43	43	$up_topic_id = $db2->getInt('topic_id');
44	44	$up_topic = stripslashes($db2->getField('topic'));
45		- echo ('<a href="/manual.php?'.$up_topic_id.'"><img src="/images/help/up.jpg" width="32" height="32" border="0"></a>');
	45	+ echo ('<a href="/manual.php?' . $up_topic_id . '"><img src="/images/help/up.jpg" width="32" height="32" border="0"></a>');
46	46	} else
47	47	echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
48	48	echo ('</th>');
		@@ -50,35 +50,35 @@ discard block
		block discarded – undo
50	50	// **************************
51	51	// ** NEXT
52	52	// **************************
53		- $db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($topic_id).' AND order_id = 1');
	53	+ $db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($topic_id) . ' AND order_id = 1');
54	54
55	55	if (!$db2->getNumRows())
56		- $db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id + 1));
	56	+ $db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($parent_topic_id) . ' AND order_id = ' . $db2->escapeNumber($order_id + 1));
57	57
58	58	$seenParentIDs = array(0);
59	59	$curr_parent_topic_id = $parent_topic_id;
60	60	while (!$db2->getNumRows() && !in_array($curr_parent_topic_id, $seenParentIDs)) {
61	61	$seenParentIDs[] = $curr_parent_topic_id;
62		- $db3->query('SELECT * FROM manual WHERE topic_id = '.$db3->escapeNumber($parent_topic_id));
	62	+ $db3->query('SELECT * FROM manual WHERE topic_id = ' . $db3->escapeNumber($parent_topic_id));
63	63	$db3->nextRecord();
64	64	$curr_order_id = $db3->getInt('order_id');
65	65	$curr_parent_topic_id = $db3->getInt('parent_topic_id');
66	66
67		- $db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($curr_order_id + 1));
	67	+ $db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($parent_topic_id) . ' AND order_id = ' . $db2->escapeNumber($curr_order_id + 1));
68	68	}
69	69
70	70	echo ('<th width="32">');
71	71	if ($db2->nextRecord()) {
72	72	$next_topic_id = $db2->getInt('topic_id');
73	73	$next_topic = stripslashes($db2->getField('topic'));
74		- echo ('<a href="/manual.php?'.$next_topic_id.'"><img src="/images/help/next.jpg" width="32" height="32" border="0"></a>');
	74	+ echo ('<a href="/manual.php?' . $next_topic_id . '"><img src="/images/help/next.jpg" width="32" height="32" border="0"></a>');
75	75	}
76	76	else {
77	77	echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
78	78	}
79	79	echo ('</th>');
80	80
81		- echo ('<th width="100%" class="center" validn="middle" style="font-size:18pt;font-weight:bold;">' . get_numbering($topic_id) . $topic.'</th>');
	81	+ echo ('<th width="100%" class="center" validn="middle" style="font-size:18pt;font-weight:bold;">' . get_numbering($topic_id) . $topic . '</th>');
82	82	echo ('<th width="32"><a href="/manual_toc.php"><img src="/images/help/contents.jpg" width="32" height="32" border="0"></a></th>');
83	83
84	84	echo ('</tr>');
		@@ -86,11 +86,11 @@ discard block
		block discarded – undo
86	86	echo ('<tr>');
87	87	echo ('<td colspan="5">');
88	88	if (isset($previous_topic_id) && $previous_topic_id > 0)
89		- echo ('<b>Previous:</b> <a href="/manual.php?'.$previous_topic_id.'">' . get_numbering($previous_topic_id) . $previous_topic.'</a>   ');
	89	+ echo ('<b>Previous:</b> <a href="/manual.php?' . $previous_topic_id . '">' . get_numbering($previous_topic_id) . $previous_topic . '</a>   ');
90	90	if (isset($up_topic_id) && $up_topic_id > 0)
91		- echo ('<b>Up:</b> <a href="/manual.php?'.$up_topic_id.'">' . get_numbering($up_topic_id) . $up_topic.'</a>   ');
	91	+ echo ('<b>Up:</b> <a href="/manual.php?' . $up_topic_id . '">' . get_numbering($up_topic_id) . $up_topic . '</a>   ');
92	92	if (isset($next_topic_id) && $next_topic_id > 0)
93		- echo ('<b>Next:</b> <a href="/manual.php?'.$next_topic_id.'">' . get_numbering($next_topic_id) . $next_topic.'</a>');
	93	+ echo ('<b>Next:</b> <a href="/manual.php?' . $next_topic_id . '">' . get_numbering($next_topic_id) . $next_topic . '</a>');
94	94	echo ('</tr>');
95	95
96	96	echo ('</table>');
		@@ -103,7 +103,7 @@ discard block
		block discarded – undo
103	103	$db = MySqlDatabase::getInstance();
104	104
105	105	// get current entry
106		- $db->query('SELECT * FROM manual WHERE topic_id = '.$topic_id);
	106	+ $db->query('SELECT * FROM manual WHERE topic_id = ' . $topic_id);
107	107	if ($db->nextRecord()) {
108	108	$parent_topic_id = $db->getInt('parent_topic_id');
109	109	$order_id = $db->getInt('order_id');
		@@ -111,8 +111,8 @@ discard block
		block discarded – undo
111	111	$text = stripslashes($db->getField('text'));
112	112
113	113	echo ('<div id="help_content">');
114		- echo ('<h1>' . get_numbering($topic_id) . $topic.'</h1>');
115		- echo ('<p>'.$text.'<p>');
	114	+ echo ('<h1>' . get_numbering($topic_id) . $topic . '</h1>');
	115	+ echo ('<p>' . $text . '<p>');
116	116	echo ('</div>');
117	117	} else
118	118	echo ('Invalid Topic!');
		@@ -121,9 +121,9 @@ discard block
		block discarded – undo
121	121	function echo_subsection($topic_id) {
122	122	// database object
123	123	$db = MySqlDatabase::getInstance();
124		- $return='';
	124	+ $return = '';
125	125	// check if there are subsections
126		- $db->query('SELECT * FROM manual WHERE parent_topic_id = '.$db->escapeNumber($topic_id).' ORDER BY order_id');
	126	+ $db->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db->escapeNumber($topic_id) . ' ORDER BY order_id');
127	127	if ($db->getNumRows()) {
128	128	echo ('<hr noshade width="75%" size="1" class="center"/>');
129	129	echo ('<div id="help_menu">');
		@@ -137,19 +137,19 @@ discard block
		block discarded – undo
137	137	}
138	138
139	139	function echo_menu($topic_id) {
140		- $return='';
	140	+ $return = '';
141	141	// database object
142	142	$db = MySqlDatabase::getInstance();
143	143
144		- $db->query('SELECT * FROM manual WHERE parent_topic_id = '.$db->escapeNumber($topic_id).' ORDER BY order_id');
	144	+ $db->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db->escapeNumber($topic_id) . ' ORDER BY order_id');
145	145	if ($db->getNumRows()) {
146	146	echo ('<ul type="disc">');
147		- while($db->nextRecord()) {
	147	+ while ($db->nextRecord()) {
148	148	$sub_topic_id = $db->getInt('topic_id');
149	149	$order_id = $db->getInt('order_id');
150	150	$sub_topic = stripslashes($db->getField('topic'));
151	151
152		- echo ('<li><a href="/manual.php?'.$sub_topic_id.'">' . get_numbering($sub_topic_id) . $sub_topic.'</a></li>');
	152	+ echo ('<li><a href="/manual.php?' . $sub_topic_id . '">' . get_numbering($sub_topic_id) . $sub_topic . '</a></li>');
153	153	echo_menu($sub_topic_id);
154	154	}
155	155	echo ('</ul>');
		@@ -160,7 +160,7 @@ discard block
		block discarded – undo
160	160	function get_numbering($topic_id) {
161	161	$db = MySqlDatabase::getInstance();
162	162
163		- $db->query('SELECT * FROM manual WHERE topic_id = '.$db->escapeNumber($topic_id));
	163	+ $db->query('SELECT * FROM manual WHERE topic_id = ' . $db->escapeNumber($topic_id));
164	164	if ($db->nextRecord()) {
165	165	$up_topic_id = $db->getInt('parent_topic_id');
166	166	$order_id = $db->getInt('order_id');

Scrutinizer GitHub App not installed

Pull Request — master (#951)

Status

Category

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

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

		@@ -38,7 +38,7 @@
		block discarded – undo
38	38	}
39	39
40	40	public static function mysqliFactory(MySqlProperties $mysqlProperties): mysqli {
41		- if (!mysqli_report(MYSQLI_REPORT_ERROR \| MYSQLI_REPORT_STRICT)) {
	41	+ if (!mysqli_report(MYSQLI_REPORT_ERROR\|MYSQLI_REPORT_STRICT)) {
42	42	throw new RuntimeException('Failed to enable mysqli error reporting');
43	43	}
44	44	$mysql = new mysqli(

smrealms / smr

Scrutinizer GitHub App not installed

Pull Request — master (#951)

Status

Category

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

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