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/path_helper/path_helper_test.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'tests/path_helper/path_helper_test.php')

diff --git a/tests/path_helper/path_helper_test.php b/tests/path_helper/path_helper_test.php
index 73f0e6bafc..007441bc92 100644
--- a/tests/path_helper/path_helper_test.php
+++ b/tests/path_helper/path_helper_test.php
@@ -21,14 +21,14 @@ class phpbb_path_helper_test extends phpbb_test_case
 	{
 		parent::setUp();
 
-		$filesystem = new \phpbb\filesystem();
+		$filesystem = new \phpbb\filesystem\filesystem();
 		$this->set_phpbb_root_path($filesystem);
 
 		$this->path_helper = new \phpbb\path_helper(
 			new \phpbb\symfony_request(
 				new phpbb_mock_request()
 			),
-			new \phpbb\filesystem(),
+			new \phpbb\filesystem\filesystem(),
 			$this->getMock('\phpbb\request\request'),
 			$this->phpbb_root_path,
 			'php'
@@ -56,7 +56,7 @@ class phpbb_path_helper_test extends phpbb_test_case
 
 	public function basic_update_web_root_path_data()
 	{
-		$filesystem = new \phpbb\filesystem();
+		$filesystem = new \phpbb\filesystem\filesystem();
 		$this->set_phpbb_root_path($filesystem);
 
 		return array(
@@ -90,7 +90,7 @@ class phpbb_path_helper_test extends phpbb_test_case
 
 	public function update_web_root_path_data()
 	{
-		$this->set_phpbb_root_path(new \phpbb\filesystem());
+		$this->set_phpbb_root_path(new \phpbb\filesystem\filesystem());
 
 		return array(
 			array(
@@ -158,7 +158,7 @@ class phpbb_path_helper_test extends phpbb_test_case
 
 		$path_helper = new \phpbb\path_helper(
 			$symfony_request,
-			new \phpbb\filesystem(),
+			new \phpbb\filesystem\filesystem(),
 			$this->getMock('\phpbb\request\request'),
 			$this->phpbb_root_path,
 			'php'
-- 
cgit v1.2.1


From 20d85433fcba5dd892a7f82b8be2bac34546536f Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Sun, 7 Feb 2016 15:15:01 +0100
Subject: =?UTF-8?q?[ticket/14440]=C2=A0Add=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PHPBB3-14440
---
 tests/path_helper/path_helper_test.php | 37 ++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'tests/path_helper/path_helper_test.php')

diff --git a/tests/path_helper/path_helper_test.php b/tests/path_helper/path_helper_test.php
index 007441bc92..49dd40fbec 100644
--- a/tests/path_helper/path_helper_test.php
+++ b/tests/path_helper/path_helper_test.php
@@ -135,6 +135,43 @@ class phpbb_path_helper_test extends phpbb_test_case
 				'/phpbb3-fork/phpBB/app.php',
 				'./../',
 			),
+
+			// No correction if the path is already prepend by the web root path
+			array(
+				'./../' . $this->phpbb_root_path . 'test.php',
+				'//',
+				null,
+				null,
+				'',
+			),
+			array(
+				'./../' . $this->phpbb_root_path . 'test.php',
+				'//',
+				'foo/bar.php',
+				'bar.php',
+				'',
+			),
+			array(
+				'./../../' . $this->phpbb_root_path . 'test.php',
+				'/foo/template',
+				'/phpbb3-fork/phpBB/app.php/foo/template',
+				'/phpbb3-fork/phpBB/app.php',
+				'',
+			),
+			array(
+				'./../' . $this->phpbb_root_path . 'test.php',
+				'/foo/template',
+				'/phpbb3-fork/phpBB/foo/template',
+				'/phpbb3-fork/phpBB/app.php',
+				'',
+			),
+			array(
+				'./../'.$this->phpbb_root_path . 'test.php',
+				'/',
+				'/phpbb3-fork/phpBB/app.php/',
+				'/phpbb3-fork/phpBB/app.php',
+				'',
+			),
 		);
 	}
 
-- 
cgit v1.2.1