Inspection of "fix" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 99c8e1...1eb6f5 )

by Yannick

created 2017-07-07 19:05 UTC

Status

Braces +86 added lines, -33 removed lines patch added patch discarded remove patch

@@ -73,8 +73,11 @@  discard block
 block discarded – undo
 				$globalDBSname = $globalDBname;
 				$globalDBSuser = $globalDBuser;
 				$globalDBSpass = $globalDBpass;
-				if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') $globalDBSport = 3306;
-				else $globalDBSport = $globalDBport;
+				if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') {
+					$globalDBSport = 3306;
+				} else {
+					$globalDBSport = $globalDBport;
+				}
 			} else {
 				$DBname = 'default';
 				$globalDBSdriver = $globalDBdriver;
@@ -82,8 +85,11 @@  discard block
 block discarded – undo
 				$globalDBSname = $globalDBname;
 				$globalDBSuser = $user;
 				$globalDBSpass = $pass;
-				if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') $globalDBSport = 3306;
-				else $globalDBSport = $globalDBport;
+				if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') {
+					$globalDBSport = 3306;
+				} else {
+					$globalDBSport = $globalDBport;
+				}
 			}
 		} else {
 			$globalDBSdriver = $globalDB[$DBname]['driver'];
@@ -91,12 +97,19 @@  discard block
 block discarded – undo
 			$globalDBSname = $globalDB[$DBname]['name'];
 			$globalDBSuser = $globalDB[$DBname]['user'];
 			$globalDBSpass = $globalDB[$DBname]['pass'];
-			if (isset($globalDB[$DBname]['port'])) $globalDBSport = $globalDB[$DBname]['port'];
-			else $globalDBSport = 3306;
+			if (isset($globalDB[$DBname]['port'])) {
+				$globalDBSport = $globalDB[$DBname]['port'];
+			} else {
+				$globalDBSport = 3306;
+			}
+		}
+		if ($globalDBSname == '' || $globalDBSuser == '') {
+			return false;
 		}
-		if ($globalDBSname == '' || $globalDBSuser == '') return false;
 		// Set number of try to connect to DB
-		if (!isset($globalDBretry) || $globalDBretry == '' || $globalDBretry === NULL) $globalDBretry = 5;
+		if (!isset($globalDBretry) || $globalDBretry == '' || $globalDBretry === NULL) {
+			$globalDBretry = 5;
+		}
 		$i = 0;
 		while (true) {
 			try {
@@ -105,10 +118,16 @@  discard block
 block discarded – undo
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					if (!isset($globalDBTimeOut)) {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500);
+					} else {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
+					}
+					if (!isset($globalDBPersistent)) {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
+					} else {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					}
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
 					// Workaround against "ONLY_FULL_GROUP_BY" mode
@@ -122,24 +141,36 @@  discard block
 block discarded – undo
 					//$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					if (!isset($globalDBTimeOut)) {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200);
+					} else {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
+					}
+					if (!isset($globalDBPersistent)) {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
+					} else {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					}
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 					$this->dbs[$DBname]->exec('SET timezone="UTC"');
 				}
 				break;
 			} catch(PDOException $e) {
 				$i++;
-				if (isset($globalDebug) && $globalDebug) echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n";
+				if (isset($globalDebug) && $globalDebug) {
+					echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n";
+				}
 				//exit;
-				if ($i > $globalDBretry) return false;
+				if ($i > $globalDBretry) {
+					return false;
+				}
 				//return false;
 			}
 			sleep(2);
 		}
-		if ($DBname === 'default') $this->db = $this->dbs['default'];
+		if ($DBname === 'default') {
+			$this->db = $this->dbs['default'];
+		}
 		return true;
 	}
 
@@ -151,7 +182,9 @@  discard block
 block discarded – undo
 		} else {
 			$query = "SELECT * FROM pg_catalog.pg_tables WHERE tablename = '".$table."'";
 		}
-		if ($this->db == NULL) return false;
+		if ($this->db == NULL) {
+			return false;
+		}
 		try {
 			//$Connection = new Connection();
 			$results = $this->db->query($query);
@@ -160,22 +193,31 @@  discard block
 block discarded – undo
 		}
 		if($results->rowCount()>0) {
 		    return true; 
+		} else {
+			return false;
 		}
-		else return false;
 	}
 
 	public function connectionExists()
 	{
 		global $globalDBdriver, $globalDBCheckConnection, $globalNoDB;
-		if (isset($globalDBCheckConnection) && $globalDBCheckConnection === FALSE) return true;
-		if (isset($globalNoDB) && $globalNoDB === TRUE) return true;
+		if (isset($globalDBCheckConnection) && $globalDBCheckConnection === FALSE) {
+			return true;
+		}
+		if (isset($globalNoDB) && $globalNoDB === TRUE) {
+			return true;
+		}
 		$query = "SELECT 1 + 1";
-		if ($this->db === null) return false;
+		if ($this->db === null) {
+			return false;
+		}
 		try {
 			$sum = @$this->db->query($query);
 			if ($sum instanceof \PDOStatement) {
 				$sum = $sum->fetchColumn(0);
-			} else $sum = 0;
+			} else {
+				$sum = 0;
+			}
 			if (intval($sum) !== 2) {
 			     return false;
 			}
@@ -210,8 +252,9 @@  discard block
 block discarded – undo
 		$nb = $results->fetchAll(PDO::FETCH_ASSOC);
 		if($nb[0]['nb'] > 0) {
 			return true; 
+		} else {
+			return false;
 		}
-		else return false;
 	}
 
 	/*
@@ -261,9 +304,12 @@  discard block
 block discarded – undo
 			}
 			$result = $sth->fetch(PDO::FETCH_ASSOC);
 			$sth->closeCursor();
-			if ($result['nb'] > 0) return true;
-			else return false;
-/*		} else {
+			if ($result['nb'] > 0) {
+				return true;
+			} else {
+				return false;
+			}
+			/*		} else {
 			$query = "SELECT * FROM ".$table." LIMIT 0";
 			try {
 				$results = $this->db->query($query);
@@ -302,7 +348,9 @@  discard block
 block discarded – undo
 				$sth->closeCursor();
 				return $result['value'];
 			}
-		} else return $version;
+		} else {
+			return $version;
+		}
 	}
 	
 	/*
@@ -311,9 +359,14 @@  discard block
 block discarded – undo
 	*/
 	public function latest() {
 	    global $globalNoDB;
-	    if (isset($globalNoDB) && $globalNoDB === TRUE) return true;
-	    if ($this->check_schema_version() == $this->latest_schema) return true;
-	    else return false;
+	    if (isset($globalNoDB) && $globalNoDB === TRUE) {
+	    	return true;
+	    }
+	    if ($this->check_schema_version() == $this->latest_schema) {
+	    	return true;
+	    } else {
+	    	return false;
+	    }
 	}
 
 }

Please login to merge, or discard this patch.

		@@ -73,8 +73,11 @@ discard block
		block discarded – undo
73	73	$globalDBSname = $globalDBname;
74	74	$globalDBSuser = $globalDBuser;
75	75	$globalDBSpass = $globalDBpass;
76		- if (!isset($globalDBport) \|\| $globalDBport === NULL \|\| $globalDBport == '') $globalDBSport = 3306;
77		- else $globalDBSport = $globalDBport;
	76	+ if (!isset($globalDBport) \|\| $globalDBport === NULL \|\| $globalDBport == '') {
	77	+ $globalDBSport = 3306;
	78	+ } else {
	79	+ $globalDBSport = $globalDBport;
	80	+ }
78	81	} else {
79	82	$DBname = 'default';
80	83	$globalDBSdriver = $globalDBdriver;
		@@ -82,8 +85,11 @@ discard block
		block discarded – undo
82	85	$globalDBSname = $globalDBname;
83	86	$globalDBSuser = $user;
84	87	$globalDBSpass = $pass;
85		- if (!isset($globalDBport) \|\| $globalDBport === NULL \|\| $globalDBport == '') $globalDBSport = 3306;
86		- else $globalDBSport = $globalDBport;
	88	+ if (!isset($globalDBport) \|\| $globalDBport === NULL \|\| $globalDBport == '') {
	89	+ $globalDBSport = 3306;
	90	+ } else {
	91	+ $globalDBSport = $globalDBport;
	92	+ }
87	93	}
88	94	} else {
89	95	$globalDBSdriver = $globalDB[$DBname]['driver'];
		@@ -91,12 +97,19 @@ discard block
		block discarded – undo
91	97	$globalDBSname = $globalDB[$DBname]['name'];
92	98	$globalDBSuser = $globalDB[$DBname]['user'];
93	99	$globalDBSpass = $globalDB[$DBname]['pass'];
94		- if (isset($globalDB[$DBname]['port'])) $globalDBSport = $globalDB[$DBname]['port'];
95		- else $globalDBSport = 3306;
	100	+ if (isset($globalDB[$DBname]['port'])) {
	101	+ $globalDBSport = $globalDB[$DBname]['port'];
	102	+ } else {
	103	+ $globalDBSport = 3306;
	104	+ }
	105	+ }
	106	+ if ($globalDBSname == '' \|\| $globalDBSuser == '') {
	107	+ return false;
96	108	}
97		- if ($globalDBSname == '' \|\| $globalDBSuser == '') return false;
98	109	// Set number of try to connect to DB
99		- if (!isset($globalDBretry) \|\| $globalDBretry == '' \|\| $globalDBretry === NULL) $globalDBretry = 5;
	110	+ if (!isset($globalDBretry) \|\| $globalDBretry == '' \|\| $globalDBretry === NULL) {
	111	+ $globalDBretry = 5;
	112	+ }
100	113	$i = 0;
101	114	while (true) {
102	115	try {
		@@ -105,10 +118,16 @@ discard block
		block discarded – undo
105	118	$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
106	119	$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
107	120	$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
108		- if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500);
109		- else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
110		- if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
111		- else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
	121	+ if (!isset($globalDBTimeOut)) {
	122	+ $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500);
	123	+ } else {
	124	+ $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
	125	+ }
	126	+ if (!isset($globalDBPersistent)) {
	127	+ $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
	128	+ } else {
	129	+ $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
	130	+ }
112	131	$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
113	132	$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
114	133	// Workaround against "ONLY_FULL_GROUP_BY" mode
		@@ -122,24 +141,36 @@ discard block
		block discarded – undo
122	141	//$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
123	142	$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
124	143	$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
125		- if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200);
126		- else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
127		- if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
128		- else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
	144	+ if (!isset($globalDBTimeOut)) {
	145	+ $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200);
	146	+ } else {
	147	+ $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
	148	+ }
	149	+ if (!isset($globalDBPersistent)) {
	150	+ $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
	151	+ } else {
	152	+ $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
	153	+ }
129	154	$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
130	155	$this->dbs[$DBname]->exec('SET timezone="UTC"');
131	156	}
132	157	break;
133	158	} catch(PDOException $e) {
134	159	$i++;
135		- if (isset($globalDebug) && $globalDebug) echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n";
	160	+ if (isset($globalDebug) && $globalDebug) {
	161	+ echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n";
	162	+ }
136	163	//exit;
137		- if ($i > $globalDBretry) return false;
	164	+ if ($i > $globalDBretry) {
	165	+ return false;
	166	+ }
138	167	//return false;
139	168	}
140	169	sleep(2);
141	170	}
142		- if ($DBname === 'default') $this->db = $this->dbs['default'];
	171	+ if ($DBname === 'default') {
	172	+ $this->db = $this->dbs['default'];
	173	+ }
143	174	return true;
144	175	}
145	176
		@@ -151,7 +182,9 @@ discard block
		block discarded – undo
151	182	} else {
152	183	$query = "SELECT * FROM pg_catalog.pg_tables WHERE tablename = '".$table."'";
153	184	}
154		- if ($this->db == NULL) return false;
	185	+ if ($this->db == NULL) {
	186	+ return false;
	187	+ }
155	188	try {
156	189	//$Connection = new Connection();
157	190	$results = $this->db->query($query);
		@@ -160,22 +193,31 @@ discard block
		block discarded – undo
160	193	}
161	194	if($results->rowCount()>0) {
162	195	return true;
	196	+ } else {
	197	+ return false;
163	198	}
164		- else return false;
165	199	}
166	200
167	201	public function connectionExists()
168	202	{
169	203	global $globalDBdriver, $globalDBCheckConnection, $globalNoDB;
170		- if (isset($globalDBCheckConnection) && $globalDBCheckConnection === FALSE) return true;
171		- if (isset($globalNoDB) && $globalNoDB === TRUE) return true;
	204	+ if (isset($globalDBCheckConnection) && $globalDBCheckConnection === FALSE) {
	205	+ return true;
	206	+ }
	207	+ if (isset($globalNoDB) && $globalNoDB === TRUE) {
	208	+ return true;
	209	+ }
172	210	$query = "SELECT 1 + 1";
173		- if ($this->db === null) return false;
	211	+ if ($this->db === null) {
	212	+ return false;
	213	+ }
174	214	try {
175	215	$sum = @$this->db->query($query);
176	216	if ($sum instanceof \PDOStatement) {
177	217	$sum = $sum->fetchColumn(0);
178		- } else $sum = 0;
	218	+ } else {
	219	+ $sum = 0;
	220	+ }
179	221	if (intval($sum) !== 2) {
180	222	return false;
181	223	}
		@@ -210,8 +252,9 @@ discard block
		block discarded – undo
210	252	$nb = $results->fetchAll(PDO::FETCH_ASSOC);
211	253	if($nb[0]['nb'] > 0) {
212	254	return true;
	255	+ } else {
	256	+ return false;
213	257	}
214		- else return false;
215	258	}
216	259
217	260	/*
		@@ -261,9 +304,12 @@ discard block
		block discarded – undo
261	304	}
262	305	$result = $sth->fetch(PDO::FETCH_ASSOC);
263	306	$sth->closeCursor();
264		- if ($result['nb'] > 0) return true;
265		- else return false;
266		-/* } else {
	307	+ if ($result['nb'] > 0) {
	308	+ return true;
	309	+ } else {
	310	+ return false;
	311	+ }
	312	+ /* } else {
267	313	$query = "SELECT * FROM ".$table." LIMIT 0";
268	314	try {
269	315	$results = $this->db->query($query);
		@@ -302,7 +348,9 @@ discard block
		block discarded – undo
302	348	$sth->closeCursor();
303	349	return $result['value'];
304	350	}
305		- } else return $version;
	351	+ } else {
	352	+ return $version;
	353	+ }
306	354	}
307	355
308	356	/*
		@@ -311,9 +359,14 @@ discard block
		block discarded – undo
311	359	*/
312	360	public function latest() {
313	361	global $globalNoDB;
314		- if (isset($globalNoDB) && $globalNoDB === TRUE) return true;
315		- if ($this->check_schema_version() == $this->latest_schema) return true;
316		- else return false;
	362	+ if (isset($globalNoDB) && $globalNoDB === TRUE) {
	363	+ return true;
	364	+ }
	365	+ if ($this->check_schema_version() == $this->latest_schema) {
	366	+ return true;
	367	+ } else {
	368	+ return false;
	369	+ }
317	370	}
318	371
319	372	}

Ysurac / FlightAirMap

Push — master ( 99c8e1...1eb6f5 )

Status

Category

Braces +86 added lines, -33 removed lines patch added patch discarded remove patch