From f8fbe3793680af1dae2db2829cfc84068831c52f Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Wed, 28 Jun 2017 00:58:03 +0700
Subject: [ticket/14972] replace all occurrences of sizeof() with the count()

PHPBB3-14972
---
 phpBB/phpbb/files/filespec.php    | 6 +++---
 phpBB/phpbb/files/types/form.php  | 2 +-
 phpBB/phpbb/files/types/local.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/phpbb/files')

diff --git a/phpBB/phpbb/files/filespec.php b/phpBB/phpbb/files/filespec.php
index f1a32ef4a8..6847bca4cb 100644
--- a/phpBB/phpbb/files/filespec.php
+++ b/phpBB/phpbb/files/filespec.php
@@ -121,7 +121,7 @@ class filespec
 	 */
 	public function set_upload_ary($upload_ary)
 	{
-		if (!isset($upload_ary) || !sizeof($upload_ary))
+		if (!isset($upload_ary) || !count($upload_ary))
 		{
 			return $this;
 		}
@@ -403,7 +403,7 @@ class filespec
 	 */
 	public function move_file($destination, $overwrite = false, $skip_image_check = false, $chmod = false)
 	{
-		if (sizeof($this->error))
+		if (count($this->error))
 		{
 			return false;
 		}
@@ -478,7 +478,7 @@ class filespec
 			// Remove temporary filename
 			@unlink($this->filename);
 
-			if (sizeof($this->error))
+			if (count($this->error))
 			{
 				return false;
 			}
diff --git a/phpBB/phpbb/files/types/form.php b/phpBB/phpbb/files/types/form.php
index 832f090c47..2c3beb6e02 100644
--- a/phpBB/phpbb/files/types/form.php
+++ b/phpBB/phpbb/files/types/form.php
@@ -119,7 +119,7 @@ class form extends base
 
 		// PHP Upload file size check
 		$file = $this->check_upload_size($file);
-		if (sizeof($file->error))
+		if (count($file->error))
 		{
 			return $file;
 		}
diff --git a/phpBB/phpbb/files/types/local.php b/phpBB/phpbb/files/types/local.php
index 7e9210b196..4dfe4f7506 100644
--- a/phpBB/phpbb/files/types/local.php
+++ b/phpBB/phpbb/files/types/local.php
@@ -86,7 +86,7 @@ class local extends base
 
 		// PHP Upload file size check
 		$file = $this->check_upload_size($file);
-		if (sizeof($file->error))
+		if (count($file->error))
 		{
 			return $file;
 		}
-- 
cgit v1.2.1


From 83f4074116e646507bbb448f745e0d9b356aa593 Mon Sep 17 00:00:00 2001
From: kasimi <mail@kasimi.net>
Date: Wed, 12 Dec 2018 12:34:16 +0100
Subject: [ticket/15910] Pass object arguments by reference implicitly

PHPBB3-15910
---
 phpBB/phpbb/files/upload.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/phpbb/files')

diff --git a/phpBB/phpbb/files/upload.php b/phpBB/phpbb/files/upload.php
index a9bf74094d..50e15c9844 100644
--- a/phpBB/phpbb/files/upload.php
+++ b/phpBB/phpbb/files/upload.php
@@ -261,7 +261,7 @@ class upload
 	 *
 	 * @param filespec $file Instance of filespec class
 	 */
-	public function common_checks(&$file)
+	public function common_checks($file)
 	{
 		// Filesize is too big or it's 0 if it was larger than the maxsize in the upload form
 		if ($this->max_filesize && ($file->get('filesize') > $this->max_filesize || $file->get('filesize') == 0))
@@ -297,7 +297,7 @@ class upload
 	 *
 	 * @return bool True if extension is allowed, false if not
 	 */
-	public function valid_extension(&$file)
+	public function valid_extension($file)
 	{
 		return (in_array($file->get('extension'), $this->allowed_extensions)) ? true : false;
 	}
@@ -310,7 +310,7 @@ class upload
 	 * @return bool True if dimensions are valid or no constraints set, false
 	 *			if not
 	 */
-	public function valid_dimensions(&$file)
+	public function valid_dimensions($file)
 	{
 		if (!$this->max_width && !$this->max_height && !$this->min_width && !$this->min_height)
 		{
@@ -350,7 +350,7 @@ class upload
 	 *
 	 * @return bool True if content is valid, false if not
 	 */
-	public function valid_content(&$file)
+	public function valid_content($file)
 	{
 		return ($file->check_content($this->disallowed_content));
 	}
-- 
cgit v1.2.1