From 720b71a0b8b48bbefac8037d81d618f798356e7f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 4 Jan 2013 22:43:10 +0100 Subject: [PATCH] fixed tests on PHP 5.2 --- test/Twig/Tests/Node/Expression/FilterTest.php | 2 +- test/Twig/Tests/Node/Expression/FunctionTest.php | 2 +- .../Tests/Node/Expression/PHP53/FilterInclude.php | 6 ++++++ .../Tests/Node/Expression/PHP53/FilterTest.php | 6 ------ .../Node/Expression/PHP53/FunctionInclude.php | 6 ++++++ .../Tests/Node/Expression/PHP53/FunctionTest.php | 6 ------ .../Tests/Node/Expression/PHP53/TestInclude.php | 6 ++++++ test/Twig/Tests/Node/Expression/PHP53/TestTest.php | 6 ------ test/Twig/Tests/Node/Expression/TestTest.php | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 test/Twig/Tests/Node/Expression/PHP53/FilterInclude.php delete mode 100644 test/Twig/Tests/Node/Expression/PHP53/FilterTest.php create mode 100644 test/Twig/Tests/Node/Expression/PHP53/FunctionInclude.php delete mode 100644 test/Twig/Tests/Node/Expression/PHP53/FunctionTest.php create mode 100644 test/Twig/Tests/Node/Expression/PHP53/TestInclude.php delete mode 100644 test/Twig/Tests/Node/Expression/PHP53/TestTest.php diff --git a/test/Twig/Tests/Node/Expression/FilterTest.php b/test/Twig/Tests/Node/Expression/FilterTest.php index a089182..8089b9c 100644 --- a/test/Twig/Tests/Node/Expression/FilterTest.php +++ b/test/Twig/Tests/Node/Expression/FilterTest.php @@ -125,7 +125,7 @@ class Twig_Tests_Node_Expression_FilterTest extends Twig_Test_NodeTestCase protected function getEnvironment() { if (version_compare(phpversion(), '5.3.0', '>=')) { - return include 'PHP53/FilterTest.php'; + return include 'PHP53/FilterInclude.php'; } return parent::getEnvironment(); diff --git a/test/Twig/Tests/Node/Expression/FunctionTest.php b/test/Twig/Tests/Node/Expression/FunctionTest.php index a4f6768..431dc38 100644 --- a/test/Twig/Tests/Node/Expression/FunctionTest.php +++ b/test/Twig/Tests/Node/Expression/FunctionTest.php @@ -91,7 +91,7 @@ class Twig_Tests_Node_Expression_FunctionTest extends Twig_Test_NodeTestCase protected function getEnvironment() { if (version_compare(phpversion(), '5.3.0', '>=')) { - return include 'PHP53/FunctionTest.php'; + return include 'PHP53/FunctionInclude.php'; } return parent::getEnvironment(); diff --git a/test/Twig/Tests/Node/Expression/PHP53/FilterInclude.php b/test/Twig/Tests/Node/Expression/PHP53/FilterInclude.php new file mode 100644 index 0000000..15e3aa9 --- /dev/null +++ b/test/Twig/Tests/Node/Expression/PHP53/FilterInclude.php @@ -0,0 +1,6 @@ +addFilter(new Twig_SimpleFilter('anonymous', function () {})); + +return $env; diff --git a/test/Twig/Tests/Node/Expression/PHP53/FilterTest.php b/test/Twig/Tests/Node/Expression/PHP53/FilterTest.php deleted file mode 100644 index 15e3aa9..0000000 --- a/test/Twig/Tests/Node/Expression/PHP53/FilterTest.php +++ /dev/null @@ -1,6 +0,0 @@ -addFilter(new Twig_SimpleFilter('anonymous', function () {})); - -return $env; diff --git a/test/Twig/Tests/Node/Expression/PHP53/FunctionInclude.php b/test/Twig/Tests/Node/Expression/PHP53/FunctionInclude.php new file mode 100644 index 0000000..d2170ed --- /dev/null +++ b/test/Twig/Tests/Node/Expression/PHP53/FunctionInclude.php @@ -0,0 +1,6 @@ +addFunction(new Twig_SimpleFunction('anonymous', function () {})); + +return $env; diff --git a/test/Twig/Tests/Node/Expression/PHP53/FunctionTest.php b/test/Twig/Tests/Node/Expression/PHP53/FunctionTest.php deleted file mode 100644 index d2170ed..0000000 --- a/test/Twig/Tests/Node/Expression/PHP53/FunctionTest.php +++ /dev/null @@ -1,6 +0,0 @@ -addFunction(new Twig_SimpleFunction('anonymous', function () {})); - -return $env; diff --git a/test/Twig/Tests/Node/Expression/PHP53/TestInclude.php b/test/Twig/Tests/Node/Expression/PHP53/TestInclude.php new file mode 100644 index 0000000..6366286 --- /dev/null +++ b/test/Twig/Tests/Node/Expression/PHP53/TestInclude.php @@ -0,0 +1,6 @@ +addTest(new Twig_SimpleTest('anonymous', function () {})); + +return $env; diff --git a/test/Twig/Tests/Node/Expression/PHP53/TestTest.php b/test/Twig/Tests/Node/Expression/PHP53/TestTest.php deleted file mode 100644 index 6366286..0000000 --- a/test/Twig/Tests/Node/Expression/PHP53/TestTest.php +++ /dev/null @@ -1,6 +0,0 @@ -addTest(new Twig_SimpleTest('anonymous', function () {})); - -return $env; diff --git a/test/Twig/Tests/Node/Expression/TestTest.php b/test/Twig/Tests/Node/Expression/TestTest.php index 73de448..0664150 100644 --- a/test/Twig/Tests/Node/Expression/TestTest.php +++ b/test/Twig/Tests/Node/Expression/TestTest.php @@ -60,7 +60,7 @@ class Twig_Tests_Node_Expression_TestTest extends Twig_Test_NodeTestCase protected function getEnvironment() { if (version_compare(phpversion(), '5.3.0', '>=')) { - return include 'PHP53/TestTest.php'; + return include 'PHP53/TestInclude.php'; } return parent::getEnvironment(); -- 1.7.2.5