Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

[TwigBridge] updated Composer suggested packages and test fixes #3830

Merged
merged 3 commits into from

3 participants

@eriksencosta

No description provided.

src/Symfony/Bridge/Twig/composer.json
@@ -20,8 +20,10 @@
"twig/twig": ">=1.1,<2.0-dev"
},
"suggest": {
+ "symfony/event-dispatcher": "self.version",
@stof Collaborator
stof added a note

why this ? There is nothing requiring the event dispatcher here AFAIK

It is needed for the FormExtension tests. It is an inherited dependency from the Form AbstractLayoutTest base test class.

@stof Collaborator
stof added a note

but it is a deps of the Form component, not of the twig bridge. So there is no reason to list it here. Composer will install it when installing Form. Listing deps of you deps is not a good idea as it means you are doing part of composer's job by hand

Agreed! I'll rebase it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@eriksencosta

Rebased.

@fabpot fabpot referenced this pull request from a commit
@fabpot fabpot 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.
c6096e3
@fabpot fabpot merged commit fdee352 into symfony:master
@mmucklo mmucklo referenced this pull request from a commit
@fabpot fabpot 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.
0d37124
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
5 src/Symfony/Bridge/Twig/README.md
@@ -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
View
2  src/Symfony/Bridge/Twig/Tests/TestCase.php
@@ -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()
{
View
5 src/Symfony/Bridge/Twig/Tests/bootstrap.php
@@ -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')) {
View
1  src/Symfony/Bridge/Twig/composer.json
@@ -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"
},
Something went wrong with that request. Please try again.