From 147a713cc066d493b50b82a9d475aa9af940e2b4 Mon Sep 17 00:00:00 2001
From: s9e <s9e.dev@gmail.com>
Date: Sat, 22 Nov 2014 20:00:58 +0100
Subject: [ticket/11768] This commit integrates s9e\TextFormatter

This commit integrates s9e\TextFormatter as outlined in
http://area51.phpbb.com/phpBB/viewtopic.php?f=108&t=44467

PHPBB3-11768
---
 tests/test_framework/phpbb_test_case_helpers.php | 210 +++++++++++++++++++++++
 1 file changed, 210 insertions(+)

(limited to 'tests/test_framework/phpbb_test_case_helpers.php')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index dee70ad016..d0b1573e61 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -11,6 +11,8 @@
 *
 */
 
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
 class phpbb_test_case_helpers
 {
 	protected $expectedTriggerError = false;
@@ -298,4 +300,212 @@ class phpbb_test_case_helpers
 			}
 		}
 	}
+
+	/**
+	* Set working instances of the text_formatter.* services
+	*
+	* If no container is passed, the global $phpbb_container will be used and/or
+	* created if applicable
+	*
+	* @param  ContainerInterface $container   Service container
+	* @param  string             $fixture     Path to the XML fixture
+	* @param  string             $styles_path Path to the styles dir
+	* @return ContainerInterface
+	*/
+	public function set_s9e_services(ContainerInterface $container = null, $fixture = null, $styles_path = null)
+	{
+		static $first_run;
+		global $phpbb_container, $phpbb_root_path, $phpEx;
+
+		$cache_dir = __DIR__ . '/../tmp/';
+
+		// Remove old cache files on first run
+		if (!isset($first_run))
+		{
+			$first_run = 1;
+
+			array_map('unlink', array_merge(
+				glob($cache_dir . 'data_s9e_*'),
+				glob($cache_dir . 's9e_*')
+			));
+		}
+
+		if (!isset($container))
+		{
+			if (!isset($phpbb_container))
+			{
+				$phpbb_container = new phpbb_mock_container_builder;
+			}
+
+			$container = $phpbb_container;
+		}
+
+		if (!isset($fixture))
+		{
+			$fixture = __DIR__ . '/../text_formatter/s9e/fixtures/default_formatting.xml';
+		}
+
+		if (!isset($styles_path))
+		{
+			$styles_path = $phpbb_root_path . 'styles/';
+		}
+
+		$dataset = new DOMDocument;
+		$dataset->load($fixture);
+
+		$tables = array(
+			'phpbb_bbcodes' => array(),
+			'phpbb_smilies' => array(),
+			'phpbb_styles'  => array(),
+			'phpbb_words'   => array()
+		);
+		foreach ($dataset->getElementsByTagName('table') as $table)
+		{
+			$name = $table->getAttribute('name');
+			$columns = array();
+
+			foreach ($table->getElementsByTagName('column') as $column)
+			{
+				$columns[] = $column->textContent;
+			}
+
+			foreach ($table->getElementsByTagName('row') as $row)
+			{
+				$values = array();
+
+				foreach ($row->getElementsByTagName('value') as $value)
+				{
+					$values[] = $value->textContent;
+				}
+
+				$tables[$name][] = array_combine($columns, $values);
+			}
+		}
+
+		// Set up a default style if there's none set
+		if (empty($tables['phpbb_styles']))
+		{
+			$tables['phpbb_styles'][] = array(
+				'style_id' => 1,
+				'style_path' => 'prosilver',
+				'bbcode_bitfield' => 'kNg='
+			);
+		}
+
+		// Mock the DAL, make it return data from the fixture
+		$mb = $this->test_case->getMockBuilder('phpbb\\textformatter\\data_access');
+		$mb->setMethods(array('get_bbcodes', 'get_smilies', 'get_styles', 'get_words'));
+		$mb->setConstructorArgs(array(
+			$this->test_case->getMock('phpbb\\db\\driver\\driver'),
+			'phpbb_bbcodes',
+			'phpbb_smilies',
+			'phpbb_styles',
+			'phpbb_words',
+			$styles_path
+		));
+
+		$dal = $mb->getMock();
+		$container->set('text_formatter.data_access', $dal);
+
+		$dal->expects($this->test_case->any())
+		    ->method('get_bbcodes')
+		    ->will($this->test_case->returnValue($tables['phpbb_bbcodes']));
+		$dal->expects($this->test_case->any())
+		    ->method('get_smilies')
+		    ->will($this->test_case->returnValue($tables['phpbb_smilies']));
+		$dal->expects($this->test_case->any())
+		    ->method('get_styles')
+		    ->will($this->test_case->returnValue($tables['phpbb_styles']));
+		$dal->expects($this->test_case->any())
+		    ->method('get_words')
+		    ->will($this->test_case->returnValue($tables['phpbb_words']));
+
+		// Cache the parser and renderer with a key based on this method's arguments
+		$cache = new \phpbb\cache\driver\file($cache_dir);
+		$prefix = '_s9e_' . md5(serialize(func_get_args()));
+		$cache_key_parser = $prefix . '_parser';
+		$cache_key_renderer = $prefix . '_renderer';
+
+		// Create a path_helper
+		if (!$container->has('path_helper'))
+		{
+			$container->set(
+				'path_helper',
+				new \phpbb\path_helper(
+					new \phpbb\symfony_request(
+						new phpbb_mock_request()
+					),
+					new \phpbb\filesystem(),
+					$this->test_case->getMock('\phpbb\request\request'),
+					$phpbb_root_path,
+					$phpEx
+				)
+			);
+		}
+
+		// Create and register the text_formatter.s9e.factory service
+		$factory = new \phpbb\textformatter\s9e\factory($dal, $cache, $cache_dir, $cache_key_parser, $cache_key_renderer);
+		$container->set('text_formatter.s9e.factory', $factory);
+
+		// Create a user if none was provided, and add the common lang strings
+		if ($container->has('user'))
+		{
+			$user = $container->get('user');
+		}
+		else
+		{
+			$user = new \phpbb\user('\phpbb\datetime');
+			$user->optionset('viewcensors', true);
+			$user->optionset('viewflash', true);
+			$user->optionset('viewimg', true);
+			$user->optionset('viewsmilies', true);
+		}
+		$user->add_lang('common');
+
+		if (!isset($user->style))
+		{
+			$user->style = array('style_id' => 1);
+		}
+
+		// Create and register the text_formatter.s9e.parser service and its alias
+		$parser = new \phpbb\textformatter\s9e\parser(
+			$cache,
+			$cache_key_parser,
+			$user,
+			$container
+		);
+
+		$container->set('text_formatter.parser', $parser);
+		$container->set('text_formatter.s9e.parser', $parser);
+
+		// Create and register the text_formatter.s9e.renderer service and its alias
+		$renderer = new \phpbb\textformatter\s9e\renderer(
+			$cache,
+			$cache_dir,
+			$cache_key_renderer,
+			$container
+		);
+
+		$root_path = ($container->hasParameter('core.root_path'))
+		           ? $container->getParameter('core.root_path')
+		           : './';
+		$config = ($container->has('config'))
+		        ? $container->get('config')
+		        : new \phpbb\config\config(array('smilies_path' => 'images/smilies', 'allow_nocensors' => false));
+		$auth = ($container->has('auth')) ? $container->get('auth') : new \phpbb\auth\auth;
+
+		// Calls configured in services.yml
+		$renderer->configure_smilies_path($config, $container->get('path_helper'));
+		$renderer->configure_user($user, $config, $auth);
+
+		$container->set('text_formatter.renderer', $renderer);
+		$container->set('text_formatter.s9e.renderer', $renderer);
+
+		// Create and register the text_formatter.s9e.utils service and its alias
+		$utils = new \phpbb\textformatter\s9e\utils;
+		$container->set('text_formatter.utils', $utils);
+		$container->set('text_formatter.s9e.utils', $utils);
+
+		return $container;
+	}
 }
-- 
cgit v1.2.1


From c4a58bce890869f3d44d145cd43cb036ad99ac74 Mon Sep 17 00:00:00 2001
From: s9e <s9e.dev@gmail.com>
Date: Wed, 4 Feb 2015 23:27:04 +0100
Subject: [ticket/11768] Updated test case helper with new signature

PHPBB3-11768
---
 tests/test_framework/phpbb_test_case_helpers.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/test_framework/phpbb_test_case_helpers.php')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index d0b1573e61..3423d83bb1 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -472,7 +472,7 @@ class phpbb_test_case_helpers
 			$cache,
 			$cache_key_parser,
 			$user,
-			$container
+			$factory
 		);
 
 		$container->set('text_formatter.parser', $parser);
@@ -483,7 +483,7 @@ class phpbb_test_case_helpers
 			$cache,
 			$cache_dir,
 			$cache_key_renderer,
-			$container
+			$factory
 		);
 
 		$root_path = ($container->hasParameter('core.root_path'))
-- 
cgit v1.2.1


From b12043d4b076b1e214fd85da28358ba829d47a76 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Tue, 3 Mar 2015 00:43:46 +0100
Subject: [ticket/11768] Renamed get_words() to get_censored_words()

PHPBB3-11768
---
 tests/test_framework/phpbb_test_case_helpers.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/test_framework/phpbb_test_case_helpers.php')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 3423d83bb1..8e49dca40c 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -394,7 +394,7 @@ class phpbb_test_case_helpers
 
 		// Mock the DAL, make it return data from the fixture
 		$mb = $this->test_case->getMockBuilder('phpbb\\textformatter\\data_access');
-		$mb->setMethods(array('get_bbcodes', 'get_smilies', 'get_styles', 'get_words'));
+		$mb->setMethods(array('get_bbcodes', 'get_censored_words', 'get_smilies', 'get_styles'));
 		$mb->setConstructorArgs(array(
 			$this->test_case->getMock('phpbb\\db\\driver\\driver'),
 			'phpbb_bbcodes',
@@ -417,7 +417,7 @@ class phpbb_test_case_helpers
 		    ->method('get_styles')
 		    ->will($this->test_case->returnValue($tables['phpbb_styles']));
 		$dal->expects($this->test_case->any())
-		    ->method('get_words')
+		    ->method('get_censored_words')
 		    ->will($this->test_case->returnValue($tables['phpbb_words']));
 
 		// Cache the parser and renderer with a key based on this method's arguments
-- 
cgit v1.2.1


From b021225148d8ba14e106dd24a25128e3be36992a Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Fri, 6 Mar 2015 13:11:33 +0100
Subject: [ticket/11768] Removed unused var

PHPBB3-11768
---
 tests/test_framework/phpbb_test_case_helpers.php | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'tests/test_framework/phpbb_test_case_helpers.php')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 8e49dca40c..e584c238a2 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -486,9 +486,6 @@ class phpbb_test_case_helpers
 			$factory
 		);
 
-		$root_path = ($container->hasParameter('core.root_path'))
-		           ? $container->getParameter('core.root_path')
-		           : './';
 		$config = ($container->has('config'))
 		        ? $container->get('config')
 		        : new \phpbb\config\config(array('smilies_path' => 'images/smilies', 'allow_nocensors' => false));
-- 
cgit v1.2.1


From 49b9e8e4eafff93f25a99bf263982fe79b7f0549 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Thu, 19 Mar 2015 12:45:12 +0100
Subject: [ticket/11768] Added configurator events

PHPBB3-11768
---
 tests/test_framework/phpbb_test_case_helpers.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'tests/test_framework/phpbb_test_case_helpers.php')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index e584c238a2..5c6da94014 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -315,7 +315,7 @@ class phpbb_test_case_helpers
 	public function set_s9e_services(ContainerInterface $container = null, $fixture = null, $styles_path = null)
 	{
 		static $first_run;
-		global $phpbb_container, $phpbb_root_path, $phpEx;
+		global $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx;
 
 		$cache_dir = __DIR__ . '/../tmp/';
 
@@ -443,8 +443,22 @@ class phpbb_test_case_helpers
 			);
 		}
 
+		// Create an event dispatcher
+		if ($container->has('dispatcher'))
+		{
+			$dispatcher = $container->get('dispatcher');
+		}
+		else if (isset($phpbb_dispatcher))
+		{
+			$dispatcher = $phpbb_dispatcher;
+		}
+		else
+		{
+			$dispatcher = new phpbb_mock_event_dispatcher;
+		}
+
 		// Create and register the text_formatter.s9e.factory service
-		$factory = new \phpbb\textformatter\s9e\factory($dal, $cache, $cache_dir, $cache_key_parser, $cache_key_renderer);
+		$factory = new \phpbb\textformatter\s9e\factory($dal, $cache, $dispatcher, $cache_dir, $cache_key_parser, $cache_key_renderer);
 		$container->set('text_formatter.s9e.factory', $factory);
 
 		// Create a user if none was provided, and add the common lang strings
-- 
cgit v1.2.1


From a7a53d5a30d4736f8114721c0d7019d64d24cda2 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Wed, 25 Mar 2015 01:39:19 +0100
Subject: [ticket/11768] Added core.text_formatter_s9e_parser_setup event

PHPBB3-11768
---
 tests/test_framework/phpbb_test_case_helpers.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'tests/test_framework/phpbb_test_case_helpers.php')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 5c6da94014..d43138d780 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -425,6 +425,7 @@ class phpbb_test_case_helpers
 		$prefix = '_s9e_' . md5(serialize(func_get_args()));
 		$cache_key_parser = $prefix . '_parser';
 		$cache_key_renderer = $prefix . '_renderer';
+		$container->set('cache.driver', $cache);
 
 		// Create a path_helper
 		if (!$container->has('path_helper'))
@@ -473,6 +474,7 @@ class phpbb_test_case_helpers
 			$user->optionset('viewflash', true);
 			$user->optionset('viewimg', true);
 			$user->optionset('viewsmilies', true);
+			$container->set('user', $user);
 		}
 		$user->add_lang('common');
 
@@ -486,7 +488,8 @@ class phpbb_test_case_helpers
 			$cache,
 			$cache_key_parser,
 			$user,
-			$factory
+			$factory,
+			$dispatcher
 		);
 
 		$container->set('text_formatter.parser', $parser);
-- 
cgit v1.2.1


From af4f9b860f50a562a03f55efad1da7e0854bdfda Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Thu, 26 Mar 2015 04:39:36 +0100
Subject: [ticket/11768] Added core.text_formatter_s9e_renderer_setup event

PHPBB3-11768
---
 tests/test_framework/phpbb_test_case_helpers.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tests/test_framework/phpbb_test_case_helpers.php')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index d43138d780..09fec38013 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -426,6 +426,7 @@ class phpbb_test_case_helpers
 		$cache_key_parser = $prefix . '_parser';
 		$cache_key_renderer = $prefix . '_renderer';
 		$container->set('cache.driver', $cache);
+		$container->setParameter('cache.dir', $cache_dir);
 
 		// Create a path_helper
 		if (!$container->has('path_helper'))
@@ -500,7 +501,8 @@ class phpbb_test_case_helpers
 			$cache,
 			$cache_dir,
 			$cache_key_renderer,
-			$factory
+			$factory,
+			$dispatcher
 		);
 
 		$config = ($container->has('config'))
-- 
cgit v1.2.1


From 245d042e43374e6467f447507783a68fae186ef1 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Mon, 6 Apr 2015 21:32:22 +0200
Subject: [ticket/8672] Updated the text_formatter.s9e service

PHPBB3-8672
---
 tests/test_framework/phpbb_test_case_helpers.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'tests/test_framework/phpbb_test_case_helpers.php')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 09fec38013..0f9b049f44 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -458,6 +458,10 @@ class phpbb_test_case_helpers
 		{
 			$dispatcher = new phpbb_mock_event_dispatcher;
 		}
+		if (!isset($phpbb_dispatcher))
+		{
+			$phpbb_dispatcher = $dispatcher;
+		}
 
 		// Create and register the text_formatter.s9e.factory service
 		$factory = new \phpbb\textformatter\s9e\factory($dal, $cache, $dispatcher, $cache_dir, $cache_key_parser, $cache_key_renderer);
-- 
cgit v1.2.1


From 179a4700221aa49071b07d638c44b9326c7a14a8 Mon Sep 17 00:00:00 2001
From: MateBartus <mate.bartus@gmail.com>
Date: Tue, 14 Apr 2015 02:31:23 +0200
Subject: [ticket/13762] Moving language related functionality into a separate
 class

PHPBB3-13762
---
 tests/test_framework/phpbb_test_case_helpers.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tests/test_framework/phpbb_test_case_helpers.php')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 0f9b049f44..685014d3e4 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -474,7 +474,9 @@ class phpbb_test_case_helpers
 		}
 		else
 		{
-			$user = new \phpbb\user('\phpbb\datetime');
+			$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+			$lang = new \phpbb\language\language($lang_loader);
+			$user = new \phpbb\user($lang, '\phpbb\datetime');
 			$user->optionset('viewcensors', true);
 			$user->optionset('viewflash', true);
 			$user->optionset('viewimg', true);
-- 
cgit v1.2.1


From deadc0665298f18a937fc959da449e9098873c0b Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Thu, 30 Apr 2015 23:01:28 +0200
Subject: [ticket/13801] Removed user dependency from text_formatter.s9e.parser

PHPBB3-13801
---
 tests/test_framework/phpbb_test_case_helpers.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'tests/test_framework/phpbb_test_case_helpers.php')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 685014d3e4..210cda9a94 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -494,11 +494,9 @@ class phpbb_test_case_helpers
 		$parser = new \phpbb\textformatter\s9e\parser(
 			$cache,
 			$cache_key_parser,
-			$user,
 			$factory,
 			$dispatcher
 		);
-
 		$container->set('text_formatter.parser', $parser);
 		$container->set('text_formatter.s9e.parser', $parser);
 
-- 
cgit v1.2.1


From c8052ea8230cf7bb70c979dfc87b04527635f4b0 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Fri, 29 May 2015 17:35:26 +0200
Subject: [ticket/13803] Set up a global $user for tests

PHPBB3-13803
---
 tests/test_framework/phpbb_test_case_helpers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/test_framework/phpbb_test_case_helpers.php')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 210cda9a94..cf530cc5be 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -315,7 +315,7 @@ class phpbb_test_case_helpers
 	public function set_s9e_services(ContainerInterface $container = null, $fixture = null, $styles_path = null)
 	{
 		static $first_run;
-		global $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx;
+		global $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx, $user;
 
 		$cache_dir = __DIR__ . '/../tmp/';
 
-- 
cgit v1.2.1


From f02cc27014c27acaf44b27066959426db27b3493 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Tue, 16 Jun 2015 08:16:56 +0200
Subject: [ticket/10620] Implemented quote improvements

PHPBB3-10620
---
 tests/test_framework/phpbb_test_case_helpers.php | 32 +++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

(limited to 'tests/test_framework/phpbb_test_case_helpers.php')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index cf530cc5be..62a56ed693 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -476,11 +476,21 @@ class phpbb_test_case_helpers
 		{
 			$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
 			$lang = new \phpbb\language\language($lang_loader);
-			$user = new \phpbb\user($lang, '\phpbb\datetime');
+
+			$user = $this->test_case->getMockBuilder('\phpbb\user')
+					->setConstructorArgs(array($lang, '\phpbb\datetime'))
+					->setMethods(array('format_date'))
+					->getMock();
+			$user->expects($this->test_case->any())
+			     ->method('format_date')
+			     ->will($this->test_case->returnCallback(__CLASS__ . '::format_date'));
+
+			$user->date_format = 'Y-m-d H:i:s';
 			$user->optionset('viewcensors', true);
 			$user->optionset('viewflash', true);
 			$user->optionset('viewimg', true);
 			$user->optionset('viewsmilies', true);
+			$user->timezone = new \DateTimeZone('UTC');
 			$container->set('user', $user);
 		}
 		$user->add_lang('common');
@@ -490,6 +500,14 @@ class phpbb_test_case_helpers
 			$user->style = array('style_id' => 1);
 		}
 
+		// Create and register a quote_helper
+		$quote_helper = new \phpbb\textformatter\s9e\quote_helper(
+			$container->get('user'),
+			$phpbb_root_path,
+			$phpEx
+		);
+		$container->set('text_formatter.s9e.quote_helper', $quote_helper);
+
 		// Create and register the text_formatter.s9e.parser service and its alias
 		$parser = new \phpbb\textformatter\s9e\parser(
 			$cache,
@@ -515,6 +533,7 @@ class phpbb_test_case_helpers
 		$auth = ($container->has('auth')) ? $container->get('auth') : new \phpbb\auth\auth;
 
 		// Calls configured in services.yml
+		$renderer->configure_quote_helper($quote_helper);
 		$renderer->configure_smilies_path($config, $container->get('path_helper'));
 		$renderer->configure_user($user, $config, $auth);
 
@@ -528,4 +547,15 @@ class phpbb_test_case_helpers
 
 		return $container;
 	}
+
+	/**
+	* Mocked replacement for \phpbb\user::format_date()
+	*
+	* @param  integer $gmepoch unix timestamp
+	* @return string
+	*/
+	static public function format_date($gmepoch)
+	{
+		return gmdate('Y-m-d H:i:s', $gmepoch);
+	}
 }
-- 
cgit v1.2.1


From fc34057f288c6b8c656a0ed1ac2cb5a86f86206d Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Thu, 9 Jul 2015 17:04:40 +0200
Subject: [ticket/11444] Update tests and cleanup types/methods

PHPBB3-11444
---
 tests/test_framework/phpbb_test_case_helpers.php | 34 +++++++++++++++---------
 1 file changed, 22 insertions(+), 12 deletions(-)

(limited to 'tests/test_framework/phpbb_test_case_helpers.php')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 62a56ed693..70bd309653 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -426,24 +426,34 @@ class phpbb_test_case_helpers
 		$cache_key_parser = $prefix . '_parser';
 		$cache_key_renderer = $prefix . '_renderer';
 		$container->set('cache.driver', $cache);
-		$container->setParameter('cache.dir', $cache_dir);
+
+		if (!$container->isFrozen())
+		{
+			$container->setParameter('cache.dir', $cache_dir);
+		}
 
 		// Create a path_helper
-		if (!$container->has('path_helper'))
+		if (!$container->has('path_helper') || $container->getDefinition('path_helper')->isSynthetic())
 		{
+			$path_helper = new \phpbb\path_helper(
+				new \phpbb\symfony_request(
+					new phpbb_mock_request()
+				),
+				new \phpbb\filesystem(),
+				$this->test_case->getMock('\phpbb\request\request'),
+				$phpbb_root_path,
+				$phpEx
+			);
+
 			$container->set(
 				'path_helper',
-				new \phpbb\path_helper(
-					new \phpbb\symfony_request(
-						new phpbb_mock_request()
-					),
-					new \phpbb\filesystem(),
-					$this->test_case->getMock('\phpbb\request\request'),
-					$phpbb_root_path,
-					$phpEx
-				)
+				$path_helper
 			);
 		}
+		else
+		{
+			$path_helper = $container->get('path_helper');
+		}
 
 		// Create an event dispatcher
 		if ($container->has('dispatcher'))
@@ -534,7 +544,7 @@ class phpbb_test_case_helpers
 
 		// Calls configured in services.yml
 		$renderer->configure_quote_helper($quote_helper);
-		$renderer->configure_smilies_path($config, $container->get('path_helper'));
+		$renderer->configure_smilies_path($config, $path_helper);
 		$renderer->configure_user($user, $config, $auth);
 
 		$container->set('text_formatter.renderer', $renderer);
-- 
cgit v1.2.1


From da7fc9e5daf6e72f9b86dbc5e002febb202f516e Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Wed, 10 Jun 2015 15:11:27 +0200
Subject: [ticket/13935] Allow more admin-configurable schemes in post links

PHPBB3-13935
---
 tests/test_framework/phpbb_test_case_helpers.php | 30 +++++++++++++++++++-----
 1 file changed, 24 insertions(+), 6 deletions(-)

(limited to 'tests/test_framework/phpbb_test_case_helpers.php')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 70bd309653..3eefcdc5e3 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -473,8 +473,30 @@ class phpbb_test_case_helpers
 			$phpbb_dispatcher = $dispatcher;
 		}
 
+		// Set up the a minimum config
+		if ($container->has('config'))
+		{
+			$config = $container->get('config');
+		}
+		else
+		{
+			$config = new \phpbb\config\config(array());
+		}
+		$default_config = array(
+			'allow_nocensors' => false,
+			'allowed_schemes_links' => 'http,https,ftp',
+			'smilies_path' => 'images/smilies',
+		);
+		foreach ($default_config as $config_name => $config_value)
+		{
+			if (!isset($config[$config_name]))
+			{
+				$config[$config_name] = $config_value;
+			}
+		}
+
 		// Create and register the text_formatter.s9e.factory service
-		$factory = new \phpbb\textformatter\s9e\factory($dal, $cache, $dispatcher, $cache_dir, $cache_key_parser, $cache_key_renderer);
+		$factory = new \phpbb\textformatter\s9e\factory($dal, $cache, $dispatcher, $config, $cache_dir, $cache_key_parser, $cache_key_renderer);
 		$container->set('text_formatter.s9e.factory', $factory);
 
 		// Create a user if none was provided, and add the common lang strings
@@ -537,12 +559,8 @@ class phpbb_test_case_helpers
 			$dispatcher
 		);
 
-		$config = ($container->has('config'))
-		        ? $container->get('config')
-		        : new \phpbb\config\config(array('smilies_path' => 'images/smilies', 'allow_nocensors' => false));
-		$auth = ($container->has('auth')) ? $container->get('auth') : new \phpbb\auth\auth;
-
 		// Calls configured in services.yml
+		$auth = ($container->has('auth')) ? $container->get('auth') : new \phpbb\auth\auth;
 		$renderer->configure_quote_helper($quote_helper);
 		$renderer->configure_smilies_path($config, $path_helper);
 		$renderer->configure_user($user, $config, $auth);
-- 
cgit v1.2.1


From ca141f2e1ed7a83c21aaea0e7cc711017e7d140b Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Fri, 17 Jul 2015 18:28:27 +0200
Subject: [ticket/14036] Replace path_helper with a mock

PHPBB3-14036
---
 tests/test_framework/phpbb_test_case_helpers.php | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'tests/test_framework/phpbb_test_case_helpers.php')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 70bd309653..3ad4d95039 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -435,20 +435,15 @@ class phpbb_test_case_helpers
 		// Create a path_helper
 		if (!$container->has('path_helper') || $container->getDefinition('path_helper')->isSynthetic())
 		{
-			$path_helper = new \phpbb\path_helper(
-				new \phpbb\symfony_request(
-					new phpbb_mock_request()
-				),
-				new \phpbb\filesystem(),
-				$this->test_case->getMock('\phpbb\request\request'),
-				$phpbb_root_path,
-				$phpEx
-			);
-
-			$container->set(
-				'path_helper',
-				$path_helper
-			);
+			$path_helper = $this->test_case->getMockBuilder('phpbb\\path_helper')
+				->disableOriginalConstructor()
+				->setMethods(array('get_web_root_path'))
+				->getMock();
+			$path_helper->expects($this->test_case->any())
+				->method('get_web_root_path')
+				->will($this->test_case->returnValue('./'));
+
+			$container->set('path_helper', $path_helper);
 		}
 		else
 		{
-- 
cgit v1.2.1


From 6cc2510cee581370ed103a87f2c38d2aee282641 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Fri, 17 Jul 2015 19:10:36 +0200
Subject: [ticket/14036] Fixed mocked web root path

...to match what it would return normally

PHPBB3-14036
---
 tests/test_framework/phpbb_test_case_helpers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/test_framework/phpbb_test_case_helpers.php')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 3ad4d95039..c0f278c130 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -441,7 +441,7 @@ class phpbb_test_case_helpers
 				->getMock();
 			$path_helper->expects($this->test_case->any())
 				->method('get_web_root_path')
-				->will($this->test_case->returnValue('./'));
+				->will($this->test_case->returnValue('phpBB/'));
 
 			$container->set('path_helper', $path_helper);
 		}
-- 
cgit v1.2.1


From 8fe94a19b46c4e33a117c1a040415f2b1c397e7c Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Sat, 5 Dec 2015 19:48:01 +0100
Subject: [ticket/14323] Added support for truncating local URLs

PHPBB3-14323
---
 tests/test_framework/phpbb_test_case_helpers.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'tests/test_framework/phpbb_test_case_helpers.php')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 0166b11d06..cb77c6829c 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -315,7 +315,7 @@ class phpbb_test_case_helpers
 	public function set_s9e_services(ContainerInterface $container = null, $fixture = null, $styles_path = null)
 	{
 		static $first_run;
-		global $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx, $user;
+		global $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx, $request, $user;
 
 		$cache_dir = __DIR__ . '/../tmp/';
 
@@ -490,6 +490,12 @@ class phpbb_test_case_helpers
 			}
 		}
 
+		// Create a fake request
+		if (!isset($request))
+		{
+			$request = new phpbb_mock_request;
+		}
+
 		// Create and register the text_formatter.s9e.factory service
 		$factory = new \phpbb\textformatter\s9e\factory($dal, $cache, $dispatcher, $config, $cache_dir, $cache_key_parser, $cache_key_renderer);
 		$container->set('text_formatter.s9e.factory', $factory);
@@ -513,6 +519,7 @@ class phpbb_test_case_helpers
 			     ->will($this->test_case->returnCallback(__CLASS__ . '::format_date'));
 
 			$user->date_format = 'Y-m-d H:i:s';
+			$user->host = 'localhost';
 			$user->optionset('viewcensors', true);
 			$user->optionset('viewflash', true);
 			$user->optionset('viewimg', true);
-- 
cgit v1.2.1


From f9d8866aee9bca746801ef0360a5ab350d04061d Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Sun, 6 Dec 2015 15:23:27 +0100
Subject: [ticket/14323] Set up global objects required during testing

PHPBB3-14323
---
 tests/test_framework/phpbb_test_case_helpers.php | 26 +++++++++++++++---------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'tests/test_framework/phpbb_test_case_helpers.php')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index cb77c6829c..aa58b3974b 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -315,7 +315,7 @@ class phpbb_test_case_helpers
 	public function set_s9e_services(ContainerInterface $container = null, $fixture = null, $styles_path = null)
 	{
 		static $first_run;
-		global $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx, $request, $user;
+		global $config, $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx, $request, $user;
 
 		$cache_dir = __DIR__ . '/../tmp/';
 
@@ -469,18 +469,25 @@ class phpbb_test_case_helpers
 		}
 
 		// Set up the a minimum config
-		if ($container->has('config'))
+		if (!isset($config))
 		{
-			$config = $container->get('config');
-		}
-		else
-		{
-			$config = new \phpbb\config\config(array());
+			if ($container->has('config'))
+			{
+				$config = $container->get('config');
+			}
+			else
+			{
+				$config = new \phpbb\config\config(array());
+			}
 		}
 		$default_config = array(
-			'allow_nocensors' => false,
+			'allow_nocensors'       => false,
 			'allowed_schemes_links' => 'http,https,ftp',
-			'smilies_path' => 'images/smilies',
+			'script_path'           => '/phpbb',
+			'server_name'           => 'localhost',
+			'server_port'           => 80,
+			'server_protocol'       => 'http://',
+			'smilies_path'          => 'images/smilies',
 		);
 		foreach ($default_config as $config_name => $config_value)
 		{
@@ -519,7 +526,6 @@ class phpbb_test_case_helpers
 			     ->will($this->test_case->returnCallback(__CLASS__ . '::format_date'));
 
 			$user->date_format = 'Y-m-d H:i:s';
-			$user->host = 'localhost';
 			$user->optionset('viewcensors', true);
 			$user->optionset('viewflash', true);
 			$user->optionset('viewimg', true);
-- 
cgit v1.2.1


From ad2c032d3b748d177403fd495685977f7964f8d4 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Sun, 6 Dec 2015 22:08:00 +0100
Subject: [ticket/14323] Moved autolink-related functions to a separate helper

PHPBB3-14323
---
 tests/test_framework/phpbb_test_case_helpers.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'tests/test_framework/phpbb_test_case_helpers.php')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index aa58b3974b..dacf9d923f 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -469,16 +469,13 @@ class phpbb_test_case_helpers
 		}
 
 		// Set up the a minimum config
-		if (!isset($config))
+		if ($container->has('config'))
 		{
-			if ($container->has('config'))
-			{
-				$config = $container->get('config');
-			}
-			else
-			{
-				$config = new \phpbb\config\config(array());
-			}
+			$config = $container->get('config');
+		}
+		elseif (!isset($config))
+		{
+			$config = new \phpbb\config\config(array());
 		}
 		$default_config = array(
 			'allow_nocensors'       => false,
@@ -504,7 +501,7 @@ class phpbb_test_case_helpers
 		}
 
 		// Create and register the text_formatter.s9e.factory service
-		$factory = new \phpbb\textformatter\s9e\factory($dal, $cache, $dispatcher, $config, $cache_dir, $cache_key_parser, $cache_key_renderer);
+		$factory = new \phpbb\textformatter\s9e\factory($dal, $cache, $dispatcher, $config, new \phpbb\textformatter\s9e\autolink_helper, $cache_dir, $cache_key_parser, $cache_key_renderer);
 		$container->set('text_formatter.s9e.factory', $factory);
 
 		// Create a user if none was provided, and add the common lang strings
-- 
cgit v1.2.1


From 909f8653ec0bf2905ed8d8a9591486f7eefe4d56 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Sun, 27 Dec 2015 16:43:45 +0100
Subject: [ticket/14323] Renamed AUTOLINK_TEXT to LINK_TEXT

Expanded link text shortening to [url] BBCodes with no parameters

PHPBB3-14323
---
 tests/test_framework/phpbb_test_case_helpers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/test_framework/phpbb_test_case_helpers.php')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index dacf9d923f..c4b653ec7c 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -501,7 +501,7 @@ class phpbb_test_case_helpers
 		}
 
 		// Create and register the text_formatter.s9e.factory service
-		$factory = new \phpbb\textformatter\s9e\factory($dal, $cache, $dispatcher, $config, new \phpbb\textformatter\s9e\autolink_helper, $cache_dir, $cache_key_parser, $cache_key_renderer);
+		$factory = new \phpbb\textformatter\s9e\factory($dal, $cache, $dispatcher, $config, new \phpbb\textformatter\s9e\link_helper, $cache_dir, $cache_key_parser, $cache_key_renderer);
 		$container->set('text_formatter.s9e.factory', $factory);
 
 		// Create a user if none was provided, and add the common lang strings
-- 
cgit v1.2.1


From e974f338afb86c065e9b160363bc2e6156f8566d Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Sun, 13 Nov 2016 18:08:35 +0100
Subject: [ticket/14739] Remove SQLite 2.8.x database driver

PHPBB3-14739
---
 tests/test_framework/phpbb_test_case_helpers.php | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'tests/test_framework/phpbb_test_case_helpers.php')

diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index c4b653ec7c..7fb9a740b8 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -122,17 +122,6 @@ class phpbb_test_case_helpers
 				'dbpasswd'	=> '',
 			));
 		}
-		else if (extension_loaded('sqlite'))
-		{
-			$config = array_merge($config, array(
-				'dbms'		=> 'phpbb\db\driver\sqlite',
-				'dbhost'	=> dirname(__FILE__) . '/../phpbb_unit_tests.sqlite2', // filename
-				'dbport'	=> '',
-				'dbname'	=> '',
-				'dbuser'	=> '',
-				'dbpasswd'	=> '',
-			));
-		}
 
 		if (isset($_SERVER['PHPBB_TEST_CONFIG']))
 		{
-- 
cgit v1.2.1