From 550edefdefc4db59260b22a3b1e535c46074cf53 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 10 May 2010 19:30:00 +0200 Subject: [PATCH] made the test suite more compatible with old versions of PHPUnit --- phpunit.xml | 2 +- test/Twig/Tests/Extension/SandboxTest.php | 2 +- test/Twig/Tests/TokenStreamTest.php | 2 +- test/Twig/Tests/integrationTest.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/phpunit.xml b/phpunit.xml index a726fab..d01af55 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -6,7 +6,7 @@ convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" - processIsolation="false" + processIsolation="true" stopOnFailure="false" syntaxCheck="false" > diff --git a/test/Twig/Tests/Extension/SandboxTest.php b/test/Twig/Tests/Extension/SandboxTest.php index 529aa16..d2f9938 100644 --- a/test/Twig/Tests/Extension/SandboxTest.php +++ b/test/Twig/Tests/Extension/SandboxTest.php @@ -15,7 +15,7 @@ class Twig_Tests_Extension_SandboxTest extends PHPUnit_Framework_TestCase { static protected $params, $templates; - static public function setUpBeforeClass() + public function setUp() { self::$params = array( 'name' => 'Fabien', diff --git a/test/Twig/Tests/TokenStreamTest.php b/test/Twig/Tests/TokenStreamTest.php index 80a2bd0..43362cf 100644 --- a/test/Twig/Tests/TokenStreamTest.php +++ b/test/Twig/Tests/TokenStreamTest.php @@ -15,7 +15,7 @@ class Twig_Tests_TokenStreamTest extends PHPUnit_Framework_TestCase { static protected $tokens; - static public function setupBeforeClass() + public function setUp() { self::$tokens = array( new Twig_Token(Twig_Token::TEXT_TYPE, 1, 0), diff --git a/test/Twig/Tests/integrationTest.php b/test/Twig/Tests/integrationTest.php index 34bbcc5..b2c11e9 100644 --- a/test/Twig/Tests/integrationTest.php +++ b/test/Twig/Tests/integrationTest.php @@ -15,7 +15,7 @@ class Twig_Tests_IntegrationTest extends PHPUnit_Framework_TestCase { static protected $fixturesDir; - static public function setUpBeforeClass() + public function setUp() { self::$fixturesDir = realpath(dirname(__FILE__).'/../../fixtures/'); } -- 1.7.2.5