Merge pull request #25 from eflorea/php-7_2-count-function-bugfix

PHP 7.2 bug fix for `count()` function
eflorea · May 10, 2018 · 580e3ef · 580e3ef
2 parents 34ba681 + 5d0668b
commit 580e3ef
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 58 deletions.
diff --git a/src/RPC/Db/Table/Adapter/MSSQL.php b/src/RPC/Db/Table/Adapter/MSSQL.php
@@ -107,7 +107,7 @@ public function get()
 
 		if( ! isset( $args[0] ) )
 		{
-			return null;
+			return [];
 		}
 
 		$condition_values = array();
@@ -161,12 +161,7 @@ public function get()
 			$res = $this->getDb()->query( $sql );
 		}
 
-		if( count( $res ) )
-		{
-			return $res[0];
-		}
-
-		return null;
+		return $res ? $res[0] : [];
 	}
 
 
@@ -178,12 +173,8 @@ public function getAll()
 		{
 			$sql = 'select top 1000 * from "' . $this->getName() . '"';
 			$res = $this->getDb()->query( $sql );
-			if( count( $res ) )
-			{
-				return $res;
-			}
 
-			return null;
+			return $res ?: [];
 		}
 
 		$condition_values = array();
@@ -237,12 +228,7 @@ public function getAll()
 			$res = $this->getDb()->query( $sql );
 		}
 
-		if( count( $res ) )
-		{
-			return $res;
-		}
-
-		return null;
+		return $res ?: [];
 	}
 
 
@@ -306,12 +292,7 @@ public function getBySql()
 			$res = $this->getDb()->query( $sql );
 		}
 
-		if( count( $res ) )
-		{
-			return $res;
-		}
-
-		return null;
+		return $res ?: [];
 	}
 
 
@@ -377,7 +358,7 @@ public function find()
 			$res = $this->getDb()->query( $sql );
 		}
 
-		if( count( $res ) )
+		if( $res )
 		{
 			$row = $res[0];
 
@@ -466,7 +447,7 @@ public function findAll()
 
 
 
-		if( count( $res ) )
+		if( $res )
 		{
 			$fields = $this->getFields();
 
@@ -493,7 +474,7 @@ public function findAll()
 			return $output;
 		}
 
-		return null;
+		return [];
 	}
 
 	public function findBySql()
@@ -558,7 +539,7 @@ public function findBySql()
 			$res = $this->getDb()->query( $sql );
 		}
 
-		if( count( $res ) )
+		if( $res )
 		{
 			$output = array();
 
@@ -583,7 +564,7 @@ public function findBySql()
 			return $output;
 		}
 
-		return null;
+		return [];
 	}
 
 

diff --git a/src/RPC/Db/Table/Adapter/MySQL.php b/src/RPC/Db/Table/Adapter/MySQL.php
@@ -108,7 +108,7 @@ public function get()
 
 		if( ! isset( $args[0] ) )
 		{
-			return null;
+			return [];
 		}
 
 		$condition_values = array();
@@ -162,12 +162,7 @@ public function get()
 			$res = $this->getDb()->query( $sql );
 		}
 
-		if( count( $res ) )
-		{
-			return $res[0];
-		}
-
-		return null;
+		return $res ? $res[0] : [];
 	}
 
 
@@ -179,12 +174,8 @@ public function getAll()
 		{
 			$sql = "select * from `" . $this->getName() . "` limit 1000";
 			$res = $this->getDb()->query( $sql );
-			if( count( $res ) )
-			{
-				return $res;
-			}
 
-			return null;
+			return $res ?: [];
 		}
 
 		$condition_values = array();
@@ -238,12 +229,7 @@ public function getAll()
 			$res = $this->getDb()->query( $sql );
 		}
 
-		if( count( $res ) )
-		{
-			return $res;
-		}
-
-		return null;
+		return $res ?: [];
 	}
 
 
@@ -307,12 +293,7 @@ public function getBySql()
 			$res = $this->getDb()->query( $sql );
 		}
 
-		if( count( $res ) )
-		{
-			return $res;
-		}
-
-		return null;
+		return $res ?: [];
 	}
 
 
@@ -378,7 +359,7 @@ public function find()
 			$res = $this->getDb()->query( $sql );
 		}
 
-		if( count( $res ) )
+		if( $res )
 		{
 			$row = $res[0];
 
@@ -467,7 +448,7 @@ public function findAll()
 
 
 
-		if( count( $res ) )
+		if( $res )
 		{
 			$fields = $this->getFields();
 
@@ -494,7 +475,7 @@ public function findAll()
 			return $output;
 		}
 
-		return null;
+		return [];
 	}
 
 	public function findBySql()
@@ -559,7 +540,7 @@ public function findBySql()
 			$res = $this->getDb()->query( $sql );
 		}
 
-		if( count( $res ) )
+		if( $res )
 		{
 			$output = array();
 
@@ -584,7 +565,7 @@ public function findBySql()
 			return $output;
 		}
 
-		return null;
+		return [];
 	}