12 files changed, 235 insertions, 17 deletions
diff --git a/tests/controller/config/routing.yml b/tests/controller/config/routing.yml
index 175b11f130..1e7df02684 100644
--- a/tests/controller/config/routing.yml
+++ b/tests/controller/config/routing.yml
@@ -1,3 +1,3 @@
 core_controller:
-    pattern: /core_foo
+    path: /core_foo
     defaults: { _controller: core_foo.controller:bar }
diff --git a/tests/controller/ext/vendor2/foo/config/routing.yml b/tests/controller/ext/vendor2/foo/config/routing.yml
index 6cc275d96d..e3e8ee5f98 100644
--- a/tests/controller/ext/vendor2/foo/config/routing.yml
+++ b/tests/controller/ext/vendor2/foo/config/routing.yml
@@ -1,5 +1,5 @@
 controller1:
-    pattern: /foo
+    path: /foo
     defaults: { _controller: foo.controller:handle }
 
 include_controller2:
diff --git a/tests/controller/ext/vendor2/foo/config/routing_2.yml b/tests/controller/ext/vendor2/foo/config/routing_2.yml
index d987a65aea..ee05898c66 100644
--- a/tests/controller/ext/vendor2/foo/config/routing_2.yml
+++ b/tests/controller/ext/vendor2/foo/config/routing_2.yml
@@ -1,6 +1,6 @@
 controller2:
-    pattern: /bar
+    path: /bar
     defaults: { _controller: foo.controller:handle }
 controller3:
-    pattern: /bar/p-{p}
+    path: /bar/p-{p}
     defaults: { _controller: foo.controller:handle }
diff --git a/tests/controller/ext/vendor2/foo/subfolder/config/routing.yml b/tests/controller/ext/vendor2/foo/subfolder/config/routing.yml
index b4d8d19107..20810a8f25 100644
--- a/tests/controller/ext/vendor2/foo/subfolder/config/routing.yml
+++ b/tests/controller/ext/vendor2/foo/subfolder/config/routing.yml
@@ -1,3 +1,3 @@
 controller_noroute:
-    pattern: /donotfindthis
+    path: /donotfindthis
     defaults: { _controller: foo.controller:handle }
diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
index 8e27b39459..fab1d3af3a 100644
--- a/tests/extension/metadata_manager_test.php
+++ b/tests/extension/metadata_manager_test.php
@@ -123,6 +123,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 		}
 
 		$json = json_decode(file_get_contents($this->phpbb_root_path . 'ext/vendor2/foo/composer.json'), true);
+		array_walk_recursive($json, array($manager, 'sanitize_json'));
 
 		$this->assertEquals($metadata, $json);
 	}
diff --git a/tests/functional/fixtures/ext/foo/bar/config/routing.yml b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
index 08bc73038f..374a58046d 100644
--- a/tests/functional/fixtures/ext/foo/bar/config/routing.yml
+++ b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
@@ -1,35 +1,35 @@
 foo_bar_controller:
-    pattern: /foo/bar
+    path: /foo/bar
     defaults: { _controller: foo_bar.controller:handle }
 
 foo_baz_controller:
-    pattern: /foo/baz
+    path: /foo/baz
     defaults: { _controller: foo_bar.controller:baz }
 
 foo_template_controller:
-    pattern: /foo/template
+    path: /foo/template
     defaults: { _controller: foo_bar.controller:template }
 
 foo_exception_controller:
-    pattern: /foo/exception
+    path: /foo/exception
     defaults: { _controller: foo_bar.controller:exception }
 
 foo_login_redirect_controller:
-    pattern: /foo/login_redirect
+    path: /foo/login_redirect
     defaults: { _controller: foo_bar.controller:login_redirect }
 
 foo_redirect_controller:
-    pattern: /foo/redirect
+    path: /foo/redirect
     defaults: { _controller: foo_bar.controller:redirect }
 
 foo_index_controller:
-    pattern: /index
+    path: /index
     defaults: { _controller: foo_bar.controller:redirect }
 
 foo_tests_index_controller:
-    pattern: /tests/index
+    path: /tests/index
     defaults: { _controller: foo_bar.controller:redirect }
 
 foo_tests_dotdot_index_controller:
-    pattern: /tests/../index
+    path: /tests/../index
     defaults: { _controller: foo_bar.controller:redirect }
diff --git a/tests/functional/fixtures/ext/foo/foo/config/resource.yml b/tests/functional/fixtures/ext/foo/foo/config/resource.yml
index ed1d018016..4f2b9cce70 100644
--- a/tests/functional/fixtures/ext/foo/foo/config/resource.yml
+++ b/tests/functional/fixtures/ext/foo/foo/config/resource.yml
@@ -1,3 +1,3 @@
 foo_foo_controller:
-    pattern: /foo
+    path: /foo
     defaults: { _controller: foo_foo.controller:handle }
diff --git a/tests/mock/file_downloader.php b/tests/mock/file_downloader.php
new file mode 100644
index 0000000000..d8951cebf6
--- /dev/null
+++ b/tests/mock/file_downloader.php
@@ -0,0 +1,27 @@
+<?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.
+*
+*/
+
+class phpbb_mock_file_downloader extends \phpbb\file_downloader
+{
+	public $data;
+
+	public function set($data)
+	{
+		$this->data = $data;
+	}
+
+	public function get($host, $directory, $filename, $port = 80, $timeout = 6)
+	{
+		return $this->data;
+	}
+}
diff --git a/tests/mock/metadata_manager.php b/tests/mock/metadata_manager.php
index 16900a0fc1..2443fad560 100644
--- a/tests/mock/metadata_manager.php
+++ b/tests/mock/metadata_manager.php
@@ -15,11 +15,13 @@ class phpbb_mock_metadata_manager extends \phpbb\extension\metadata_manager
 {
 	public function set_metadata($metadata)
 	{
+		array_walk_recursive($metadata, array($this, 'sanitize_json'));
 		$this->metadata = $metadata;
 	}
 
 	public function merge_metadata($metadata)
 	{
+		array_walk_recursive($metadata, array($this, 'sanitize_json'));
 		$this->metadata = array_merge($this->metadata, $metadata);
 	}
 }
diff --git a/tests/pagination/config/routing.yml b/tests/pagination/config/routing.yml
index dd667274cd..2ce082c9d1 100644
--- a/tests/pagination/config/routing.yml
+++ b/tests/pagination/config/routing.yml
@@ -1,6 +1,6 @@
 core_controller:
-    pattern: /test
+    path: /test
     defaults: { _controller: core_foo.controller:bar, page: 1}
 core_page_controller:
-    pattern: /test/page/{page}
+    path: /test/page/{page}
     defaults: { _controller: core_foo.controller:bar}
diff --git a/tests/path_helper/path_helper_test.php b/tests/path_helper/path_helper_test.php
index 3832307897..bb68f8b3bc 100644
--- a/tests/path_helper/path_helper_test.php
+++ b/tests/path_helper/path_helper_test.php
@@ -411,6 +411,21 @@ class phpbb_path_helper_test extends phpbb_test_case
 				'http://www.phpbb.com/community',
 				'../community/',
 			),
+			array(
+				'http://www.phpbb.com/foobar',
+				'http://www.phpbb.com',
+				'',
+			),
+			array(
+				'http://www.foobar.com',
+				'http://www.phpbb.com',
+				'/www.phpbb.com/',
+			),
+			array(
+				'foobar',
+				'http://www.phpbb.com/community',
+				'',
+			)
 		);
 	}
 
diff --git a/tests/version/version_helper_remote_test.php b/tests/version/version_helper_remote_test.php
new file mode 100644
index 0000000000..65ae7646b9
--- /dev/null
+++ b/tests/version/version_helper_remote_test.php
@@ -0,0 +1,173 @@
+<?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.
+ *
+ */
+
+class version_helper_remote_test extends \phpbb_test_case
+{
+	protected $file_downloader;
+	protected $cache;
+	protected $version_helper;
+
+	public function setUp()
+	{
+		parent::setUp();
+
+		global $phpbb_root_path, $phpEx;
+
+		include_once($phpbb_root_path . 'includes/functions.' . $phpEx);
+
+		$config = new \phpbb\config\config(array(
+			'version'	=> '3.1.0',
+		));
+		$container = new \phpbb_mock_container_builder();
+		$db = new \phpbb\db\driver\factory($container);
+		$this->cache = $this->getMock('\phpbb\cache\service', array('get'), array(new \phpbb\cache\driver\null(), $config, $db, '../../', 'php'));
+		$this->cache->expects($this->any())
+			->method('get')
+			->with($this->anything())
+			->will($this->returnValue(false));
+		$this->file_downloader = new phpbb_mock_file_downloader();
+
+		$this->version_helper = new \phpbb\version_helper(
+			$this->cache,
+			$config,
+			$this->file_downloader,
+			new \phpbb\user('\phpbb\datetime')
+		);
+		$this->user = new \phpbb\user('\phpbb\datetime');
+		$this->user->add_lang('acp/common');
+	}
+
+	public function provider_get_versions()
+	{
+		return array(
+			array('', false),
+			array('foobar', false),
+			array('{
+    "stable": {
+        "1.0": {
+            "current": "1.0.1",
+            "download": "https://www.phpbb.com/customise/db/download/104136",
+            "announcement": "https://www.phpbb.com/customise/db/extension/boardrules/",
+            "eol": null,
+            "security": false
+        }
+    }
+}', true, array (
+				'stable' => array (
+					'1.0' => array (
+						'current' => '1.0.1',
+						'download' => 'https://www.phpbb.com/customise/db/download/104136',
+						'announcement' => 'https://www.phpbb.com/customise/db/extension/boardrules/',
+						'eol' => NULL,
+						'security' => false,
+					),
+				),
+				'unstable' => array (
+					'1.0' => array (
+						'current' => '1.0.1',
+						'download' => 'https://www.phpbb.com/customise/db/download/104136',
+						'announcement' => 'https://www.phpbb.com/customise/db/extension/boardrules/',
+						'eol' => NULL,
+						'security' => false,
+					),
+				),
+			)),
+			array('{
+    "foobar": {
+        "1.0": {
+            "current": "1.0.1",
+            "download": "https://www.phpbb.com/customise/db/download/104136",
+            "announcement": "https://www.phpbb.com/customise/db/extension/boardrules/",
+            "eol": null,
+            "security": false
+        }
+    }
+}', false),
+			array('{
+    "stable": {
+        "1.0": {
+            "current": "1.0.1<script>alert(\'foo\');</script>",
+            "download": "https://www.phpbb.com/customise/db/download/104136<script>alert(\'foo\');</script>",
+            "announcement": "https://www.phpbb.com/customise/db/extension/boardrules/<script>alert(\'foo\');</script>",
+            "eol": "<script>alert(\'foo\');</script>",
+            "security": "<script>alert(\'foo\');</script>"
+        }
+    }
+}', true, array (
+				'stable' => array (
+					'1.0' => array (
+						'current' => '1.0.1&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'download' => 'https://www.phpbb.com/customise/db/download/104136&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'announcement' => 'https://www.phpbb.com/customise/db/extension/boardrules/&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'eol' => '&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'security' => '&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+					),
+				),
+				'unstable' => array (
+					'1.0' => array (
+						'current' => '1.0.1&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'download' => 'https://www.phpbb.com/customise/db/download/104136&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'announcement' => 'https://www.phpbb.com/customise/db/extension/boardrules/&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'eol' => '&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'security' => '&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+					),
+				),
+			)),
+			array('{
+    "unstable": {
+        "1.0": {
+            "current": "1.0.1<script>alert(\'foo\');</script>",
+            "download": "https://www.phpbb.com/customise/db/download/104136<script>alert(\'foo\');</script>",
+            "announcement": "https://www.phpbb.com/customise/db/extension/boardrules/<script>alert(\'foo\');</script>",
+            "eol": "<script>alert(\'foo\');</script>",
+            "security": "<script>alert(\'foo\');</script>"
+        }
+    }
+}', true, array (
+				'unstable' => array (
+					'1.0' => array (
+						'current' => '1.0.1&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'download' => 'https://www.phpbb.com/customise/db/download/104136&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'announcement' => 'https://www.phpbb.com/customise/db/extension/boardrules/&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'eol' => '&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+						'security' => '&lt;script&gt;alert(\'foo\');&lt;/script&gt;',
+					),
+				),
+				'stable' => array(),
+			)),
+		);
+	}
+
+	/**
+	 * @dataProvider provider_get_versions
+	 */
+	public function test_get_versions($input, $valid_data, $expected_return = '')
+	{
+		$this->file_downloader->set($input);
+
+		if (!$valid_data)
+		{
+			try {
+				$return = $this->version_helper->get_versions();
+			} catch (\RuntimeException $e) {
+				$this->assertEquals((string)$e->getMessage(), $this->user->lang('VERSIONCHECK_FAIL'));
+			}
+		}
+		else
+		{
+			$return = $this->version_helper->get_versions();
+		}
+
+		$this->assertEquals($expected_return, $return);
+	}
+}