From 4bdef6fd21a5dcab455b0cd1ee2652de606929c3 Mon Sep 17 00:00:00 2001
From: MateBartus <mate.bartus@gmail.com>
Date: Thu, 12 Mar 2015 00:25:00 +0100
Subject: [ticket/13697] Moving filesystem related functions to filesystem
 service

 * Moving filesystem service to \phpbb\filesystem namespace
 * Wraping Symfony's Filesystem component
 * Moving filesystem related functions from includes/functions.php
   into \phpbb\filesystem\filesystem
   Functions moved (and deprecated):
     - phpbb_chmod
     - phpbb_is_writable
     - phpbb_is_absolute
     - phpbb_own_realpath
     - phpbb_realpath
 * Adding interface for filesystem service

PHPBB3-13697
---
 tests/upload/filespec_test.php   |  9 ++++++---
 tests/upload/fileupload_test.php | 22 +++++++++++++---------
 2 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'tests/upload')

diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index 05547dcd00..8fbb437ef0 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -23,6 +23,7 @@ class phpbb_filespec_test extends phpbb_test_case
 	const UPLOAD_MAX_FILESIZE = 1000;
 
 	private $config;
+	private $filesystem;
 	public $path;
 
 	protected function setUp()
@@ -30,7 +31,7 @@ class phpbb_filespec_test extends phpbb_test_case
 		// Global $config required by unique_id
 		// Global $user required by filespec::additional_checks and
 		// filespec::move_file
-		global $config, $user;
+		global $config, $user, $phpbb_filesystem;
 
 		if (!is_array($config))
 		{
@@ -75,6 +76,8 @@ class phpbb_filespec_test extends phpbb_test_case
 		$guessers[2]->set_priority(-2);
 		$guessers[3]->set_priority(-2);
 		$this->mimetype_guesser = new \phpbb\mimetype\guesser($guessers);
+
+		$this->filesystem = $phpbb_filesystem = new \phpbb\filesystem\filesystem();
 	}
 
 	private function get_filespec($override = array())
@@ -88,7 +91,7 @@ class phpbb_filespec_test extends phpbb_test_case
 			'error' => '',
 		);
 
-		return new filespec(array_merge($upload_ary, $override), null, $this->mimetype_guesser);
+		return new filespec(array_merge($upload_ary, $override), null, $this->filesystem, $this->mimetype_guesser);
 	}
 
 	protected function tearDown()
@@ -198,7 +201,7 @@ class phpbb_filespec_test extends phpbb_test_case
 			$filespec = $this->get_filespec();
 			$filespec->clean_filename('unique', self::PREFIX);
 			$name = $filespec->realname;
-			
+
 			$this->assertEquals(strlen($name), 32 + strlen(self::PREFIX));
 			$this->assertRegExp('#^[A-Za-z0-9]+$#', substr($name, strlen(self::PREFIX)));
 			$this->assertFalse(isset($filenames[$name]));
diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index fcfb84125d..9de384b64f 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -20,12 +20,14 @@ class phpbb_fileupload_test extends phpbb_test_case
 {
 	private $path;
 
+	private $filesystem;
+
 	protected function setUp()
 	{
 		// Global $config required by unique_id
 		// Global $user required by several functions dealing with translations
 		// Global $request required by form_upload, local_upload and is_valid
-		global $config, $user, $request;
+		global $config, $user, $request, $phpbb_filesystem;
 
 		if (!is_array($config))
 		{
@@ -40,6 +42,8 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 		$request = new phpbb_mock_request();
 
+		$this->filesystem = $phpbb_filesystem = new \phpbb\filesystem\filesystem();
+
 		$this->path = __DIR__ . '/fixture/';
 	}
 
@@ -65,7 +69,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_invalid_extension()
 	{
-		$upload = new fileupload('', array('png'), 100);
+		$upload = new fileupload($this->filesystem, '', array('png'), 100);
 		$file = $this->gen_valid_filespec();
 		$upload->common_checks($file);
 		$this->assertEquals('DISALLOWED_EXTENSION', $file->error[0]);
@@ -73,7 +77,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_invalid_filename()
 	{
-		$upload = new fileupload('', array('jpg'), 100);
+		$upload = new fileupload($this->filesystem, '', array('jpg'), 100);
 		$file = $this->gen_valid_filespec();
 		$file->realname = 'invalid?';
 		$upload->common_checks($file);
@@ -82,7 +86,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_too_large()
 	{
-		$upload = new fileupload('', array('jpg'), 100);
+		$upload = new fileupload($this->filesystem, '', array('jpg'), 100);
 		$file = $this->gen_valid_filespec();
 		$file->filesize = 1000;
 		$upload->common_checks($file);
@@ -91,7 +95,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_valid_file()
 	{
-		$upload = new fileupload('', array('jpg'), 1000);
+		$upload = new fileupload($this->filesystem, '', array('jpg'), 1000);
 		$file = $this->gen_valid_filespec();
 		$upload->common_checks($file);
 		$this->assertEquals(0, sizeof($file->error));
@@ -99,7 +103,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_local_upload()
 	{
-		$upload = new fileupload('', array('jpg'), 1000);
+		$upload = new fileupload($this->filesystem, '', array('jpg'), 1000);
 
 		copy($this->path . 'jpg', $this->path . 'jpg.jpg');
 		$file = $upload->local_upload($this->path . 'jpg.jpg');
@@ -109,7 +113,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_move_existent_file()
 	{
-		$upload = new fileupload('', array('jpg'), 1000);
+		$upload = new fileupload($this->filesystem, '', array('jpg'), 1000);
 
 		copy($this->path . 'jpg', $this->path . 'jpg.jpg');
 		$file = $upload->local_upload($this->path . 'jpg.jpg');
@@ -121,7 +125,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_move_existent_file_overwrite()
 	{
-		$upload = new fileupload('', array('jpg'), 1000);
+		$upload = new fileupload($this->filesystem, '', array('jpg'), 1000);
 
 		copy($this->path . 'jpg', $this->path . 'jpg.jpg');
 		copy($this->path . 'jpg', $this->path . 'copies/jpg.jpg');
@@ -134,7 +138,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_valid_dimensions()
 	{
-		$upload = new fileupload('', false, false, 1, 1, 100, 100);
+		$upload = new fileupload($this->filesystem, '', false, false, 1, 1, 100, 100);
 
 		$file1 = $this->gen_valid_filespec();
 		$file2 = $this->gen_valid_filespec();
-- 
cgit v1.2.1


From 2fa99602c6f6431e99468ca13f4a58344a401c24 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 8 Feb 2015 20:46:14 +0100
Subject: [ticket/8672] Add class for retrieving imagesize without download

getimagesize() always downloads the complete file before checking
the actual image dimensions. This class will be able to do the same
without having to download possibly large files.

PHPBB3-8672
---
 tests/upload/fixture/bmp            | Bin 0 -> 64 bytes
 tests/upload/fixture/iff            | Bin 0 -> 120 bytes
 tests/upload/fixture/iff_maya       | Bin 0 -> 88 bytes
 tests/upload/fixture/jp2            | Bin 0 -> 528 bytes
 tests/upload/fixture/jpx            | Bin 0 -> 528 bytes
 tests/upload/fixture/psd            | Bin 0 -> 6374 bytes
 tests/upload/fixture/tif_compressed | Bin 0 -> 236 bytes
 tests/upload/fixture/tif_msb        | Bin 0 -> 222 bytes
 tests/upload/fixture/wbmp           | Bin 0 -> 5 bytes
 tests/upload/imagesize_test.php     |  99 ++++++++++++++++++++++++++++++++++++
 10 files changed, 99 insertions(+)
 create mode 100644 tests/upload/fixture/bmp
 create mode 100644 tests/upload/fixture/iff
 create mode 100644 tests/upload/fixture/iff_maya
 create mode 100644 tests/upload/fixture/jp2
 create mode 100644 tests/upload/fixture/jpx
 create mode 100644 tests/upload/fixture/psd
 create mode 100644 tests/upload/fixture/tif_compressed
 create mode 100644 tests/upload/fixture/tif_msb
 create mode 100644 tests/upload/fixture/wbmp
 create mode 100644 tests/upload/imagesize_test.php

(limited to 'tests/upload')

diff --git a/tests/upload/fixture/bmp b/tests/upload/fixture/bmp
new file mode 100644
index 0000000000..04bff561ab
Binary files /dev/null and b/tests/upload/fixture/bmp differ
diff --git a/tests/upload/fixture/iff b/tests/upload/fixture/iff
new file mode 100644
index 0000000000..24eda8f593
Binary files /dev/null and b/tests/upload/fixture/iff differ
diff --git a/tests/upload/fixture/iff_maya b/tests/upload/fixture/iff_maya
new file mode 100644
index 0000000000..b6fb85101b
Binary files /dev/null and b/tests/upload/fixture/iff_maya differ
diff --git a/tests/upload/fixture/jp2 b/tests/upload/fixture/jp2
new file mode 100644
index 0000000000..adca6ecf0e
Binary files /dev/null and b/tests/upload/fixture/jp2 differ
diff --git a/tests/upload/fixture/jpx b/tests/upload/fixture/jpx
new file mode 100644
index 0000000000..adca6ecf0e
Binary files /dev/null and b/tests/upload/fixture/jpx differ
diff --git a/tests/upload/fixture/psd b/tests/upload/fixture/psd
new file mode 100644
index 0000000000..d1bc9a6a70
Binary files /dev/null and b/tests/upload/fixture/psd differ
diff --git a/tests/upload/fixture/tif_compressed b/tests/upload/fixture/tif_compressed
new file mode 100644
index 0000000000..133b50c4f0
Binary files /dev/null and b/tests/upload/fixture/tif_compressed differ
diff --git a/tests/upload/fixture/tif_msb b/tests/upload/fixture/tif_msb
new file mode 100644
index 0000000000..32eb8abfbb
Binary files /dev/null and b/tests/upload/fixture/tif_msb differ
diff --git a/tests/upload/fixture/wbmp b/tests/upload/fixture/wbmp
new file mode 100644
index 0000000000..708c86ccee
Binary files /dev/null and b/tests/upload/fixture/wbmp differ
diff --git a/tests/upload/imagesize_test.php b/tests/upload/imagesize_test.php
new file mode 100644
index 0000000000..2ce712e5c1
--- /dev/null
+++ b/tests/upload/imagesize_test.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+require_once(__DIR__ . '/../../phpBB/includes/functions.php');
+
+class phpbb_upload_imagesize_test extends \phpbb_test_case
+{
+	/** @var \phpbb\upload\imagesize */
+	protected $imagesize;
+
+	/** @var string Path to fixtures */
+	protected $path;
+
+	public function setUp()
+	{
+		parent::setUp();
+		$this->imagesize = new \phpbb\upload\imagesize();
+		$this->path = __DIR__ . '/fixture/';
+	}
+
+	public function data_get_imagesize()
+	{
+		return array(
+			array('foobar', 'image/bmp', false),
+			array('png', 'image/png', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_PNG)),
+			array('gif', 'image/png', false),
+			array('png', '', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_PNG)),
+			array('gif', 'image/gif', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_GIF)),
+			array('jpg', 'image/gif', false),
+			array('gif', '', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_GIF)),
+			array('jpg', 'image/jpg', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_JPEG)),
+			array('jpg', 'image/jpeg', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_JPEG)),
+			array('png', 'image/jpg', false),
+			array('jpg', '', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_JPEG)),
+			array('psd', 'image/psd', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_PSD)),
+			array('psd', 'image/photoshop', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_PSD)),
+			array('jpg', 'image/psd', false),
+			array('psd', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_PSD)),
+			array('bmp', 'image/bmp', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_BMP)),
+			array('png', 'image/bmp', false),
+			array('bmp', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_BMP)),
+			array('tif', 'image/tif', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_TIFF_II)),
+			array('png', 'image/tif', false),
+			array('tif', '', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_TIFF_II)),
+			array('tif_compressed', 'image/tif', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_TIFF_II)),
+			array('png', 'image/tiff', false),
+			array('tif_compressed', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_TIFF_II)),
+			array('tif_msb', 'image/tif', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_TIFF_MM)),
+			array('tif_msb', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_TIFF_MM)),
+			array('wbmp', 'image/wbmp', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_WBMP)),
+			array('wbmp', 'image/vnd.wap.wbmp', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_WBMP)),
+			array('png', 'image/vnd.wap.wbmp', false),
+			array('wbmp', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_WBMP)),
+			array('iff', 'image/iff', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_IFF)),
+			array('iff', 'image/x-iff', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_IFF)),
+			array('iff_maya', 'iamge/iff', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_IFF)),
+			array('png', 'image/iff', false),
+			array('png', 'image/x-iff', false),
+			array('iff', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_IFF)),
+			array('iff_maya', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_IFF)),
+			array('jp2', 'image/jp2', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)),
+			array('jp2', 'image/jpx', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)),
+			array('jp2', 'image/jpm', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)),
+			array('jpg', 'image/jp2', false),
+			array('jpx', 'image/jpx', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)),
+			array('jp2', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)),
+			array('jpx', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)),
+		);
+	}
+
+	/**
+	 * @dataProvider data_get_imagesize
+	 */
+	public function test_get_imagesize($file, $mime_type, $expected)
+	{
+		$this->assertEquals($expected, $this->imagesize->get_imagesize($this->path . $file, $mime_type));
+	}
+
+	public function test_get_imagesize_remote()
+	{
+		$this->assertSame(array(
+			'width'		=> 80,
+			'height'	=> 80,
+			'type'		=> IMAGETYPE_JPEG,
+		),
+		$this->imagesize->get_imagesize('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg'));
+	}
+}
-- 
cgit v1.2.1


From 39d6180c6814996dde84cfcd8c0150bba37354ac Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 7 Apr 2015 16:19:36 +0200
Subject: [ticket/8672] Use fastImageSize in classes

PHPBB3-8672
---
 tests/upload/imagesize_test.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'tests/upload')

diff --git a/tests/upload/imagesize_test.php b/tests/upload/imagesize_test.php
index 2ce712e5c1..bfea4b819d 100644
--- a/tests/upload/imagesize_test.php
+++ b/tests/upload/imagesize_test.php
@@ -16,7 +16,7 @@ require_once(__DIR__ . '/../../phpBB/includes/functions.php');
 
 class phpbb_upload_imagesize_test extends \phpbb_test_case
 {
-	/** @var \phpbb\upload\imagesize */
+	/** @var \fastImageSize\fastImageSize */
 	protected $imagesize;
 
 	/** @var string Path to fixtures */
@@ -25,7 +25,7 @@ class phpbb_upload_imagesize_test extends \phpbb_test_case
 	public function setUp()
 	{
 		parent::setUp();
-		$this->imagesize = new \phpbb\upload\imagesize();
+		$this->imagesize = new \fastImageSize\fastImageSize();
 		$this->path = __DIR__ . '/fixture/';
 	}
 
@@ -84,7 +84,7 @@ class phpbb_upload_imagesize_test extends \phpbb_test_case
 	 */
 	public function test_get_imagesize($file, $mime_type, $expected)
 	{
-		$this->assertEquals($expected, $this->imagesize->get_imagesize($this->path . $file, $mime_type));
+		$this->assertEquals($expected, $this->imagesize->getImageSize($this->path . $file, $mime_type));
 	}
 
 	public function test_get_imagesize_remote()
@@ -94,6 +94,6 @@ class phpbb_upload_imagesize_test extends \phpbb_test_case
 			'height'	=> 80,
 			'type'		=> IMAGETYPE_JPEG,
 		),
-		$this->imagesize->get_imagesize('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg'));
+		$this->imagesize->getImageSize('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg'));
 	}
 }
-- 
cgit v1.2.1


From 55c5bc126decffeaa74abdb853eb010cc3dcda8c Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 18 Apr 2015 14:01:21 +0200
Subject: [ticket/8672] User $user->lang() instead of sprintf

PHPBB3-8672
---
 tests/upload/filespec_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/upload')

diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index 8fbb437ef0..f6deb242a2 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -287,7 +287,7 @@ class phpbb_filespec_test extends phpbb_test_case
 			array('txt_copy', 'txt_as_img', 'image/jpg', 'txt', false, true),
 			array('txt_copy_2', 'txt_moved', 'text/plain', 'txt', false, true),
 			array('jpg_copy', 'jpg_moved', 'image/png', 'jpg', false, true),
-			array('png_copy', 'png_moved', 'image/png', 'jpg', 'IMAGE_FILETYPE_MISMATCH', true),
+			array('png_copy', 'png_moved', 'image/png', 'jpg', 'IMAGE_FILETYPE_MISMATCH png jpg', true),
 		);
 	}
 
-- 
cgit v1.2.1


From 58286171f1035495c8c2a6fdffce9f3842601e66 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 8 Sep 2015 12:59:55 +0200
Subject: [ticket/14150] Update fast-image-size to newest version

PHPBB3-14150
---
 tests/upload/imagesize_test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/upload')

diff --git a/tests/upload/imagesize_test.php b/tests/upload/imagesize_test.php
index bfea4b819d..d20e866dab 100644
--- a/tests/upload/imagesize_test.php
+++ b/tests/upload/imagesize_test.php
@@ -16,7 +16,7 @@ require_once(__DIR__ . '/../../phpBB/includes/functions.php');
 
 class phpbb_upload_imagesize_test extends \phpbb_test_case
 {
-	/** @var \fastImageSize\fastImageSize */
+	/** @var \FastImageSize\FastImageSize */
 	protected $imagesize;
 
 	/** @var string Path to fixtures */
@@ -25,7 +25,7 @@ class phpbb_upload_imagesize_test extends \phpbb_test_case
 	public function setUp()
 	{
 		parent::setUp();
-		$this->imagesize = new \fastImageSize\fastImageSize();
+		$this->imagesize = new \FastImageSize\FastImageSize();
 		$this->path = __DIR__ . '/fixture/';
 	}
 
-- 
cgit v1.2.1


From 2915647a546b4c0733a0e1a0cdc924272e41615b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 2 Jun 2015 00:29:03 +0200
Subject: [ticket/13904] Fix filespec tests

PHPBB3-13904
---
 tests/upload/filespec_test.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'tests/upload')

diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index f953970f64..f3260bf1a9 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -91,7 +91,8 @@ class phpbb_filespec_test extends phpbb_test_case
 			'error' => '',
 		);
 
-		return new filespec(array_merge($upload_ary, $override), null, $this->filesystem, $this->mimetype_guesser);
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->mimetype_guesser);
+		return $filespec->set_upload_ary(array_merge($upload_ary, $override));
 	}
 
 	protected function tearDown()
@@ -226,7 +227,7 @@ class phpbb_filespec_test extends phpbb_test_case
 	 */
 	public function test_get_extension($filename, $expected)
 	{
-		$this->assertEquals($expected, filespec::get_extension($filename));
+		$this->assertEquals($expected, \phpbb\files\filespec::get_extension($filename));
 	}
 
 	public function is_image_variables()
-- 
cgit v1.2.1


From dbfdb61f829166989149ac26bda36bbb4642e1af Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 2 Jun 2015 00:45:56 +0200
Subject: [ticket/13904] Fix fileupload tests

PHPBB3-13904
---
 tests/upload/fileupload_test.php | 42 +++++++++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 9 deletions(-)

(limited to 'tests/upload')

diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index 9de384b64f..fe6096aebf 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -27,7 +27,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 		// Global $config required by unique_id
 		// Global $user required by several functions dealing with translations
 		// Global $request required by form_upload, local_upload and is_valid
-		global $config, $user, $request, $phpbb_filesystem;
+		global $config, $user, $request, $phpbb_filesystem, $phpbb_container;
 
 		if (!is_array($config))
 		{
@@ -44,6 +44,13 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 		$this->filesystem = $phpbb_filesystem = new \phpbb\filesystem\filesystem();
 
+		$phpbb_container = new phpbb_mock_container_builder($this->phpbb_root_path, $this->phpEx);
+		$phpbb_container->set('files.filespec', new \phpbb\files\filespec(
+			$this->filesystem,
+			new \phpbb\mimetype\guesser(array(
+				'mimetype.extension_guesser' => new \phpbb\mimetype\extension_guesser(),
+			))));
+
 		$this->path = __DIR__ . '/fixture/';
 	}
 
@@ -69,7 +76,9 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_invalid_extension()
 	{
-		$upload = new fileupload($this->filesystem, '', array('png'), 100);
+		$upload = new \phpbb\files\upload($this->filesystem);
+		$upload->set_allowed_extensions(array('png'))
+			->set_max_filesize(100);
 		$file = $this->gen_valid_filespec();
 		$upload->common_checks($file);
 		$this->assertEquals('DISALLOWED_EXTENSION', $file->error[0]);
@@ -77,7 +86,9 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_invalid_filename()
 	{
-		$upload = new fileupload($this->filesystem, '', array('jpg'), 100);
+		$upload = new \phpbb\files\upload($this->filesystem);
+		$upload->set_allowed_extensions(array('jpg'))
+			->set_max_filesize(100);
 		$file = $this->gen_valid_filespec();
 		$file->realname = 'invalid?';
 		$upload->common_checks($file);
@@ -86,7 +97,9 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_too_large()
 	{
-		$upload = new fileupload($this->filesystem, '', array('jpg'), 100);
+		$upload = new \phpbb\files\upload($this->filesystem);
+		$upload->set_allowed_extensions(array('jpg'))
+			->set_max_filesize(100);
 		$file = $this->gen_valid_filespec();
 		$file->filesize = 1000;
 		$upload->common_checks($file);
@@ -95,7 +108,9 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_valid_file()
 	{
-		$upload = new fileupload($this->filesystem, '', array('jpg'), 1000);
+		$upload = new \phpbb\files\upload($this->filesystem);
+		$upload->set_allowed_extensions(array('jpg'))
+			->set_max_filesize(1000);
 		$file = $this->gen_valid_filespec();
 		$upload->common_checks($file);
 		$this->assertEquals(0, sizeof($file->error));
@@ -103,7 +118,9 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_local_upload()
 	{
-		$upload = new fileupload($this->filesystem, '', array('jpg'), 1000);
+		$upload = new \phpbb\files\upload($this->filesystem);
+		$upload->set_allowed_extensions(array('jpg'))
+			->set_max_filesize(1000);
 
 		copy($this->path . 'jpg', $this->path . 'jpg.jpg');
 		$file = $upload->local_upload($this->path . 'jpg.jpg');
@@ -113,7 +130,9 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_move_existent_file()
 	{
-		$upload = new fileupload($this->filesystem, '', array('jpg'), 1000);
+		$upload = new \phpbb\files\upload($this->filesystem);
+		$upload->set_allowed_extensions(array('jpg'))
+			->set_max_filesize(1000);
 
 		copy($this->path . 'jpg', $this->path . 'jpg.jpg');
 		$file = $upload->local_upload($this->path . 'jpg.jpg');
@@ -125,7 +144,9 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_move_existent_file_overwrite()
 	{
-		$upload = new fileupload($this->filesystem, '', array('jpg'), 1000);
+		$upload = new \phpbb\files\upload($this->filesystem);
+		$upload->set_allowed_extensions(array('jpg'))
+			->set_max_filesize(1000);
 
 		copy($this->path . 'jpg', $this->path . 'jpg.jpg');
 		copy($this->path . 'jpg', $this->path . 'copies/jpg.jpg');
@@ -138,7 +159,10 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_valid_dimensions()
 	{
-		$upload = new fileupload($this->filesystem, '', false, false, 1, 1, 100, 100);
+		$upload = new \phpbb\files\upload($this->filesystem);
+		$upload->set_allowed_extensions(false)
+			->set_max_filesize(false)
+			->set_allowed_dimensions(1, 1, 100, 100);
 
 		$file1 = $this->gen_valid_filespec();
 		$file2 = $this->gen_valid_filespec();
-- 
cgit v1.2.1


From a53825ad760cc8437d8c26eb1f947622c0fcf229 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 2 Jun 2015 11:48:55 +0200
Subject: [ticket/13904] No longer use fileerror class for extending filespec
 class

PHPBB3-13904
---
 tests/upload/fileupload_test.php | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'tests/upload')

diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index fe6096aebf..d4785c782c 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -22,6 +22,12 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	private $filesystem;
 
+	/** @var \Symfony\Component\DependencyInjection\ContainerInterface */
+	protected $container;
+
+	/** @var \phpbb\files\factory */
+	protected $factory;
+
 	protected function setUp()
 	{
 		// Global $config required by unique_id
@@ -44,12 +50,13 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 		$this->filesystem = $phpbb_filesystem = new \phpbb\filesystem\filesystem();
 
-		$phpbb_container = new phpbb_mock_container_builder($this->phpbb_root_path, $this->phpEx);
-		$phpbb_container->set('files.filespec', new \phpbb\files\filespec(
+		$this->container = new phpbb_mock_container_builder($this->phpbb_root_path, $this->phpEx);
+		$this->container->set('files.filespec', new \phpbb\files\filespec(
 			$this->filesystem,
 			new \phpbb\mimetype\guesser(array(
 				'mimetype.extension_guesser' => new \phpbb\mimetype\extension_guesser(),
 			))));
+		$this->factory = new \phpbb\files\factory($this->container);
 
 		$this->path = __DIR__ . '/fixture/';
 	}
@@ -76,7 +83,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_invalid_extension()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory);
 		$upload->set_allowed_extensions(array('png'))
 			->set_max_filesize(100);
 		$file = $this->gen_valid_filespec();
@@ -86,7 +93,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_invalid_filename()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(100);
 		$file = $this->gen_valid_filespec();
@@ -97,7 +104,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_too_large()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(100);
 		$file = $this->gen_valid_filespec();
@@ -108,7 +115,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_valid_file()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 		$file = $this->gen_valid_filespec();
@@ -118,7 +125,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_local_upload()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 
@@ -130,7 +137,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_move_existent_file()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 
@@ -144,7 +151,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_move_existent_file_overwrite()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 
@@ -159,7 +166,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_valid_dimensions()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory);
 		$upload->set_allowed_extensions(false)
 			->set_max_filesize(false)
 			->set_allowed_dimensions(1, 1, 100, 100);
-- 
cgit v1.2.1


From 25df7f814920a67b1d9b1e65e797c44960026585 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 2 Jun 2015 12:24:31 +0200
Subject: [ticket/13904] Remove functions_fileupload.php

PHPBB3-13904
---
 tests/upload/filespec_test.php   | 1 -
 tests/upload/fileupload_test.php | 1 -
 2 files changed, 2 deletions(-)

(limited to 'tests/upload')

diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index f3260bf1a9..10577ec8f3 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -13,7 +13,6 @@
 
 require_once __DIR__ . '/../../phpBB/includes/functions.php';
 require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
-require_once __DIR__ . '/../../phpBB/includes/functions_upload.php';
 
 class phpbb_filespec_test extends phpbb_test_case
 {
diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index d4785c782c..8b7056e9cf 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -13,7 +13,6 @@
 
 require_once __DIR__ . '/../../phpBB/includes/functions.php';
 require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
-require_once __DIR__ . '/../../phpBB/includes/functions_upload.php';
 require_once __DIR__ . '/../mock/filespec.php';
 
 class phpbb_fileupload_test extends phpbb_test_case
-- 
cgit v1.2.1


From ef59e0228a993bcaf7bf59c7cb24511f3cbe1b78 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 2 Jun 2015 13:42:58 +0200
Subject: [ticket/13904] Fix tests again

PHPBB3-13904
---
 tests/upload/fileupload_test.php | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'tests/upload')

diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index 8b7056e9cf..87e10ac954 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -27,12 +27,15 @@ class phpbb_fileupload_test extends phpbb_test_case
 	/** @var \phpbb\files\factory */
 	protected $factory;
 
+	/** @var \phpbb\language\language */
+	protected $language;
+
 	protected function setUp()
 	{
 		// Global $config required by unique_id
 		// Global $user required by several functions dealing with translations
 		// Global $request required by form_upload, local_upload and is_valid
-		global $config, $user, $request, $phpbb_filesystem, $phpbb_container;
+		global $config, $user, $request, $phpbb_filesystem, $phpbb_root_path, $phpEx;
 
 		if (!is_array($config))
 		{
@@ -49,7 +52,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 		$this->filesystem = $phpbb_filesystem = new \phpbb\filesystem\filesystem();
 
-		$this->container = new phpbb_mock_container_builder($this->phpbb_root_path, $this->phpEx);
+		$this->container = new phpbb_mock_container_builder($phpbb_root_path, $phpEx);
 		$this->container->set('files.filespec', new \phpbb\files\filespec(
 			$this->filesystem,
 			new \phpbb\mimetype\guesser(array(
@@ -57,6 +60,8 @@ class phpbb_fileupload_test extends phpbb_test_case
 			))));
 		$this->factory = new \phpbb\files\factory($this->container);
 
+		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
+
 		$this->path = __DIR__ . '/fixture/';
 	}
 
@@ -82,7 +87,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_invalid_extension()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
 		$upload->set_allowed_extensions(array('png'))
 			->set_max_filesize(100);
 		$file = $this->gen_valid_filespec();
@@ -92,7 +97,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_invalid_filename()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(100);
 		$file = $this->gen_valid_filespec();
@@ -103,7 +108,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_too_large()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(100);
 		$file = $this->gen_valid_filespec();
@@ -114,7 +119,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_valid_file()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 		$file = $this->gen_valid_filespec();
@@ -124,7 +129,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_local_upload()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 
@@ -136,7 +141,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_move_existent_file()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 
@@ -150,7 +155,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_move_existent_file_overwrite()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 
@@ -165,7 +170,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_valid_dimensions()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
 		$upload->set_allowed_extensions(false)
 			->set_max_filesize(false)
 			->set_allowed_dimensions(1, 1, 100, 100);
-- 
cgit v1.2.1


From 697ac5f4aa151b06ed65f8352652443bf297682a Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 2 Jun 2015 15:06:24 +0200
Subject: [ticket/13904] Use language class instead of global user in filespec

PHPBB3-13904
---
 tests/upload/filespec_test.php   | 19 ++++++++-----------
 tests/upload/fileupload_test.php | 12 ++++--------
 2 files changed, 12 insertions(+), 19 deletions(-)

(limited to 'tests/upload')

diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index 10577ec8f3..b28adc3f28 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -25,12 +25,13 @@ class phpbb_filespec_test extends phpbb_test_case
 	private $filesystem;
 	public $path;
 
+	/** @var \phpbb\language\language */
+	protected $language;
+
 	protected function setUp()
 	{
 		// Global $config required by unique_id
-		// Global $user required by filespec::additional_checks and
-		// filespec::move_file
-		global $config, $user, $phpbb_filesystem;
+		global $config, $phpbb_root_path, $phpEx;
 
 		if (!is_array($config))
 		{
@@ -44,9 +45,6 @@ class phpbb_filespec_test extends phpbb_test_case
 		// See: phpBB/install/schemas/schema_data.sql
 		$config['mime_triggers'] = 'body|head|html|img|plaintext|a href|pre|script|table|title';
 
-		$user = new phpbb_mock_user();
-		$user->lang = new phpbb_mock_lang();
-
 		$this->config = &$config;
 		$this->path = __DIR__ . '/fixture/';
 
@@ -75,8 +73,9 @@ class phpbb_filespec_test extends phpbb_test_case
 		$guessers[2]->set_priority(-2);
 		$guessers[3]->set_priority(-2);
 		$this->mimetype_guesser = new \phpbb\mimetype\guesser($guessers);
+		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
 
-		$this->filesystem = $phpbb_filesystem = new \phpbb\filesystem\filesystem();
+		$this->filesystem = new \phpbb\filesystem\filesystem();
 	}
 
 	private function get_filespec($override = array())
@@ -90,15 +89,13 @@ class phpbb_filespec_test extends phpbb_test_case
 			'error' => '',
 		);
 
-		$filespec = new \phpbb\files\filespec($this->filesystem, $this->mimetype_guesser);
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, $this->mimetype_guesser);
 		return $filespec->set_upload_ary(array_merge($upload_ary, $override));
 	}
 
 	protected function tearDown()
 	{
-		global $user;
 		$this->config = array();
-		$user = null;
 
 		$iterator = new DirectoryIterator($this->path . 'copies');
 		foreach ($iterator as $fileinfo)
@@ -289,7 +286,7 @@ class phpbb_filespec_test extends phpbb_test_case
 			array('txt_copy', 'txt_as_img', 'image/jpg', 'txt', false, true),
 			array('txt_copy_2', 'txt_moved', 'text/plain', 'txt', false, true),
 			array('jpg_copy', 'jpg_moved', 'image/png', 'jpg', false, true),
-			array('png_copy', 'png_moved', 'image/png', 'jpg', 'IMAGE_FILETYPE_MISMATCH png jpg', true),
+			array('png_copy', 'png_moved', 'image/png', 'jpg', 'Image file type mismatch: expected extension png but extension jpg given.', true),
 		);
 	}
 
diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index 87e10ac954..56e29a3ac2 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -33,9 +33,8 @@ class phpbb_fileupload_test extends phpbb_test_case
 	protected function setUp()
 	{
 		// Global $config required by unique_id
-		// Global $user required by several functions dealing with translations
 		// Global $request required by form_upload, local_upload and is_valid
-		global $config, $user, $request, $phpbb_filesystem, $phpbb_root_path, $phpEx;
+		global $config, $request, $phpbb_root_path, $phpEx;
 
 		if (!is_array($config))
 		{
@@ -45,23 +44,20 @@ class phpbb_fileupload_test extends phpbb_test_case
 		$config['rand_seed'] = '';
 		$config['rand_seed_last_update'] = time() + 600;
 
-		$user = new phpbb_mock_user();
-		$user->lang = new phpbb_mock_lang();
-
 		$request = new phpbb_mock_request();
 
-		$this->filesystem = $phpbb_filesystem = new \phpbb\filesystem\filesystem();
+		$this->filesystem = new \phpbb\filesystem\filesystem();
+		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
 
 		$this->container = new phpbb_mock_container_builder($phpbb_root_path, $phpEx);
 		$this->container->set('files.filespec', new \phpbb\files\filespec(
 			$this->filesystem,
+			$this->language,
 			new \phpbb\mimetype\guesser(array(
 				'mimetype.extension_guesser' => new \phpbb\mimetype\extension_guesser(),
 			))));
 		$this->factory = new \phpbb\files\factory($this->container);
 
-		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
-
 		$this->path = __DIR__ . '/fixture/';
 	}
 
-- 
cgit v1.2.1


From 47f8f2cc88bdcd40087c8e391be1d33d36a2d308 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 2 Jun 2015 15:24:38 +0200
Subject: [ticket/13904] Pass request service to upload instead of using global

PHPBB3-13904
---
 tests/upload/fileupload_test.php | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'tests/upload')

diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index 56e29a3ac2..deb4404585 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -30,11 +30,13 @@ class phpbb_fileupload_test extends phpbb_test_case
 	/** @var \phpbb\language\language */
 	protected $language;
 
+	/** @var \phpbb\request\request_interface */
+	protected $request;
+
 	protected function setUp()
 	{
 		// Global $config required by unique_id
-		// Global $request required by form_upload, local_upload and is_valid
-		global $config, $request, $phpbb_root_path, $phpEx;
+		global $config, $phpbb_root_path, $phpEx;
 
 		if (!is_array($config))
 		{
@@ -44,7 +46,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 		$config['rand_seed'] = '';
 		$config['rand_seed_last_update'] = time() + 600;
 
-		$request = new phpbb_mock_request();
+		$this->request = $this->getMock('\phpbb\request\request');
 
 		$this->filesystem = new \phpbb\filesystem\filesystem();
 		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
@@ -83,7 +85,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_invalid_extension()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request);
 		$upload->set_allowed_extensions(array('png'))
 			->set_max_filesize(100);
 		$file = $this->gen_valid_filespec();
@@ -93,7 +95,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_invalid_filename()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(100);
 		$file = $this->gen_valid_filespec();
@@ -104,7 +106,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_too_large()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(100);
 		$file = $this->gen_valid_filespec();
@@ -115,7 +117,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_valid_file()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 		$file = $this->gen_valid_filespec();
@@ -125,7 +127,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_local_upload()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 
@@ -137,7 +139,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_move_existent_file()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 
@@ -151,7 +153,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_move_existent_file_overwrite()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 
@@ -166,7 +168,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_valid_dimensions()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request);
 		$upload->set_allowed_extensions(false)
 			->set_max_filesize(false)
 			->set_allowed_dimensions(1, 1, 100, 100);
-- 
cgit v1.2.1


From 52652ca1824e91ecfe7549167aebd92c314af678 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 2 Jun 2015 15:29:32 +0200
Subject: [ticket/13904] Remove phpbb_root_path global from upload class

PHPBB3-13904
---
 tests/upload/fileupload_test.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'tests/upload')

diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index deb4404585..0832f269cb 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -33,6 +33,9 @@ class phpbb_fileupload_test extends phpbb_test_case
 	/** @var \phpbb\request\request_interface */
 	protected $request;
 
+	/** @var string phpBB root path */
+	protected $phpbb_root_path;
+
 	protected function setUp()
 	{
 		// Global $config required by unique_id
@@ -61,6 +64,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 		$this->factory = new \phpbb\files\factory($this->container);
 
 		$this->path = __DIR__ . '/fixture/';
+		$this->phpbb_root_path = $phpbb_root_path;
 	}
 
 	private function gen_valid_filespec()
@@ -85,7 +89,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_invalid_extension()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('png'))
 			->set_max_filesize(100);
 		$file = $this->gen_valid_filespec();
@@ -95,7 +99,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_invalid_filename()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(100);
 		$file = $this->gen_valid_filespec();
@@ -106,7 +110,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_too_large()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(100);
 		$file = $this->gen_valid_filespec();
@@ -117,7 +121,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_valid_file()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 		$file = $this->gen_valid_filespec();
@@ -127,7 +131,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_local_upload()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 
@@ -139,7 +143,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_move_existent_file()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 
@@ -153,7 +157,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_move_existent_file_overwrite()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 
@@ -168,7 +172,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_valid_dimensions()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(false)
 			->set_max_filesize(false)
 			->set_allowed_dimensions(1, 1, 100, 100);
-- 
cgit v1.2.1


From b871dbcf1f2d0483cbe19cddf94a5bdc9659ab00 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 2 Jun 2015 15:46:41 +0200
Subject: [ticket/13904] Remove phpbb_root_path global from filespec class

PHPBB3-13904
---
 tests/upload/filespec_test.php   | 11 +++++++----
 tests/upload/fileupload_test.php |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'tests/upload')

diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index b28adc3f28..b0df72a6ff 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -28,6 +28,9 @@ class phpbb_filespec_test extends phpbb_test_case
 	/** @var \phpbb\language\language */
 	protected $language;
 
+	/** @var string phpBB root path */
+	protected $phpbb_root_path;
+
 	protected function setUp()
 	{
 		// Global $config required by unique_id
@@ -76,6 +79,7 @@ class phpbb_filespec_test extends phpbb_test_case
 		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
 
 		$this->filesystem = new \phpbb\filesystem\filesystem();
+		$this->phpbb_root_path = $phpbb_root_path;
 	}
 
 	private function get_filespec($override = array())
@@ -89,7 +93,7 @@ class phpbb_filespec_test extends phpbb_test_case
 			'error' => '',
 		);
 
-		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, $this->mimetype_guesser);
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, $this->phpbb_root_path, $this->mimetype_guesser);
 		return $filespec->set_upload_ary(array_merge($upload_ary, $override));
 	}
 
@@ -297,8 +301,7 @@ class phpbb_filespec_test extends phpbb_test_case
 	{
 		// Global $phpbb_root_path and $phpEx are required by phpbb_chmod
 		global $phpbb_root_path, $phpEx;
-		$phpbb_root_path = '';
-		$phpEx = 'php';
+		$this->phpbb_root_path = '';
 
 		$upload = new phpbb_mock_fileupload();
 		$upload->max_filesize = self::UPLOAD_MAX_FILESIZE;
@@ -319,7 +322,7 @@ class phpbb_filespec_test extends phpbb_test_case
 			$this->assertEquals($error, $filespec->error[0]);
 		}
 
-		$phpEx = '';
+		$this->phpbb_root_path = $phpbb_root_path;
 	}
 
 	/**
diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index 0832f269cb..c62e9a1947 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -58,6 +58,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 		$this->container->set('files.filespec', new \phpbb\files\filespec(
 			$this->filesystem,
 			$this->language,
+			$phpbb_root_path,
 			new \phpbb\mimetype\guesser(array(
 				'mimetype.extension_guesser' => new \phpbb\mimetype\extension_guesser(),
 			))));
-- 
cgit v1.2.1


From adcc901af181b6727dd7af89a3926c9923a58471 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 15 Jul 2015 16:08:20 +0200
Subject: [ticket/13904] Fix minor issues and move local_upload to its own
 class

PHPBB3-13904
---
 tests/upload/fileupload_test.php | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

(limited to 'tests/upload')

diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index c62e9a1947..7a84b34473 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -43,7 +43,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 		if (!is_array($config))
 		{
-			$config = array();
+			$config = new \phpbb\config\config(array());
 		}
 
 		$config['rand_seed'] = '';
@@ -53,6 +53,15 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 		$this->filesystem = new \phpbb\filesystem\filesystem();
 		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
+		$guessers = array(
+			new \Symfony\Component\HttpFoundation\File\MimeType\FileinfoMimeTypeGuesser(),
+			new \Symfony\Component\HttpFoundation\File\MimeType\FileBinaryMimeTypeGuesser(),
+			new \phpbb\mimetype\content_guesser(),
+			new \phpbb\mimetype\extension_guesser(),
+		);
+		$guessers[2]->set_priority(-2);
+		$guessers[3]->set_priority(-2);
+		$this->mimetype_guesser = new \phpbb\mimetype\guesser($guessers);
 
 		$this->container = new phpbb_mock_container_builder($phpbb_root_path, $phpEx);
 		$this->container->set('files.filespec', new \phpbb\files\filespec(
@@ -63,6 +72,18 @@ class phpbb_fileupload_test extends phpbb_test_case
 				'mimetype.extension_guesser' => new \phpbb\mimetype\extension_guesser(),
 			))));
 		$this->factory = new \phpbb\files\factory($this->container);
+		$plupload = new \phpbb\plupload\plupload($phpbb_root_path, $config, $this->request, new \phpbb\user($this->language, '\phpbb\datetime'), new \phpbb\php\ini(), $this->mimetype_guesser);
+		$this->container->set('files.types.form', new \phpbb\files\types\form(
+			$this->factory,
+			$this->language,
+			$plupload,
+			$this->request
+		), phpbb_mock_container_builder::SCOPE_PROTOTYPE);
+		$this->container->set('files.types.local', new \phpbb\files\types\local(
+			$this->factory,
+			$this->language,
+			$this->request
+		), phpbb_mock_container_builder::SCOPE_PROTOTYPE);
 
 		$this->path = __DIR__ . '/fixture/';
 		$this->phpbb_root_path = $phpbb_root_path;
@@ -137,7 +158,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 			->set_max_filesize(1000);
 
 		copy($this->path . 'jpg', $this->path . 'jpg.jpg');
-		$file = $upload->local_upload($this->path . 'jpg.jpg');
+		$file = $upload->handle_upload('local', $this->path . 'jpg.jpg');
 		$this->assertEquals(0, sizeof($file->error));
 		unlink($this->path . 'jpg.jpg');
 	}
@@ -149,7 +170,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 			->set_max_filesize(1000);
 
 		copy($this->path . 'jpg', $this->path . 'jpg.jpg');
-		$file = $upload->local_upload($this->path . 'jpg.jpg');
+		$file = $upload->handle_upload('local', $this->path . 'jpg.jpg');
 		$this->assertEquals(0, sizeof($file->error));
 		$this->assertFalse($file->move_file('../tests/upload/fixture'));
 		$this->assertFalse($file->file_moved);
@@ -164,7 +185,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 		copy($this->path . 'jpg', $this->path . 'jpg.jpg');
 		copy($this->path . 'jpg', $this->path . 'copies/jpg.jpg');
-		$file = $upload->local_upload($this->path . 'jpg.jpg');
+		$file = $upload->handle_upload('local', $this->path . 'jpg.jpg');
 		$this->assertEquals(0, sizeof($file->error));
 		$file->move_file('../tests/upload/fixture/copies', true);
 		$this->assertEquals(0, sizeof($file->error));
-- 
cgit v1.2.1


From 845233fc626b0d5e6d9e61039fde8e31b4dd28aa Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 16 Jul 2015 00:21:23 +0200
Subject: [ticket/13904] Improve test coverage and use constants instead of
 magic numbers

PHPBB3-13904
---
 tests/upload/fileupload_test.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'tests/upload')

diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index 7a84b34473..ab42a4a153 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -119,6 +119,25 @@ class phpbb_fileupload_test extends phpbb_test_case
 		$this->assertEquals('DISALLOWED_EXTENSION', $file->error[0]);
 	}
 
+	public function test_common_checks_disallowed_content()
+	{
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request, $this->phpbb_root_path);
+		$upload->set_allowed_extensions(array('jpg'))
+			->set_max_filesize(1000);
+		$file = new \phpbb\files\filespec($this->filesystem, $this->language, $this->phpbb_root_path);
+		$file->set_upload_ary(array(
+				'size'	=> 50,
+				'tmp_name'	=> dirname(__FILE__) . '/fixture/disallowed',
+				'name'		=> 'disallowed.jpg',
+				'type'		=> 'image/jpg'
+			))
+			->set_upload_namespace($upload);
+		file_put_contents(dirname(__FILE__) . '/fixture/disallowed', '<body>' . file_get_contents(dirname(__FILE__) . '/fixture/jpg'));
+		$upload->common_checks($file);
+		$this->assertEquals('DISALLOWED_CONTENT', $file->error[0]);
+		unlink(dirname(__FILE__) . '/fixture/disallowed');
+	}
+
 	public function test_common_checks_invalid_filename()
 	{
 		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request, $this->phpbb_root_path);
-- 
cgit v1.2.1


From 3e99816fa2f184b859d47308254aa8f07d68f1dd Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 16 Jul 2015 12:06:23 +0200
Subject: [ticket/13904] Set visibility in files and improve test coverage

PHPBB3-13904
---
 tests/upload/filespec_test.php | 60 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 55 insertions(+), 5 deletions(-)

(limited to 'tests/upload')

diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index b0df72a6ff..f885b1acfc 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -133,7 +133,7 @@ class phpbb_filespec_test extends phpbb_test_case
 	{
 		$upload = new phpbb_mock_fileupload();
 		$filespec = $this->get_filespec();
-		$filespec->upload = $upload;
+		$filespec->set_upload_namespace($upload);
 		$filespec->file_moved = true;
 		$filespec->filesize = $filespec->get_filesize($this->path . $filename);
 
@@ -174,6 +174,7 @@ class phpbb_filespec_test extends phpbb_test_case
 			array($chunks[2] . $chunks[9]),
 			array($chunks[3] . $chunks[4]),
 			array($chunks[5] . $chunks[6]),
+			array('foobar.png'),
 		);
 	}
 
@@ -185,7 +186,7 @@ class phpbb_filespec_test extends phpbb_test_case
 		$bad_chars = array("'", "\\", ' ', '/', ':', '*', '?', '"', '<', '>', '|');
 		$filespec = $this->get_filespec(array('name' => $filename));
 		$filespec->clean_filename('real', self::PREFIX);
-		$name = $filespec->realname;
+		$name = $filespec->get('realname');
 
 		$this->assertEquals(0, preg_match('/%(\w{2})/', $name));
 		foreach ($bad_chars as $char)
@@ -201,7 +202,7 @@ class phpbb_filespec_test extends phpbb_test_case
 		{
 			$filespec = $this->get_filespec();
 			$filespec->clean_filename('unique', self::PREFIX);
-			$name = $filespec->realname;
+			$name = $filespec->get('realname');
 
 			$this->assertEquals(strlen($name), 32 + strlen(self::PREFIX));
 			$this->assertRegExp('#^[A-Za-z0-9]+$#', substr($name, strlen(self::PREFIX)));
@@ -210,6 +211,55 @@ class phpbb_filespec_test extends phpbb_test_case
 		}
 	}
 
+	public function test_clean_filename_unique_ext()
+	{
+		$filenames = array();
+		for ($tests = 0; $tests < self::TEST_COUNT; $tests++)
+		{
+			$filespec = $this->get_filespec(array('name' => 'foobar.jpg'));
+			$filespec->clean_filename('unique_ext', self::PREFIX);
+			$name = $filespec->get('realname');
+
+			$this->assertEquals(strlen($name), 32 + strlen(self::PREFIX) + strlen('.jpg'));
+			$this->assertRegExp('#^[A-Za-z0-9]+\.jpg$#', substr($name, strlen(self::PREFIX)));
+			$this->assertFalse(isset($filenames[$name]));
+			$filenames[$name] = true;
+		}
+	}
+
+	public function data_clean_filename_avatar()
+	{
+		return array(
+			array(false, false, ''),
+			array('foobar.png', 'u5.png', 'avatar', 'u', 5),
+			array('foobar.png', 'g9.png', 'avatar', 'g', 9),
+
+		);
+	}
+
+	/**
+	 * @dataProvider data_clean_filename_avatar
+	 */
+	public function test_clean_filename_avatar($filename, $expected, $mode, $prefix = '', $user_id = '')
+	{
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, $this->phpbb_root_path, $this->mimetype_guesser);
+
+		if ($filename)
+		{
+			$upload_ary = array(
+				'name' => $filename,
+				'type' => '',
+				'size' => '',
+				'tmp_name' => '',
+				'error' => '',
+			);
+			$filespec->set_upload_ary($upload_ary);
+		}
+		$filespec->clean_filename($mode, $prefix, $user_id);
+
+		$this->assertSame($expected, $filespec->get('realname'));
+	}
+
 	public function get_extension_variables()
 	{
 		return array(
@@ -312,7 +362,7 @@ class phpbb_filespec_test extends phpbb_test_case
 			'type' => $mime_type,
 		));
 		$filespec->extension = $extension;
-		$filespec->upload = $upload;
+		$filespec->set_upload_namespace($upload);
 		$filespec->local = true;
 
 		$this->assertEquals($expected, $filespec->move_file($this->path . 'copies'));
@@ -336,6 +386,6 @@ class phpbb_filespec_test extends phpbb_test_case
 		$type_cast_helper->set_var($upload_name, $filename, 'string', true, true);
 		$filespec = $this->get_filespec(array('name'=> $upload_name));
 
-		$this->assertSame(trim(utf8_basename(htmlspecialchars($filename))), $filespec->uploadname);
+		$this->assertSame(trim(utf8_basename(htmlspecialchars($filename))), $filespec->get('uploadname'));
 	}
 }
-- 
cgit v1.2.1


From 46e3d8219671e996677be1943a7e3c80f1039693 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 16 Jul 2015 16:30:59 +0200
Subject: [ticket/13904] Add more tests and test cases

PHPBB3-13904
---
 tests/upload/filespec_test.php   | 43 ++++++++++++++++++++++++++++++++++++++++
 tests/upload/fileupload_test.php |  4 +++-
 2 files changed, 46 insertions(+), 1 deletion(-)

(limited to 'tests/upload')

diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index f885b1acfc..a6ea850763 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -112,6 +112,13 @@ class phpbb_filespec_test extends phpbb_test_case
 		}
 	}
 
+	public function test_empty_upload_ary()
+	{
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, $this->phpbb_root_path, $this->mimetype_guesser);
+		$this->assertInstanceOf('\phpbb\files\filespec', $filespec->set_upload_ary(array()));
+		$this->assertTrue($filespec->init_error());
+	}
+
 	public function additional_checks_variables()
 	{
 		// False here just indicates the file is too large and fails the
@@ -140,6 +147,19 @@ class phpbb_filespec_test extends phpbb_test_case
 		$this->assertEquals($expected, $filespec->additional_checks());
 	}
 
+	public function test_additional_checks_dimensions()
+	{
+		$upload = new phpbb_mock_fileupload();
+		$filespec = $this->get_filespec();
+		$filespec->set_upload_namespace($upload);
+		$upload->valid_dimensions = false;
+		$filespec->file_moved = true;
+		$upload->max_filesize = 0;
+
+		$this->assertEquals(false, $filespec->additional_checks());
+		$this->assertSame(array('WRONG_SIZE'), $filespec->error);
+	}
+
 	public function check_content_variables()
 	{
 		// False here indicates that a file is non-binary and contains
@@ -388,4 +408,27 @@ class phpbb_filespec_test extends phpbb_test_case
 
 		$this->assertSame(trim(utf8_basename(htmlspecialchars($filename))), $filespec->get('uploadname'));
 	}
+
+	public function test_is_uploaded()
+	{
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, $this->phpbb_root_path, null);
+		$reflection_filespec = new ReflectionClass($filespec);
+		$plupload_property = $reflection_filespec->getProperty('plupload');
+		$plupload_property->setAccessible(true);
+		$plupload_mock = $this->getMockBuilder('\phpbb\plupload\plupload')
+			->disableOriginalConstructor()
+			->getMock();
+		$plupload_mock->expects($this->any())
+			->method('is_active')
+			->will($this->returnValue(true));
+		$plupload_property->setValue($filespec, $plupload_mock);
+		$is_uploaded = $reflection_filespec->getMethod('is_uploaded');
+
+		// Plupload is active and file does not exist
+		$this->assertFalse($is_uploaded->invoke($filespec));
+
+		// Plupload is not active and file was not uploaded
+		$plupload_property->setValue($filespec, null);
+		$this->assertFalse($is_uploaded->invoke($filespec));
+	}
 }
diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index ab42a4a153..d1d8b55ff3 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -179,7 +179,9 @@ class phpbb_fileupload_test extends phpbb_test_case
 		copy($this->path . 'jpg', $this->path . 'jpg.jpg');
 		$file = $upload->handle_upload('local', $this->path . 'jpg.jpg');
 		$this->assertEquals(0, sizeof($file->error));
-		unlink($this->path . 'jpg.jpg');
+		$this->assertFalse($file->additional_checks());
+		$this->assertTrue($file->move_file('../tests/upload/fixture/copies', true));
+		$file->remove();
 	}
 
 	public function test_move_existent_file()
-- 
cgit v1.2.1


From 7ba0fe47a8610b1bd882f00cd1e158c7b29d248c Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 17 Jul 2015 09:29:09 +0200
Subject: [ticket/13904] Test move file on existing error

PHPBB3-13904
---
 tests/upload/filespec_test.php | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'tests/upload')

diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index a6ea850763..1ba473555f 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -395,6 +395,14 @@ class phpbb_filespec_test extends phpbb_test_case
 		$this->phpbb_root_path = $phpbb_root_path;
 	}
 
+	public function test_move_file_error()
+	{
+		$filespec = $this->get_filespec();
+		$this->assertFalse($filespec->move_file('foobar'));
+		$filespec->error[] = 'foo';
+		$this->assertFalse($filespec->move_file('foo'));
+	}
+
 	/**
 	* @dataProvider clean_filename_variables
 	*/
-- 
cgit v1.2.1


From cdde86ce7e0c594fad5992789b3fae466bd526cc Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 26 Aug 2015 13:57:42 +0200
Subject: [ticket/13904] Use \phpbb\php\ini class for ini_get()

PHPBB3-13904
---
 tests/upload/filespec_test.php   |  8 ++++----
 tests/upload/fileupload_test.php | 27 ++++++++++++++++-----------
 2 files changed, 20 insertions(+), 15 deletions(-)

(limited to 'tests/upload')

diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index 1ba473555f..8a9e53f30b 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -93,7 +93,7 @@ class phpbb_filespec_test extends phpbb_test_case
 			'error' => '',
 		);
 
-		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, $this->phpbb_root_path, $this->mimetype_guesser);
+		$filespec = new \phpbb\files\filespec($this->filesystem, new \phpbb\php\ini, $this->language, $this->phpbb_root_path, $this->mimetype_guesser);
 		return $filespec->set_upload_ary(array_merge($upload_ary, $override));
 	}
 
@@ -114,7 +114,7 @@ class phpbb_filespec_test extends phpbb_test_case
 
 	public function test_empty_upload_ary()
 	{
-		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, $this->phpbb_root_path, $this->mimetype_guesser);
+		$filespec = new \phpbb\files\filespec($this->filesystem, new \phpbb\php\ini, $this->language, $this->phpbb_root_path, $this->mimetype_guesser);
 		$this->assertInstanceOf('\phpbb\files\filespec', $filespec->set_upload_ary(array()));
 		$this->assertTrue($filespec->init_error());
 	}
@@ -262,7 +262,7 @@ class phpbb_filespec_test extends phpbb_test_case
 	 */
 	public function test_clean_filename_avatar($filename, $expected, $mode, $prefix = '', $user_id = '')
 	{
-		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, $this->phpbb_root_path, $this->mimetype_guesser);
+		$filespec = new \phpbb\files\filespec($this->filesystem, new \phpbb\php\ini, $this->language, $this->phpbb_root_path, $this->mimetype_guesser);
 
 		if ($filename)
 		{
@@ -419,7 +419,7 @@ class phpbb_filespec_test extends phpbb_test_case
 
 	public function test_is_uploaded()
 	{
-		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, $this->phpbb_root_path, null);
+		$filespec = new \phpbb\files\filespec($this->filesystem, new \phpbb\php\ini, $this->language, $this->phpbb_root_path, null);
 		$reflection_filespec = new ReflectionClass($filespec);
 		$plupload_property = $reflection_filespec->getProperty('plupload');
 		$plupload_property->setAccessible(true);
diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index d1d8b55ff3..957fb47755 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -27,6 +27,9 @@ class phpbb_fileupload_test extends phpbb_test_case
 	/** @var \phpbb\files\factory */
 	protected $factory;
 
+	/** @var \phpbb\php\ini */
+	protected $php_ini;
+
 	/** @var \phpbb\language\language */
 	protected $language;
 
@@ -50,6 +53,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 		$config['rand_seed_last_update'] = time() + 600;
 
 		$this->request = $this->getMock('\phpbb\request\request');
+		$this->php_ini = new \phpbb\php\ini;
 
 		$this->filesystem = new \phpbb\filesystem\filesystem();
 		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
@@ -66,13 +70,14 @@ class phpbb_fileupload_test extends phpbb_test_case
 		$this->container = new phpbb_mock_container_builder($phpbb_root_path, $phpEx);
 		$this->container->set('files.filespec', new \phpbb\files\filespec(
 			$this->filesystem,
+			$this->php_ini,
 			$this->language,
 			$phpbb_root_path,
 			new \phpbb\mimetype\guesser(array(
 				'mimetype.extension_guesser' => new \phpbb\mimetype\extension_guesser(),
 			))));
 		$this->factory = new \phpbb\files\factory($this->container);
-		$plupload = new \phpbb\plupload\plupload($phpbb_root_path, $config, $this->request, new \phpbb\user($this->language, '\phpbb\datetime'), new \phpbb\php\ini(), $this->mimetype_guesser);
+		$plupload = new \phpbb\plupload\plupload($phpbb_root_path, $config, $this->request, new \phpbb\user($this->language, '\phpbb\datetime'), $this->php_ini, $this->mimetype_guesser);
 		$this->container->set('files.types.form', new \phpbb\files\types\form(
 			$this->factory,
 			$this->language,
@@ -111,7 +116,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_invalid_extension()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request, $this->phpbb_root_path);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->php_ini, $this->language, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('png'))
 			->set_max_filesize(100);
 		$file = $this->gen_valid_filespec();
@@ -121,10 +126,10 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_disallowed_content()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request, $this->phpbb_root_path);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->php_ini, $this->language, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
-		$file = new \phpbb\files\filespec($this->filesystem, $this->language, $this->phpbb_root_path);
+		$file = new \phpbb\files\filespec($this->filesystem, $this->php_ini, $this->language, $this->phpbb_root_path);
 		$file->set_upload_ary(array(
 				'size'	=> 50,
 				'tmp_name'	=> dirname(__FILE__) . '/fixture/disallowed',
@@ -140,7 +145,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_invalid_filename()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request, $this->phpbb_root_path);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->php_ini, $this->language, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(100);
 		$file = $this->gen_valid_filespec();
@@ -151,7 +156,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_too_large()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request, $this->phpbb_root_path);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->php_ini, $this->language, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(100);
 		$file = $this->gen_valid_filespec();
@@ -162,7 +167,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_valid_file()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request, $this->phpbb_root_path);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->php_ini, $this->language, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 		$file = $this->gen_valid_filespec();
@@ -172,7 +177,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_local_upload()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request, $this->phpbb_root_path);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->php_ini, $this->language, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 
@@ -186,7 +191,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_move_existent_file()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request, $this->phpbb_root_path);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->php_ini, $this->language, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 
@@ -200,7 +205,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_move_existent_file_overwrite()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request, $this->phpbb_root_path);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->php_ini, $this->language, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 
@@ -215,7 +220,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_valid_dimensions()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->request, $this->phpbb_root_path);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->php_ini, $this->language, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(false)
 			->set_max_filesize(false)
 			->set_allowed_dimensions(1, 1, 100, 100);
-- 
cgit v1.2.1


From 36545d5cbe7188efbedf2e1f44b1a7b9617b50c1 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 26 Aug 2015 16:18:10 +0200
Subject: [ticket/13904] Switch around constructor arguments

PHPBB3-13904
---
 tests/upload/filespec_test.php   |  8 ++++----
 tests/upload/fileupload_test.php | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'tests/upload')

diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index 8a9e53f30b..595439c917 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -93,7 +93,7 @@ class phpbb_filespec_test extends phpbb_test_case
 			'error' => '',
 		);
 
-		$filespec = new \phpbb\files\filespec($this->filesystem, new \phpbb\php\ini, $this->language, $this->phpbb_root_path, $this->mimetype_guesser);
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \phpbb\php\ini, $this->phpbb_root_path, $this->mimetype_guesser);
 		return $filespec->set_upload_ary(array_merge($upload_ary, $override));
 	}
 
@@ -114,7 +114,7 @@ class phpbb_filespec_test extends phpbb_test_case
 
 	public function test_empty_upload_ary()
 	{
-		$filespec = new \phpbb\files\filespec($this->filesystem, new \phpbb\php\ini, $this->language, $this->phpbb_root_path, $this->mimetype_guesser);
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \phpbb\php\ini, $this->phpbb_root_path, $this->mimetype_guesser);
 		$this->assertInstanceOf('\phpbb\files\filespec', $filespec->set_upload_ary(array()));
 		$this->assertTrue($filespec->init_error());
 	}
@@ -262,7 +262,7 @@ class phpbb_filespec_test extends phpbb_test_case
 	 */
 	public function test_clean_filename_avatar($filename, $expected, $mode, $prefix = '', $user_id = '')
 	{
-		$filespec = new \phpbb\files\filespec($this->filesystem, new \phpbb\php\ini, $this->language, $this->phpbb_root_path, $this->mimetype_guesser);
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \phpbb\php\ini, $this->phpbb_root_path, $this->mimetype_guesser);
 
 		if ($filename)
 		{
@@ -419,7 +419,7 @@ class phpbb_filespec_test extends phpbb_test_case
 
 	public function test_is_uploaded()
 	{
-		$filespec = new \phpbb\files\filespec($this->filesystem, new \phpbb\php\ini, $this->language, $this->phpbb_root_path, null);
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \phpbb\php\ini, $this->phpbb_root_path, null);
 		$reflection_filespec = new ReflectionClass($filespec);
 		$plupload_property = $reflection_filespec->getProperty('plupload');
 		$plupload_property->setAccessible(true);
diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index 957fb47755..40f8704271 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -70,8 +70,8 @@ class phpbb_fileupload_test extends phpbb_test_case
 		$this->container = new phpbb_mock_container_builder($phpbb_root_path, $phpEx);
 		$this->container->set('files.filespec', new \phpbb\files\filespec(
 			$this->filesystem,
-			$this->php_ini,
 			$this->language,
+			$this->php_ini,
 			$phpbb_root_path,
 			new \phpbb\mimetype\guesser(array(
 				'mimetype.extension_guesser' => new \phpbb\mimetype\extension_guesser(),
@@ -116,7 +116,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_invalid_extension()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->php_ini, $this->language, $this->request, $this->phpbb_root_path);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('png'))
 			->set_max_filesize(100);
 		$file = $this->gen_valid_filespec();
@@ -126,10 +126,10 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_disallowed_content()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->php_ini, $this->language, $this->request, $this->phpbb_root_path);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
-		$file = new \phpbb\files\filespec($this->filesystem, $this->php_ini, $this->language, $this->phpbb_root_path);
+		$file = new \phpbb\files\filespec($this->filesystem, $this->language, $this->php_ini, $this->phpbb_root_path);
 		$file->set_upload_ary(array(
 				'size'	=> 50,
 				'tmp_name'	=> dirname(__FILE__) . '/fixture/disallowed',
@@ -145,7 +145,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_invalid_filename()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->php_ini, $this->language, $this->request, $this->phpbb_root_path);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(100);
 		$file = $this->gen_valid_filespec();
@@ -156,7 +156,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_too_large()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->php_ini, $this->language, $this->request, $this->phpbb_root_path);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(100);
 		$file = $this->gen_valid_filespec();
@@ -167,7 +167,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_common_checks_valid_file()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->php_ini, $this->language, $this->request, $this->phpbb_root_path);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 		$file = $this->gen_valid_filespec();
@@ -177,7 +177,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_local_upload()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->php_ini, $this->language, $this->request, $this->phpbb_root_path);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 
@@ -191,7 +191,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_move_existent_file()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->php_ini, $this->language, $this->request, $this->phpbb_root_path);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 
@@ -205,7 +205,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_move_existent_file_overwrite()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->php_ini, $this->language, $this->request, $this->phpbb_root_path);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
 
@@ -220,7 +220,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 	public function test_valid_dimensions()
 	{
-		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->php_ini, $this->language, $this->request, $this->phpbb_root_path);
+		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(false)
 			->set_max_filesize(false)
 			->set_allowed_dimensions(1, 1, 100, 100);
-- 
cgit v1.2.1


From 16f3b8c2b9de388223cbe8ace9e1d9bcf0ba5e11 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 27 Aug 2015 10:51:10 +0200
Subject: [ticket/13904] Modify files for changes in ini wrapper

PHPBB3-13904
---
 tests/upload/filespec_test.php   | 8 ++++----
 tests/upload/fileupload_test.php | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'tests/upload')

diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index 595439c917..a53c27f045 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -93,7 +93,7 @@ class phpbb_filespec_test extends phpbb_test_case
 			'error' => '',
 		);
 
-		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \phpbb\php\ini, $this->phpbb_root_path, $this->mimetype_guesser);
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, $this->phpbb_root_path, $this->mimetype_guesser);
 		return $filespec->set_upload_ary(array_merge($upload_ary, $override));
 	}
 
@@ -114,7 +114,7 @@ class phpbb_filespec_test extends phpbb_test_case
 
 	public function test_empty_upload_ary()
 	{
-		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \phpbb\php\ini, $this->phpbb_root_path, $this->mimetype_guesser);
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, $this->phpbb_root_path, $this->mimetype_guesser);
 		$this->assertInstanceOf('\phpbb\files\filespec', $filespec->set_upload_ary(array()));
 		$this->assertTrue($filespec->init_error());
 	}
@@ -262,7 +262,7 @@ class phpbb_filespec_test extends phpbb_test_case
 	 */
 	public function test_clean_filename_avatar($filename, $expected, $mode, $prefix = '', $user_id = '')
 	{
-		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \phpbb\php\ini, $this->phpbb_root_path, $this->mimetype_guesser);
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, $this->phpbb_root_path, $this->mimetype_guesser);
 
 		if ($filename)
 		{
@@ -419,7 +419,7 @@ class phpbb_filespec_test extends phpbb_test_case
 
 	public function test_is_uploaded()
 	{
-		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \phpbb\php\ini, $this->phpbb_root_path, null);
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, $this->phpbb_root_path, null);
 		$reflection_filespec = new ReflectionClass($filespec);
 		$plupload_property = $reflection_filespec->getProperty('plupload');
 		$plupload_property->setAccessible(true);
diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index 40f8704271..43106599e4 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -27,7 +27,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 	/** @var \phpbb\files\factory */
 	protected $factory;
 
-	/** @var \phpbb\php\ini */
+	/** @var \bantu\IniGetWrapper\IniGetWrapper */
 	protected $php_ini;
 
 	/** @var \phpbb\language\language */
@@ -53,7 +53,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 		$config['rand_seed_last_update'] = time() + 600;
 
 		$this->request = $this->getMock('\phpbb\request\request');
-		$this->php_ini = new \phpbb\php\ini;
+		$this->php_ini = new \bantu\IniGetWrapper\IniGetWrapper;
 
 		$this->filesystem = new \phpbb\filesystem\filesystem();
 		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
-- 
cgit v1.2.1


From b29b62debe4077ec688ebee9e9363db2c8614dd5 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 27 Aug 2015 12:48:06 +0200
Subject: [ticket/13904] Use ini_get() wrapper in file upload types

PHPBB3-13904
---
 tests/upload/fileupload_test.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tests/upload')

diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index 43106599e4..8675567e22 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -81,12 +81,14 @@ class phpbb_fileupload_test extends phpbb_test_case
 		$this->container->set('files.types.form', new \phpbb\files\types\form(
 			$this->factory,
 			$this->language,
+			$this->php_ini,
 			$plupload,
 			$this->request
 		), phpbb_mock_container_builder::SCOPE_PROTOTYPE);
 		$this->container->set('files.types.local', new \phpbb\files\types\local(
 			$this->factory,
 			$this->language,
+			$this->php_ini,
 			$this->request
 		), phpbb_mock_container_builder::SCOPE_PROTOTYPE);
 
-- 
cgit v1.2.1


From 591995267a3f1931131fa630bd3ff120476f881f Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 3 Sep 2015 17:20:54 +0200
Subject: [ticket/13904] Improve test coverage of filespec class

PHPBB3-13904
---
 tests/upload/filespec_test.php   | 119 +++++++++++++++++++++++++++++++++++++--
 tests/upload/fileupload_test.php |   3 +-
 2 files changed, 117 insertions(+), 5 deletions(-)

(limited to 'tests/upload')

diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index a53c27f045..10a442cd1d 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -93,7 +93,7 @@ class phpbb_filespec_test extends phpbb_test_case
 			'error' => '',
 		);
 
-		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, $this->phpbb_root_path, $this->mimetype_guesser);
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, new \fastImageSize\fastImageSize(), $this->phpbb_root_path, $this->mimetype_guesser);
 		return $filespec->set_upload_ary(array_merge($upload_ary, $override));
 	}
 
@@ -114,7 +114,7 @@ class phpbb_filespec_test extends phpbb_test_case
 
 	public function test_empty_upload_ary()
 	{
-		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, $this->phpbb_root_path, $this->mimetype_guesser);
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, new \fastImageSize\fastImageSize(), $this->phpbb_root_path, $this->mimetype_guesser);
 		$this->assertInstanceOf('\phpbb\files\filespec', $filespec->set_upload_ary(array()));
 		$this->assertTrue($filespec->init_error());
 	}
@@ -262,7 +262,7 @@ class phpbb_filespec_test extends phpbb_test_case
 	 */
 	public function test_clean_filename_avatar($filename, $expected, $mode, $prefix = '', $user_id = '')
 	{
-		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, $this->phpbb_root_path, $this->mimetype_guesser);
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, new \fastImageSize\fastImageSize(), $this->phpbb_root_path, $this->mimetype_guesser);
 
 		if ($filename)
 		{
@@ -403,6 +403,117 @@ class phpbb_filespec_test extends phpbb_test_case
 		$this->assertFalse($filespec->move_file('foo'));
 	}
 
+	public function data_move_file_copy()
+	{
+		return array(
+			array('gif_copy', true, false, array()),
+			array('gif_copy', true, true, array()),
+			array('foo_bar', false, false, array('GENERAL_UPLOAD_ERROR')),
+			array('foo_bar', false, true, array('GENERAL_UPLOAD_ERROR')),
+		);
+	}
+
+	/**
+	 * @dataProvider data_move_file_copy
+	 */
+	public function test_move_file_copy($tmp_name, $move_success, $safe_mode_on, $expected_error)
+	{
+		// Initialise a blank filespec object for use with trivial methods
+		$upload_ary = array(
+			'name' => 'gif_moved',
+			'type' => 'image/gif',
+			'size' => '',
+			'tmp_name' => $this->path . 'copies/' . $tmp_name,
+			'error' => '',
+		);
+
+		$php_ini = $this->getMockBuilder('\bantu\IniGetWrapper\IniGetWrapper')
+			->getMock();
+		$php_ini->expects($this->any())
+			->method('getBool')
+			->with($this->anything())
+			->willReturn($safe_mode_on);
+		$upload = new phpbb_mock_fileupload();
+		$upload->max_filesize = self::UPLOAD_MAX_FILESIZE;
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, $php_ini, new \fastImageSize\fastImagesize,  '', $this->mimetype_guesser);
+		$filespec->set_upload_ary($upload_ary);
+		$filespec->local = false;
+		$filespec->extension = 'gif';
+		$filespec->set_upload_namespace($upload);
+
+		$this->assertEquals($move_success, $filespec->move_file($this->path . 'copies'));
+		$this->assertEquals($filespec->file_moved, file_exists($this->path . 'copies/gif_moved'));
+		$this->assertSame($expected_error, $filespec->error);
+	}
+
+	public function data_move_file_imagesize()
+	{
+		return array(
+			array(
+				array(
+					'width'		=> 2,
+					'height'	=> 2,
+					'type'		=> IMAGETYPE_GIF,
+				),
+				array()
+			),
+			array(
+				array(
+					'width'		=> 2,
+					'height'	=> 2,
+					'type'		=> -1,
+				),
+				array('Image file type -1 for mimetype image/gif not supported.')
+			),
+			array(
+				array(
+					'width'		=> 0,
+					'height'	=> 0,
+					'type'		=> IMAGETYPE_GIF,
+				),
+				array('The image file you tried to attach is invalid.')
+			),
+			array(
+				false,
+				array('It was not possible to determine the dimensions of the image. Please verify that the URL you entered is correct.')
+			)
+		);
+	}
+
+	/**
+	 * @dataProvider data_move_file_imagesize
+	 */
+	public function test_move_file_imagesize($imagesize_return, $expected_error)
+	{
+		// Initialise a blank filespec object for use with trivial methods
+		$upload_ary = array(
+			'name' => 'gif_moved',
+			'type' => 'image/gif',
+			'size' => '',
+			'tmp_name' => $this->path . 'copies/gif_copy',
+			'error' => '',
+		);
+
+		$imagesize = $this->getMockBuilder('\fastImageSize\fastImageSize')
+			->getMock();
+		$imagesize->expects($this->any())
+			->method('getImageSize')
+			->with($this->anything())
+			->willReturn($imagesize_return);
+
+		$upload = new phpbb_mock_fileupload();
+		$upload->max_filesize = self::UPLOAD_MAX_FILESIZE;
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, $imagesize,  '', $this->mimetype_guesser);
+		$filespec->set_upload_ary($upload_ary);
+		$filespec->local = false;
+		$filespec->extension = 'gif';
+		$filespec->set_upload_namespace($upload);
+
+		$this->assertEquals(true, $filespec->move_file($this->path . 'copies'));
+		$this->assertEquals($filespec->file_moved, file_exists($this->path . 'copies/gif_moved'));
+		$this->assertSame($expected_error, $filespec->error);
+	}
+
 	/**
 	* @dataProvider clean_filename_variables
 	*/
@@ -419,7 +530,7 @@ class phpbb_filespec_test extends phpbb_test_case
 
 	public function test_is_uploaded()
 	{
-		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, $this->phpbb_root_path, null);
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, new \fastImageSize\fastImageSize(), $this->phpbb_root_path, null);
 		$reflection_filespec = new ReflectionClass($filespec);
 		$plupload_property = $reflection_filespec->getProperty('plupload');
 		$plupload_property->setAccessible(true);
diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index 8675567e22..bb3092528b 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -72,6 +72,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 			$this->filesystem,
 			$this->language,
 			$this->php_ini,
+			new \fastImageSize\fastImageSize(),
 			$phpbb_root_path,
 			new \phpbb\mimetype\guesser(array(
 				'mimetype.extension_guesser' => new \phpbb\mimetype\extension_guesser(),
@@ -131,7 +132,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
-		$file = new \phpbb\files\filespec($this->filesystem, $this->language, $this->php_ini, $this->phpbb_root_path);
+		$file = new \phpbb\files\filespec($this->filesystem, $this->language, $this->php_ini, new \fastImageSize\fastImageSize(), $this->phpbb_root_path);
 		$file->set_upload_ary(array(
 				'size'	=> 50,
 				'tmp_name'	=> dirname(__FILE__) . '/fixture/disallowed',
-- 
cgit v1.2.1


From 327e36a4d68ff9607967af52ef8f6a00c60343ff Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 9 Sep 2015 09:41:40 +0200
Subject: [ticket/13904] Modify files for updated fast-image-size library

PHPBB3-13904
---
 tests/upload/filespec_test.php   | 12 ++++++------
 tests/upload/fileupload_test.php |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'tests/upload')

diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index 10a442cd1d..08c064698c 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -93,7 +93,7 @@ class phpbb_filespec_test extends phpbb_test_case
 			'error' => '',
 		);
 
-		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, new \fastImageSize\fastImageSize(), $this->phpbb_root_path, $this->mimetype_guesser);
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, new \FastImageSize\FastImageSize(), $this->phpbb_root_path, $this->mimetype_guesser);
 		return $filespec->set_upload_ary(array_merge($upload_ary, $override));
 	}
 
@@ -114,7 +114,7 @@ class phpbb_filespec_test extends phpbb_test_case
 
 	public function test_empty_upload_ary()
 	{
-		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, new \fastImageSize\fastImageSize(), $this->phpbb_root_path, $this->mimetype_guesser);
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, new \FastImageSize\FastImageSize(), $this->phpbb_root_path, $this->mimetype_guesser);
 		$this->assertInstanceOf('\phpbb\files\filespec', $filespec->set_upload_ary(array()));
 		$this->assertTrue($filespec->init_error());
 	}
@@ -262,7 +262,7 @@ class phpbb_filespec_test extends phpbb_test_case
 	 */
 	public function test_clean_filename_avatar($filename, $expected, $mode, $prefix = '', $user_id = '')
 	{
-		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, new \fastImageSize\fastImageSize(), $this->phpbb_root_path, $this->mimetype_guesser);
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, new \FastImageSize\FastImageSize(), $this->phpbb_root_path, $this->mimetype_guesser);
 
 		if ($filename)
 		{
@@ -435,7 +435,7 @@ class phpbb_filespec_test extends phpbb_test_case
 			->willReturn($safe_mode_on);
 		$upload = new phpbb_mock_fileupload();
 		$upload->max_filesize = self::UPLOAD_MAX_FILESIZE;
-		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, $php_ini, new \fastImageSize\fastImagesize,  '', $this->mimetype_guesser);
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, $php_ini, new \FastImageSize\FastImagesize,  '', $this->mimetype_guesser);
 		$filespec->set_upload_ary($upload_ary);
 		$filespec->local = false;
 		$filespec->extension = 'gif';
@@ -494,7 +494,7 @@ class phpbb_filespec_test extends phpbb_test_case
 			'error' => '',
 		);
 
-		$imagesize = $this->getMockBuilder('\fastImageSize\fastImageSize')
+		$imagesize = $this->getMockBuilder('\FastImageSize\FastImageSize')
 			->getMock();
 		$imagesize->expects($this->any())
 			->method('getImageSize')
@@ -530,7 +530,7 @@ class phpbb_filespec_test extends phpbb_test_case
 
 	public function test_is_uploaded()
 	{
-		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, new \fastImageSize\fastImageSize(), $this->phpbb_root_path, null);
+		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, new \FastImageSize\FastImageSize(), $this->phpbb_root_path, null);
 		$reflection_filespec = new ReflectionClass($filespec);
 		$plupload_property = $reflection_filespec->getProperty('plupload');
 		$plupload_property->setAccessible(true);
diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index bb3092528b..01b625efbb 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -72,7 +72,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 			$this->filesystem,
 			$this->language,
 			$this->php_ini,
-			new \fastImageSize\fastImageSize(),
+			new \FastImageSize\FastImageSize(),
 			$phpbb_root_path,
 			new \phpbb\mimetype\guesser(array(
 				'mimetype.extension_guesser' => new \phpbb\mimetype\extension_guesser(),
@@ -132,7 +132,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
 		$upload->set_allowed_extensions(array('jpg'))
 			->set_max_filesize(1000);
-		$file = new \phpbb\files\filespec($this->filesystem, $this->language, $this->php_ini, new \fastImageSize\fastImageSize(), $this->phpbb_root_path);
+		$file = new \phpbb\files\filespec($this->filesystem, $this->language, $this->php_ini, new \FastImageSize\FastImageSize(), $this->phpbb_root_path);
 		$file->set_upload_ary(array(
 				'size'	=> 50,
 				'tmp_name'	=> dirname(__FILE__) . '/fixture/disallowed',
-- 
cgit v1.2.1


From 40e614f56436447dffd272351e23b79c2da9fa3f Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 9 Sep 2015 12:58:22 +0200
Subject: [ticket/13904] Fix tests after changes to factory

PHPBB3-13904
---
 tests/upload/fileupload_test.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests/upload')

diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index 01b625efbb..211e72a6e9 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -185,7 +185,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 			->set_max_filesize(1000);
 
 		copy($this->path . 'jpg', $this->path . 'jpg.jpg');
-		$file = $upload->handle_upload('local', $this->path . 'jpg.jpg');
+		$file = $upload->handle_upload('files.types.local', $this->path . 'jpg.jpg');
 		$this->assertEquals(0, sizeof($file->error));
 		$this->assertFalse($file->additional_checks());
 		$this->assertTrue($file->move_file('../tests/upload/fixture/copies', true));
@@ -199,7 +199,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 			->set_max_filesize(1000);
 
 		copy($this->path . 'jpg', $this->path . 'jpg.jpg');
-		$file = $upload->handle_upload('local', $this->path . 'jpg.jpg');
+		$file = $upload->handle_upload('files.types.local', $this->path . 'jpg.jpg');
 		$this->assertEquals(0, sizeof($file->error));
 		$this->assertFalse($file->move_file('../tests/upload/fixture'));
 		$this->assertFalse($file->file_moved);
@@ -214,7 +214,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 		copy($this->path . 'jpg', $this->path . 'jpg.jpg');
 		copy($this->path . 'jpg', $this->path . 'copies/jpg.jpg');
-		$file = $upload->handle_upload('local', $this->path . 'jpg.jpg');
+		$file = $upload->handle_upload('files.types.local', $this->path . 'jpg.jpg');
 		$this->assertEquals(0, sizeof($file->error));
 		$file->move_file('../tests/upload/fixture/copies', true);
 		$this->assertEquals(0, sizeof($file->error));
-- 
cgit v1.2.1


From 759dc9bb84d712c11148a9689d294c09aa0f81d4 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 13 Sep 2015 09:30:56 +0200
Subject: [ticket/13904] Set properties to protected where possible in filespec

PHPBB3-13904
---
 tests/upload/filespec_test.php   | 31 +++++++++++++++++++------------
 tests/upload/fileupload_test.php |  2 +-
 2 files changed, 20 insertions(+), 13 deletions(-)

(limited to 'tests/upload')

diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index 08c064698c..1351b46002 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -82,6 +82,13 @@ class phpbb_filespec_test extends phpbb_test_case
 		$this->phpbb_root_path = $phpbb_root_path;
 	}
 
+	private function set_reflection_property(&$class, $property_name, $value)
+	{
+		$property = new ReflectionProperty($class, $property_name);
+		$property->setAccessible(true);
+		$property->setValue($class, $value);
+	}
+
 	private function get_filespec($override = array())
 	{
 		// Initialise a blank filespec object for use with trivial methods
@@ -141,8 +148,8 @@ class phpbb_filespec_test extends phpbb_test_case
 		$upload = new phpbb_mock_fileupload();
 		$filespec = $this->get_filespec();
 		$filespec->set_upload_namespace($upload);
-		$filespec->file_moved = true;
-		$filespec->filesize = $filespec->get_filesize($this->path . $filename);
+		$this->set_reflection_property($filespec, 'file_moved', true);
+		$this->set_reflection_property($filespec, 'filesize', $filespec->get_filesize($this->path . $filename));
 
 		$this->assertEquals($expected, $filespec->additional_checks());
 	}
@@ -153,7 +160,7 @@ class phpbb_filespec_test extends phpbb_test_case
 		$filespec = $this->get_filespec();
 		$filespec->set_upload_namespace($upload);
 		$upload->valid_dimensions = false;
-		$filespec->file_moved = true;
+		$this->set_reflection_property($filespec, 'file_moved', true);
 		$upload->max_filesize = 0;
 
 		$this->assertEquals(false, $filespec->additional_checks());
@@ -381,12 +388,12 @@ class phpbb_filespec_test extends phpbb_test_case
 			'name' => $realname,
 			'type' => $mime_type,
 		));
-		$filespec->extension = $extension;
+		$this->set_reflection_property($filespec, 'extension', $extension);
 		$filespec->set_upload_namespace($upload);
-		$filespec->local = true;
+		$this->set_reflection_property($filespec, 'local', true);
 
 		$this->assertEquals($expected, $filespec->move_file($this->path . 'copies'));
-		$this->assertEquals($filespec->file_moved, file_exists($this->path . 'copies/' . $realname));
+		$this->assertEquals($filespec->get('file_moved'), file_exists($this->path . 'copies/' . $realname));
 		if ($error)
 		{
 			$this->assertEquals($error, $filespec->error[0]);
@@ -437,12 +444,12 @@ class phpbb_filespec_test extends phpbb_test_case
 		$upload->max_filesize = self::UPLOAD_MAX_FILESIZE;
 		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, $php_ini, new \FastImageSize\FastImagesize,  '', $this->mimetype_guesser);
 		$filespec->set_upload_ary($upload_ary);
-		$filespec->local = false;
-		$filespec->extension = 'gif';
+		$this->set_reflection_property($filespec, 'local', false);
+		$this->set_reflection_property($filespec, 'extension', 'gif');
 		$filespec->set_upload_namespace($upload);
 
 		$this->assertEquals($move_success, $filespec->move_file($this->path . 'copies'));
-		$this->assertEquals($filespec->file_moved, file_exists($this->path . 'copies/gif_moved'));
+		$this->assertEquals($filespec->get('file_moved'), file_exists($this->path . 'copies/gif_moved'));
 		$this->assertSame($expected_error, $filespec->error);
 	}
 
@@ -505,12 +512,12 @@ class phpbb_filespec_test extends phpbb_test_case
 		$upload->max_filesize = self::UPLOAD_MAX_FILESIZE;
 		$filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, $imagesize,  '', $this->mimetype_guesser);
 		$filespec->set_upload_ary($upload_ary);
-		$filespec->local = false;
-		$filespec->extension = 'gif';
+		$this->set_reflection_property($filespec, 'local', false);
+		$this->set_reflection_property($filespec, 'extension', 'gif');
 		$filespec->set_upload_namespace($upload);
 
 		$this->assertEquals(true, $filespec->move_file($this->path . 'copies'));
-		$this->assertEquals($filespec->file_moved, file_exists($this->path . 'copies/gif_moved'));
+		$this->assertEquals($filespec->get('file_moved'), file_exists($this->path . 'copies/gif_moved'));
 		$this->assertSame($expected_error, $filespec->error);
 	}
 
diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index 211e72a6e9..05cb8dcf93 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -202,7 +202,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 		$file = $upload->handle_upload('files.types.local', $this->path . 'jpg.jpg');
 		$this->assertEquals(0, sizeof($file->error));
 		$this->assertFalse($file->move_file('../tests/upload/fixture'));
-		$this->assertFalse($file->file_moved);
+		$this->assertFalse($file->get('file_moved'));
 		$this->assertEquals(1, sizeof($file->error));
 	}
 
-- 
cgit v1.2.1


From 14e8113fcf01be7dbdb080458fcbf4e75668cc1a Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Thu, 31 Mar 2016 11:06:47 -0700
Subject: [ticket/14576] Move common required files to bootstrap

PHPBB3-14576
---
 tests/upload/filespec_test.php   | 3 ---
 tests/upload/fileupload_test.php | 2 --
 tests/upload/imagesize_test.php  | 2 --
 3 files changed, 7 deletions(-)

(limited to 'tests/upload')

diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index 1351b46002..18b6deed1f 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -11,9 +11,6 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
-
 class phpbb_filespec_test extends phpbb_test_case
 {
 	const TEST_COUNT = 100;
diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index 05cb8dcf93..fb72823f08 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -11,8 +11,6 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
 require_once __DIR__ . '/../mock/filespec.php';
 
 class phpbb_fileupload_test extends phpbb_test_case
diff --git a/tests/upload/imagesize_test.php b/tests/upload/imagesize_test.php
index d20e866dab..5429bb5c5e 100644
--- a/tests/upload/imagesize_test.php
+++ b/tests/upload/imagesize_test.php
@@ -12,8 +12,6 @@
  *
  */
 
-require_once(__DIR__ . '/../../phpBB/includes/functions.php');
-
 class phpbb_upload_imagesize_test extends \phpbb_test_case
 {
 	/** @var \FastImageSize\FastImageSize */
-- 
cgit v1.2.1


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
---
 tests/upload/fileupload_test.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'tests/upload')

diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php
index fb72823f08..5b3357237d 100644
--- a/tests/upload/fileupload_test.php
+++ b/tests/upload/fileupload_test.php
@@ -173,7 +173,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 			->set_max_filesize(1000);
 		$file = $this->gen_valid_filespec();
 		$upload->common_checks($file);
-		$this->assertEquals(0, sizeof($file->error));
+		$this->assertEquals(0, count($file->error));
 	}
 
 	public function test_local_upload()
@@ -184,7 +184,7 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 		copy($this->path . 'jpg', $this->path . 'jpg.jpg');
 		$file = $upload->handle_upload('files.types.local', $this->path . 'jpg.jpg');
-		$this->assertEquals(0, sizeof($file->error));
+		$this->assertEquals(0, count($file->error));
 		$this->assertFalse($file->additional_checks());
 		$this->assertTrue($file->move_file('../tests/upload/fixture/copies', true));
 		$file->remove();
@@ -198,10 +198,10 @@ class phpbb_fileupload_test extends phpbb_test_case
 
 		copy($this->path . 'jpg', $this->path . 'jpg.jpg');
 		$file = $upload->handle_upload('files.types.local', $this->path . 'jpg.jpg');
-		$this->assertEquals(0, sizeof($file->error));
+		$this->assertEquals(0, count($file->error));
 		$this->assertFalse($file->move_file('../tests/upload/fixture'));
 		$this->assertFalse($file->get('file_moved'));
-		$this->assertEquals(1, sizeof($file->error));
+		$this->assertEquals(1, count($file->error));
 	}
 
 	public function test_move_existent_file_overwrite()
@@ -213,9 +213,9 @@ class phpbb_fileupload_test extends phpbb_test_case
 		copy($this->path . 'jpg', $this->path . 'jpg.jpg');
 		copy($this->path . 'jpg', $this->path . 'copies/jpg.jpg');
 		$file = $upload->handle_upload('files.types.local', $this->path . 'jpg.jpg');
-		$this->assertEquals(0, sizeof($file->error));
+		$this->assertEquals(0, count($file->error));
 		$file->move_file('../tests/upload/fixture/copies', true);
-		$this->assertEquals(0, sizeof($file->error));
+		$this->assertEquals(0, count($file->error));
 		unlink($this->path . 'copies/jpg.jpg');
 	}
 
-- 
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
---
 tests/upload/filespec_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/upload')

diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php
index 18b6deed1f..b41b95d925 100644
--- a/tests/upload/filespec_test.php
+++ b/tests/upload/filespec_test.php
@@ -79,7 +79,7 @@ class phpbb_filespec_test extends phpbb_test_case
 		$this->phpbb_root_path = $phpbb_root_path;
 	}
 
-	private function set_reflection_property(&$class, $property_name, $value)
+	private function set_reflection_property($class, $property_name, $value)
 	{
 		$property = new ReflectionProperty($class, $property_name);
 		$property->setAccessible(true);
-- 
cgit v1.2.1