From a83bcaa8ac5e574d7616950cb8cd29221f6b75cc Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Thu, 13 Aug 2015 10:53:34 +0200
Subject: [PATCH] [ticket/14099] Fix tests

PHPBB3-14099
---
 phpBB/phpbb/template/asset.php              |  8 ++++++++
 tests/template/template_includecss_test.php | 11 ++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/phpBB/phpbb/template/asset.php b/phpBB/phpbb/template/asset.php
index 67dbd7b357..e2edbcddc1 100644
--- a/phpBB/phpbb/template/asset.php
+++ b/phpBB/phpbb/template/asset.php
@@ -152,6 +152,13 @@ class asset
 	*/
 	public function set_path($path, $urlencode = false)
 	{
+		// Since 1.7.0 Twig returns the real path of the file. We need it to be relative to the working directory.
+		$real_root_path = realpath('.') . DIRECTORY_SEPARATOR;
+		if ($real_root_path && substr($path . DIRECTORY_SEPARATOR, 0, strlen($real_root_path)) === $real_root_path)
+		{
+			$path = str_replace('\\', '/', substr($path, strlen($real_root_path)));
+		}
+
 		if ($urlencode)
 		{
 			$paths = explode('/', $path);
@@ -161,6 +168,7 @@ class asset
 			}
 			$path = implode('/', $paths);
 		}
+
 		$this->components['path'] = $path;
 	}
 
diff --git a/tests/template/template_includecss_test.php b/tests/template/template_includecss_test.php
index 4ef9b90ec4..b025cd21d5 100644
--- a/tests/template/template_includecss_test.php
+++ b/tests/template/template_includecss_test.php
@@ -55,13 +55,6 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
 
 	public function template_data()
 	{
-		$url_base = explode('/', dirname(__FILE__));
-		foreach ($url_base as &$dir)
-		{
-			$dir = rawurlencode($dir);
-		}
-		$url_base = implode('/', $url_base);
-
 		return array(
 			/*
 			array(
@@ -79,11 +72,11 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
 			),
 			array(
 				array('TEST' => 3),
-				'<link href="' . $url_base . '/ext/include/css/styles/all/theme/test.css?assets_version=1" rel="stylesheet" type="text/css" media="screen" />',
+				'<link href="tests/template/ext/include/css/styles/all/theme/test.css?assets_version=1" rel="stylesheet" type="text/css" media="screen" />',
 			),
 			array(
 				array('TEST' => 4),
-				'<link href="' . $url_base . '/ext/include/css/styles/all/theme/child_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen" />',
+				'<link href="tests/template/ext/include/css/styles/all/theme/child_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen" />',
 			),
 		);
 	}