Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700

* github-phpbb/develop:
  [ticket/11832] Correct paths in tests
  [ticket/11832] Correct ROOT_PATH variable
  [ticket/11832] get_url() from phpbb_template_asset should return web path
  [ticket/11832] Fix INCLUDE(JS/CSS)
  [ticket/11832] Fix constructions of phpbb_filesystem
  [ticket/11832] Fix smiley paths
  [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request
  [ticket/11832] Fix build_url and the S_LOGIN_ACTION
  [ticket/11832] Changing comments to say app.php rather than index.php
  [ticket/11832] We must instantiate the $phpbb_filesystem in common
  [ticket/11832] Fix the web path corrections
  [ticket/11832] More extensive testing
  [ticket/11832] Use dirname(__FILE__)
  [ticket/11832] Use $phpbb_filesystem instead of the container in append_sid
  Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework"
  [ticket/11832] Make $phpbb_container a global initiated by the framework
  [ticket/11832] Fix log tests
  [ticket/11832] update_web_root_path helper and tests
  [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)

Conflicts:
	phpBB/common.php
	phpBB/config/services.yml
	phpBB/includes/bbcode.php
	phpBB/includes/functions.php
	phpBB/includes/functions_messenger.php
	phpBB/install/index.php
	phpBB/phpbb/filesystem.php
	phpBB/phpbb/template/twig/environment.php
	phpBB/phpbb/template/twig/node/includeasset.php
	phpBB/phpbb/template/twig/twig.php
	tests/controller/helper_url_test.php
	tests/dbal/migrator_test.php
	tests/extension/manager_test.php
	tests/extension/metadata_manager_test.php
	tests/filesystem/clean_path_test.php
	tests/mock/extension_manager.php
	tests/template/template_events_test.php
	tests/template/template_test_case.php
	tests/template/template_test_case_with_tree.php
	tests/test_framework/phpbb_functional_test_case.php

phpBB/phpbb/filesystem.php

@@ -8,6 +8,7 @@
 */
 
 namespace phpbb;
+
 /**
 * @ignore
 */
@@ -22,6 +23,151 @@ if (!defined('IN_PHPBB'))
 */
 class filesystem
 {
+	/** @var phpbb_symfony_request */
+	protected $symfony_request;
+
+	/** @var string */
+	protected $phpbb_root_path;
+
+	/** @var string */
+	protected $adm_relative_path;
+
+	/** @var string */
+	protected $php_ext;
+
+	/** @var string */
+	protected $web_root_path;
+
+	/**
+	* Constructor
+	*
+	* @param phpbb_symfony_request $symfony_request
+	* @param string $phpbb_root_path Relative path to phpBB root
+	* @param string $php_ext PHP extension (php)
+	*/
+	public function __construct(phpbb_symfony_request $symfony_request, $phpbb_root_path, $php_ext, $adm_relative_path = null)
+	{
+		$this->symfony_request = $symfony_request;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
+		$this->adm_relative_path = $adm_relative_path;
+	}
+
+	/**
+	* Get the phpBB root path
+	*
+	* @return string
+	*/
+	public function get_phpbb_root_path()
+	{
+		return $this->phpbb_root_path;
+	}
+
+	/**
+	* Get the adm root path
+	*
+	* @return string
+	*/
+	public function get_adm_relative_path()
+	{
+		return $this->adm_relative_path;
+	}
+
+	/**
+	* Get the php extension
+	*
+	* @return string
+	*/
+	public function get_php_ext()
+	{
+		return $this->php_ext;
+	}
+
+	/**
+	* Update a path to the correct relative root path
+	*
+	* This replaces $phpbb_root_path . some_url with
+	*	get_web_root_path() . some_url OR if $phpbb_root_path
+	*	is not at the beginning of $path, just prepends the
+	*	web root path
+	*
+	* @param string $path The path to be updated
+	* @return string
+	*/
+	public function update_web_root_path($path)
+	{
+		$web_root_path = $this->get_web_root_path($this->symfony_request);
+
+		if (strpos($path, $this->phpbb_root_path) === 0)
+		{
+			$path = substr($path, strlen($this->phpbb_root_path));
+		}
+
+		return $web_root_path . $path;
+	}
+
+	/**
+	* Get a relative root path from the current URL
+	*
+	* @return string
+	*/
+	public function get_web_root_path()
+	{
+		if ($this->symfony_request === null)
+		{
+			return $this->phpbb_root_path;
+		}
+
+		if (null !== $this->web_root_path)
+		{
+			return $this->web_root_path;
+		}
+
+		// Path info (e.g. /foo/bar)
+		$path_info = $this->clean_path($this->symfony_request->getPathInfo());
+
+		// Full request URI (e.g. phpBB/app.php/foo/bar)
+		$request_uri = $this->symfony_request->getRequestUri();
+
+		// Script name URI (e.g. phpBB/app.php)
+		$script_name = $this->symfony_request->getScriptName();
+
+		/*
+		* If the path info is empty (single /), then we're not using
+		*	a route like app.php/foo/bar
+		*/
+		if ($path_info === '/')
+		{
+			return $this->web_root_path = $this->phpbb_root_path;
+		}
+
+		// How many corrections might we need?
+		$corrections = substr_count($path_info, '/');
+
+		/*
+		* If the script name (e.g. phpBB/app.php) exists in the
+		*	requestUri (e.g. phpBB/app.php/foo/template), then we
+		*	are have a non-rewritten URL.
+		*/
+		if (strpos($request_uri, $script_name) === 0)
+		{
+			/*
+			* Append ../ to the end of the phpbb_root_path as many times
+			*	as / exists in path_info
+			*/
+			return $this->web_root_path = $this->phpbb_root_path . str_repeat('../', $corrections);
+		}
+
+		/*
+		* If we're here it means we're at a re-written path, so we must
+		*	correct the relative path for web URLs. We must append ../
+		*	to the end of the root path as many times as / exists in path_info
+		*	less one time (because the script, e.g. /app.php, doesn't exist in
+		*	the URL)
+		*/
+		return $this->web_root_path = $this->phpbb_root_path . str_repeat('../', $corrections - 1);
+	}
+
 	/**
 	* Eliminates useless . and .. components from specified path.
 	*

phpBB/phpbb/symfony_request.php

@@ -0,0 +1,46 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class phpbb_symfony_request extends Request
+{
+	/**
+	* Constructor
+	*
+	* @param phpbb_request_interface $phpbb_request
+	*/
+	public function __construct(phpbb_request_interface $phpbb_request)
+	{
+		// This function is meant to sanitize the global input arrays
+		$sanitizer = function(&$value, $key) {
+			$type_cast_helper = new phpbb_request_type_cast_helper();
+			$type_cast_helper->set_var($value, $value, gettype($value), true);
+		};
+
+		$get_parameters = $phpbb_request->get_super_global(phpbb_request_interface::GET);
+		$post_parameters = $phpbb_request->get_super_global(phpbb_request_interface::POST);
+		$server_parameters = $phpbb_request->get_super_global(phpbb_request_interface::SERVER);
+		$files_parameters = $phpbb_request->get_super_global(phpbb_request_interface::FILES);
+		$cookie_parameters = $phpbb_request->get_super_global(phpbb_request_interface::COOKIE);
+
+		array_walk_recursive($get_parameters, $sanitizer);
+		array_walk_recursive($post_parameters, $sanitizer);
+
+		parent::__construct($get_parameters, $post_parameters, array(), $cookie_parameters, $files_parameters, $server_parameters);
+	}
+}

phpBB/phpbb/template/asset.php

@@ -21,13 +21,18 @@ class asset
 {
 	protected $components = array();
 
+	/** @var phpbb_filesystem **/
+	protected $phpbb_filesystem;
+
 	/**
 	* Constructor
 	*
 	* @param string $url URL
 	*/
-	public function __construct($url)
+	public function __construct($url, phpbb_filesystem $phpbb_filesystem)
 	{
+		$this->phpbb_filesystem = $phpbb_filesystem;
+
 		$this->set_url($url);
 	}
 
@@ -114,7 +119,7 @@ class asset
 	*/
 	public function get_url()
 	{
-		return $this->join_url($this->components);
+		return $this->phpbb_filesystem->update_web_root_path($this->join_url($this->components));
 	}
 
 	/**

phpBB/phpbb/template/twig/environment.php

@@ -25,9 +25,15 @@ class environment extends \Twig_Environment
 	/** @var \phpbb\config\config */
 	protected $phpbb_config;
 
+	/** @var phpbb_filesystem */
+	protected $phpbb_filesystem;
+
 	/** @var string */
 	protected $phpbb_root_path;
 
+	/** @var string */
+	protected $web_root_path;
+
 	/** @var array **/
 	protected $namespace_look_up_order = array('__main__');
 
@@ -36,15 +42,19 @@ class environment extends \Twig_Environment
 	*
 	* @param \phpbb\config\config $phpbb_config
 	* @param array $phpbb_extensions Array of enabled extensions (name => path)
+	* @param \phpbb\filesystem
 	* @param string $phpbb_root_path
 	* @param Twig_LoaderInterface $loader
 	* @param array $options Array of options to pass to Twig
 	*/
-	public function __construct($phpbb_config, $phpbb_extensions, $phpbb_root_path, \Twig_LoaderInterface $loader = null, $options = array())
+	public function __construct($phpbb_config, $phpbb_extensions, \phpbb\filesystem $phpbb_filesystem, \Twig_LoaderInterface $loader = null, $options = array())
 	{
 		$this->phpbb_config = $phpbb_config;
 		$this->phpbb_extensions = $phpbb_extensions;
-		$this->phpbb_root_path = $phpbb_root_path;
+
+		$this->phpbb_filesystem = $phpbb_filesystem;
+		$this->phpbb_root_path = $this->phpbb_filesystem->get_phpbb_root_path();
+		$this->web_root_path = $this->phpbb_filesystem->get_web_root_path();
 
 		return parent::__construct($loader, $options);
 	}
@@ -81,6 +91,26 @@ class environment extends \Twig_Environment
 		return $this->phpbb_root_path;
 	}
 
+	/**
+	* Get the web root path
+	*
+	* @return string
+	*/
+	public function get_web_root_path()
+	{
+		return $this->web_root_path;
+	}
+
+	/**
+	* Get the phpbb_filesystem object
+	*
+	* @return phpbb_filesystem
+	*/
+	public function get_filesystem()
+	{
+		return $this->phpbb_filesystem;
+	}
+
 	/**
 	* Get the namespace look up order
 	*

phpBB/phpbb/template/twig/node/includeasset.php

@@ -35,7 +35,7 @@ abstract class includeasset extends \Twig_Node
 			->write("\$asset_file = ")
 			->subcompile($this->getNode('expr'))
 			->raw(";\n")
-			->write("\$asset = new \phpbb\\template\asset(\$asset_file);\n")
+			->write("\$asset = new \phpbb\\template\\asset(\$asset_file, \$this->getEnvironment()->get_filesystem());\n")
 			->write("if (substr(\$asset_file, 0, 2) !== './' && \$asset->is_relative()) {\n")
 			->indent()
 				->write("\$asset_path = \$asset->get_path();")

phpBB/phpbb/template/twig/twig.php

@@ -32,6 +32,12 @@ class twig extends \phpbb\template\base
 	*/
 	private $cachepath = '';
 
+	/**
+	* phpBB filesystem
+	* @var \phpbb\filesystem
+	*/
+	protected $phpbb_filesystem;
+
 	/**
 	* phpBB root path
 	* @var string
@@ -73,24 +79,23 @@ class twig extends \phpbb\template\base
 	/**
 	* Constructor.
 	*
-	* @param string $phpbb_root_path phpBB root path
-	* @param string $php_ext php extension (typically 'php')
+	* @param \phpbb\filesystem $phpbb_filesystem
 	* @param \phpbb\config\config $config
 	* @param \phpbb\user $user
 	* @param \phpbb\template\context $context template context
 	* @param \phpbb\extension\manager $extension_manager extension manager, if null then template events will not be invoked
-	* @param string $adm_relative_path relative path to adm directory
 	*/
-	public function __construct($phpbb_root_path, $php_ext, $config, $user, \phpbb\template\context $context, \phpbb\extension\manager $extension_manager = null, $adm_relative_path = null)
+	public function __construct(\phpbb\filesystem $phpbb_filesystem, $config, $user, \phpbb\template\context $context, \phpbb\extension\manager $extension_manager = null)
 	{
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->php_ext = $php_ext;
+		$this->phpbb_filesystem = $phpbb_filesystem;
+		$this->phpbb_root_path = $phpbb_filesystem->get_phpbb_root_path();
+		$this->php_ext = $phpbb_filesystem->get_php_ext();
 		$this->config = $config;
 		$this->user = $user;
 		$this->context = $context;
 		$this->extension_manager = $extension_manager;
 
-		$this->cachepath = $phpbb_root_path . 'cache/twig/';
+		$this->cachepath = $this->phpbb_root_path . 'cache/twig/';
 
 		// Initiate the loader, __main__ namespace paths will be setup later in set_style_names()
 		$loader = new \phpbb\template\twig\loader('');
@@ -98,7 +103,7 @@ class twig extends \phpbb\template\base
 		$this->twig = new \phpbb\template\twig\environment(
 			$this->config,
 			($this->extension_manager) ? $this->extension_manager->all_enabled() : array(),
-			$this->phpbb_root_path,
+			$this->phpbb_filesystem,
 			$loader,
 			array(
 				'cache'			=> (defined('IN_INSTALL')) ? false : $this->cachepath,
@@ -120,9 +125,9 @@ class twig extends \phpbb\template\base
 		$this->twig->setLexer($lexer);
 
 		// Add admin namespace
-		if ($adm_relative_path !== null && is_dir($this->phpbb_root_path . $adm_relative_path . 'style/'))
+		if ($this->phpbb_filesystem->get_adm_relative_path() !== null && is_dir($this->phpbb_root_path . $this->phpbb_filesystem->get_adm_relative_path() . 'style/'))
 		{
-			$this->twig->getLoader()->setPaths($this->phpbb_root_path . $adm_relative_path . 'style/', 'admin');
+			$this->twig->getLoader()->setPaths($this->phpbb_root_path . $this->phpbb_filesystem->get_adm_relative_path() . 'style/', 'admin');
 		}
 	}