various improvements

detain · detain · commit 78dea7e201c8 · 2017-07-20T05:43:13.000Z
diff --git a/src/Adodb/Db.php b/src/Adodb/Db.php
@@ -689,8 +689,7 @@ public function table_names() {
 		 * @return array
 		 */
 		public function index_names() {
-			$return = [];
-			return $return;
+			return [];
 		}
 
 		/**
diff --git a/src/Generic.php b/src/Generic.php
@@ -159,8 +159,7 @@ public function haltmsg($msg) {
 	 * @return array
 	 */
 	public function index_names() {
-		$return = [];
-		return $return;
+		return [];
 	}
 
 }
diff --git a/src/Loader.php b/src/Loader.php
@@ -188,8 +188,7 @@ public function haltmsg($msg) {
 	 * @return array
 	 */
 	public function index_names() {
-		$return = [];
-		return $return;
+		return [];
 	}
 
 }
diff --git a/src/Mdb2/Db.php b/src/Mdb2/Db.php
@@ -817,7 +817,7 @@ public function haltmsg($msg, $line = '', $file = '') {
 			if(isset($backtrace[$level] ['args']))
 				for($argument = 0, $argumentMax = count($backtrace[$level]['args']); $argument < $argumentMax; $argument++)
 					$message .= ($argument > 0 ? ', ' : '').
-						(gettype($backtrace[$level]['args'][$argument]) == 'object' ? 'class '.get_class($backtrace[$level]['args'][$argument]) : myadmin_stringify($backtrace[$level]['args'][$argument]));
+						(is_object($backtrace[$level]['args'][$argument]) ? 'class '.get_class($backtrace[$level]['args'][$argument]) : myadmin_stringify($backtrace[$level]['args'][$argument]));
 			$message.=')';
 			$this->log($message);
 		}
@@ -848,8 +848,7 @@ public function table_names() {
 	 * @return array
 	 */
 	public function index_names() {
-		$return = [];
-		return $return;
+		return [];
 	}
 
 	/**
diff --git a/src/Mysql/Db.php b/src/Mysql/Db.php
@@ -737,8 +737,7 @@ public function table_names() {
 		 * @return array
 		 */
 		public function index_names() {
-			$return = [];
-			return $return;
+			return [];
 		}
 
 		/**
diff --git a/src/Mysqli/Db.php b/src/Mysqli/Db.php
@@ -803,7 +803,7 @@ public function haltmsg($msg, $line = '', $file = '') {
 			if(isset($backtrace[$level] ['args']))
 				for($argument = 0, $argumentMax = count($backtrace[$level]['args']); $argument < $argumentMax; $argument++)
 					$message .= ($argument > 0 ? ', ' : '').
-						(gettype($backtrace[$level]['args'][$argument]) == 'object' ? 'class '.get_class($backtrace[$level]['args'][$argument]) : myadmin_stringify($backtrace[$level]['args'][$argument]));
+						(is_object($backtrace[$level]['args'][$argument]) ? 'class '.get_class($backtrace[$level]['args'][$argument]) : myadmin_stringify($backtrace[$level]['args'][$argument]));
 			$message.=')';
 			$this->log($message);
 		}
@@ -834,8 +834,7 @@ public function table_names() {
 	 * @return array
 	 */
 	public function index_names() {
-		$return = [];
-		return $return;
+		return [];
 	}
 
 	/**
diff --git a/src/Pdo/Db.php b/src/Pdo/Db.php
@@ -723,8 +723,7 @@ public function table_names() {
 		 * @return array
 		 */
 		public function index_names() {
-			$return = [];
-			return $return;
+			return [];
 		}
 
 		/**
diff --git a/src/Pgsql/Db.php b/src/Pgsql/Db.php
@@ -689,7 +689,7 @@ public function haltmsg($msg, $line = '', $file = '') {
 				if(isset($backtrace[$level] ['args']))
 					for($argument = 0, $argumentMax = count($backtrace[$level]['args']); $argument < $argumentMax; $argument++)
 						$message .= ($argument > 0 ? ', ' : '').
-									(gettype($backtrace[$level]['args'][$argument]) == 'object' ? 'class '.get_class($backtrace[$level]['args'][$argument]) : myadmin_stringify($backtrace[$level]['args'][$argument]));
+									(is_object($backtrace[$level]['args'][$argument]) ? 'class '.get_class($backtrace[$level]['args'][$argument]) : myadmin_stringify($backtrace[$level]['args'][$argument]));
 				$message.=')';
 				$this->log($message);
 			}

Original file line number	Diff line number	Diff line change
`@@ -689,8 +689,7 @@ public function table_names() {`
`689`	`689`	`* @return array`
`690`	`690`	`*/`
`691`	`691`	`public function index_names() {`
`692`		`- $return = [];`
`693`		`- return $return;`
	`692`	`+ return [];`
`694`	`693`	`}`
`695`	`694`
`696`	`695`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -159,8 +159,7 @@ public function haltmsg($msg) {`
`159`	`159`	`* @return array`
`160`	`160`	`*/`
`161`	`161`	`public function index_names() {`
`162`		`- $return = [];`
`163`		`- return $return;`
	`162`	`+ return [];`
`164`	`163`	`}`
`165`	`164`
`166`	`165`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,8 +188,7 @@ public function haltmsg($msg) {`
`188`	`188`	`* @return array`
`189`	`189`	`*/`
`190`	`190`	`public function index_names() {`
`191`		`- $return = [];`
`192`		`- return $return;`
	`191`	`+ return [];`
`193`	`192`	`}`
`194`	`193`
`195`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -737,8 +737,7 @@ public function table_names() {`
`737`	`737`	`* @return array`
`738`	`738`	`*/`
`739`	`739`	`public function index_names() {`
`740`		`- $return = [];`
`741`		`- return $return;`
	`740`	`+ return [];`
`742`	`741`	`}`
`743`	`742`
`744`	`743`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -723,8 +723,7 @@ public function table_names() {`
`723`	`723`	`* @return array`
`724`	`724`	`*/`
`725`	`725`	`public function index_names() {`
`726`		`- $return = [];`
`727`		`- return $return;`
	`726`	`+ return [];`
`728`	`727`	`}`
`729`	`728`
`730`	`729`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -689,7 +689,7 @@ public function haltmsg($msg, $line = '', $file = '') {`
`689`	`689`	`if(isset($backtrace[$level] ['args']))`
`690`	`690`	`for($argument = 0, $argumentMax = count($backtrace[$level]['args']); $argument < $argumentMax; $argument++)`
`691`	`691`	`$message .= ($argument > 0 ? ', ' : '').`
`692`		`- (gettype($backtrace[$level]['args'][$argument]) == 'object' ? 'class '.get_class($backtrace[$level]['args'][$argument]) : myadmin_stringify($backtrace[$level]['args'][$argument]));`
	`692`	`+ (is_object($backtrace[$level]['args'][$argument]) ? 'class '.get_class($backtrace[$level]['args'][$argument]) : myadmin_stringify($backtrace[$level]['args'][$argument]));`
`693`	`693`	`$message.=')';`
`694`	`694`	`$this->log($message);`
`695`	`695`	`}`