From 44cab5696fb7cb60a97f4010c3ef75f88d879b6a Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Thu, 24 Nov 2011 03:26:51 -0500 Subject: [PATCH 1/2] [ticket/10481] Skip functional tests if phar extension is missing. PHPBB3-10481 --- tests/test_framework/phpbb_functional_test_case.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 18bf2a84a8..57cc0f8959 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -7,7 +7,6 @@ * */ -require_once __DIR__ . '/../../vendor/goutte.phar'; require_once __DIR__ . '/../../phpBB/includes/functions_install.php'; class phpbb_functional_test_case extends phpbb_test_case @@ -18,6 +17,16 @@ class phpbb_functional_test_case extends phpbb_test_case static protected $config = array(); static protected $already_installed = false; + static public function setUpBeforeClass() + { + if (!extension_loaded('phar')) + { + self::markTestSkipped('phar extension is not loaded'); + } + + require_once __DIR__ . '/../../vendor/goutte.phar'; + } + public function setUp() { if (!isset(self::$config['phpbb_functional_url'])) From ba1603a5f0e06d30a930170bec0773a3fbe68fc2 Mon Sep 17 00:00:00 2001 From: Oleg Pudeyev Date: Thu, 24 Nov 2011 14:16:58 -0500 Subject: [PATCH 2/2] [ticket/10481] Use phar:// url for requiring goutte. It does not seem to work on my machine without phar:// even with phar extension installed. PHPBB3-10481 --- tests/test_framework/phpbb_functional_test_case.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 57cc0f8959..a1c642bf38 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -24,7 +24,7 @@ class phpbb_functional_test_case extends phpbb_test_case self::markTestSkipped('phar extension is not loaded'); } - require_once __DIR__ . '/../../vendor/goutte.phar'; + require_once 'phar://' . __DIR__ . '/../../vendor/goutte.phar'; } public function setUp()