From 8c3808e9e7db09531154b2520cbfcc7529a5c752 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Mon, 9 Jan 2017 00:23:08 +0700
Subject: [ticket/14972] Fix sizeof calls

As of PHP 7.2, only arrays and objects implementing the Countable interface
should be passed as a count() or sizeof() parameter.
See https://github.com/php/php-src/blob/php-7.2.0alpha2/UPGRADING#L197-L198
Also, sizeof() seems to be sheduled for deprecation, see
https://wiki.php.net/rfc/deprecations_php_7_2#suggested_deprecations

PHPBB3-14972
---
 phpBB/phpbb/db/driver/driver.php | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'phpBB/phpbb/db/driver/driver.php')

diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php
index 214c5590e7..5851469806 100644
--- a/phpBB/phpbb/db/driver/driver.php
+++ b/phpBB/phpbb/db/driver/driver.php
@@ -537,7 +537,9 @@ abstract class driver implements driver_interface
 	*/
 	function sql_in_set($field, $array, $negate = false, $allow_empty_set = false)
 	{
-		if (!sizeof($array))
+		$array = (array) $array;
+
+		if (!count($array))
 		{
 			if (!$allow_empty_set)
 			{
@@ -559,12 +561,7 @@ abstract class driver implements driver_interface
 			}
 		}
 
-		if (!is_array($array))
-		{
-			$array = array($array);
-		}
-
-		if (sizeof($array) == 1)
+		if (count($array) == 1)
 		{
 			@reset($array);
 			$var = current($array);
@@ -632,7 +629,7 @@ abstract class driver implements driver_interface
 	*/
 	function sql_multi_insert($table, $sql_ary)
 	{
-		if (!sizeof($sql_ary))
+		if (!count($sql_ary))
 		{
 			return false;
 		}
@@ -738,7 +735,7 @@ abstract class driver implements driver_interface
 				// We run the following code to determine if we need to re-order the table array. ;)
 				// The reason for this is that for multi-aliased tables (two equal tables) in the FROM statement the last table need to match the first comparison.
 				// DBMS who rely on this: Oracle, PostgreSQL and MSSQL. For all other DBMS it makes absolutely no difference in which order the table is.
-				if (!empty($array['LEFT_JOIN']) && sizeof($array['FROM']) > 1 && $used_multi_alias !== false)
+				if (!empty($array['LEFT_JOIN']) && count($array['FROM']) > 1 && $used_multi_alias !== false)
 				{
 					// Take first LEFT JOIN
 					$join = current($array['LEFT_JOIN']);
@@ -848,7 +845,7 @@ abstract class driver implements driver_interface
 
 				default:
 
-					switch (sizeof($condition))
+					switch (count($condition))
 					{
 						case 3:
 
@@ -1138,7 +1135,7 @@ abstract class driver implements driver_interface
 				$html_table = func_get_arg(2);
 				$row = func_get_arg(3);
 
-				if (!$html_table && sizeof($row))
+				if (!$html_table && count($row))
 				{
 					$html_table = true;
 					$this->html_hold .= '<table cellspacing="1"><tr>';
-- 
cgit v1.2.1


From 4577404fc2a389b6c3294ae97aa285e838057f0f Mon Sep 17 00:00:00 2001
From: FH <FH3095@users.noreply.github.com>
Date: Sat, 3 Feb 2018 20:20:28 +0100
Subject: [ticket/15520] sql_build_query build subquery

Fix for the building of subqueries
in sql_build_query

PHPBB3-15520
---
 phpBB/phpbb/db/driver/driver.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'phpBB/phpbb/db/driver/driver.php')

diff --git a/phpBB/phpbb/db/driver/driver.php b/phpBB/phpbb/db/driver/driver.php
index 5851469806..a36ce8c0d7 100644
--- a/phpBB/phpbb/db/driver/driver.php
+++ b/phpBB/phpbb/db/driver/driver.php
@@ -903,9 +903,10 @@ abstract class driver implements driver_interface
 
 							// Subquery with {left hand} {operator} {compare kind} {SELECT Kind } {Sub Query}
 
-							$condition = $condition[self::LEFT_STMT] . ' ' . $condition[self::COMPARE_OP] . ' ' . $condition[self::SUBQUERY_OP] . ' ( ';
-							$condition .= $this->sql_build_query($condition[self::SUBQUERY_SELECT_TYPE], $condition[self::SUBQUERY_BUILD]);
-							$condition .= ' )';
+							$result = $condition[self::LEFT_STMT] . ' ' . $condition[self::COMPARE_OP] . ' ' . $condition[self::SUBQUERY_OP] . ' ( ';
+							$result .= $this->sql_build_query($condition[self::SUBQUERY_SELECT_TYPE], $condition[self::SUBQUERY_BUILD]);
+							$result .= ' )';
+							$condition = $result;
 
 						break;
 
-- 
cgit v1.2.1