Permalink
Browse files

merged branch eriksencosta/test-fixes (PR #3830)

Commits
-------

fdee352 [TwigBridge] updated suggested packages
dad1750 [TwigBridge] updated TestCase as an abstract class
140ac20 [TwigBridge] fixed bootstrap

Discussion
----------

[TwigBridge] updated Composer suggested packages and test fixes

---------------------------------------------------------------------------

by eriksencosta at 2012-04-08T06:13:53Z

Rebased.
  • Loading branch information...
2 parents bca8c5f + fdee352 commit c6096e323ef67954cd75493a4305c7ac6ab2d024 @fabpot fabpot committed Apr 8, 2012
@@ -16,7 +16,8 @@ Components, declare the following environment variables before running
PHPUnit:
export TWIG=../path/to/Twig
- export SYMFONY_FORM=../path/to/Form
- export SYMFONY_TRANSLATION=../path/to/Translation
export SYMFONY_EVENT_DISPATCHER=../path/to/EventDispatcher
+ export SYMFONY_FORM=../path/to/Form
export SYMFONY_LOCALE=../path/to/Locale
+ export SYMFONY_TEMPLATING=../path/to/Templating
+ export SYMFONY_TRANSLATION=../path/to/Translation
@@ -11,7 +11,7 @@
namespace Symfony\Bridge\Twig\Tests;
-class TestCase extends \PHPUnit_Framework_TestCase
+abstract class TestCase extends \PHPUnit_Framework_TestCase
{
protected function setUp()
{
@@ -11,10 +11,11 @@
spl_autoload_register(function ($class) {
foreach (array(
+ 'SYMFONY_EVENT_DISPATCHER' => 'EventDispatcher',
'SYMFONY_FORM' => 'Form',
- 'SYMFONY_TRANSLATION' => 'Translation',
'SYMFONY_LOCALE' => 'Locale',
- 'SYMFONY_EVENT_DISPATCHER' => 'EventDispatcher',
+ 'SYMFONY_TEMPLATING' => 'Templating',
+ 'SYMFONY_TRANSLATION' => 'Translation',
) as $env => $name) {
if (isset($_SERVER[$env]) && 0 === strpos(ltrim($class, '/'), 'Symfony\Component\\'.$name)) {
if (file_exists($file = $_SERVER[$env].'/'.substr(str_replace('\\', '/', $class), strlen('Symfony\Component\\'.$name)).'.php')) {
@@ -22,6 +22,7 @@
"suggest": {
"symfony/form": "self.version",
"symfony/routing": "self.version",
+ "symfony/templating": "self.version",
"symfony/translation": "self.version",
"symfony/yaml": "self.version"
},

0 comments on commit c6096e3

Please sign in to comment.