[ticket/10981] Added goutte via composer

composer.phar added and autoloaded before tests PHPBB3-10981
cvca · Jul 16, 2012 · 797ee16 · 797ee16
1 parent 8f5182b
commit 797ee16
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 2 deletions.
diff --git a/composer.phar b/composer.phar
diff --git a/phpBB/composer.json b/phpBB/composer.json
@@ -0,0 +1,6 @@
+{
+	"minimum-stability": "beta",
+	"require-dev": {
+		"fabpot/goutte": "1.0.x-dev"
+	}
+}
diff --git a/phpBB/composer.lock b/phpBB/composer.lock
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -22,5 +22,20 @@
 
 if (version_compare(PHP_VERSION, '5.3.0-dev', '>='))
 {
+	if (getenv('PHPBB_NO_COMPOSER_AUTOLOAD'))
+	{
+		if (getenv('PHPBB_AUTOLOAD'))
+		{
+			require(getenv('PHPBB_AUTOLOAD'));
+		}
+	}
+	else
+	{
+		if (!file_exists($phpbb_root_path . 'vendor/autoload.php'))
+		{
+			trigger_error('You have not set up composer dependencies. See http://getcomposer.org/.', E_USER_ERROR);
+		}
+		require($phpbb_root_path . 'vendor/autoload.php');
+	}
 	require_once 'test_framework/phpbb_functional_test_case.php';
 }
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
@@ -36,8 +36,6 @@ static public function setUpBeforeClass()
 		{
 			self::markTestSkipped('phar extension is not loaded');
 		}
-
-		require_once 'phar://' . __DIR__ . '/../../vendor/goutte.phar';
 	}
 
 	public function setUp()

diff --git a/vendor/goutte.phar b/vendor/goutte.phar
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,8 +36,6 @@ static public function setUpBeforeClass() @@
     		{
     			self::markTestSkipped('phar extension is not loaded');
     		}
-    		require_once 'phar://' . __DIR__ . '/../../vendor/goutte.phar';
     	}
     	public function setUp()
@@ Expand Down @@