merged 2.0
This commit is contained in:
commit
ae8efc4da9
@ -19,6 +19,10 @@
|
||||
"require": {
|
||||
"php": ">=5.3.2"
|
||||
},
|
||||
"recommend": {
|
||||
"doctrine/dbal": ">=2.1",
|
||||
"doctrine/orm": ">=2.1"
|
||||
},
|
||||
"suggest": {
|
||||
"symfony/form": ">=2.1",
|
||||
"symfony/validator": ">=2.1"
|
||||
|
@ -17,7 +17,8 @@
|
||||
}
|
||||
],
|
||||
"require": {
|
||||
"php": ">=5.3.2"
|
||||
"php": ">=5.3.2",
|
||||
"twig/twig": ">=1.1"
|
||||
},
|
||||
"suggest": {
|
||||
"symfony/form": ">=2.1",
|
||||
|
@ -20,5 +20,9 @@
|
||||
"php": ">=5.3.2",
|
||||
"symfony/doctrine-bridge": ">=2.1",
|
||||
"symfony/doctrine-abstract-bundle": ">=2.1"
|
||||
},
|
||||
"recommend": {
|
||||
"doctrine/dbal": ">=2.0",
|
||||
"doctrine/orm": ">=2.0"
|
||||
}
|
||||
}
|
||||
|
@ -17,6 +17,8 @@
|
||||
}
|
||||
],
|
||||
"require": {
|
||||
"php": ">=5.3.2"
|
||||
"php": ">=5.3.2",
|
||||
"twig/twig": ">=1.1",
|
||||
"symfony/twig-bridge": ">=2.0"
|
||||
}
|
||||
}
|
||||
|
@ -17,7 +17,8 @@
|
||||
}
|
||||
],
|
||||
"require": {
|
||||
"php": ">=5.3.2"
|
||||
"php": ">=5.3.2",
|
||||
"doctrine/common": ">=2.1"
|
||||
},
|
||||
"suggest": {
|
||||
"symfony/http-foundation": ">=2.1",
|
||||
|
@ -17,6 +17,13 @@ use Symfony\Component\HttpFoundation\Request;
|
||||
|
||||
class WebProcessorTest extends \PHPUnit_Framework_TestCase
|
||||
{
|
||||
public function setUp()
|
||||
{
|
||||
if (!class_exists('Monolog\\Logger')) {
|
||||
$this->markTestSkipped('Monolog is not available.');
|
||||
}
|
||||
}
|
||||
|
||||
public function testUsesRequestServerData()
|
||||
{
|
||||
$server = array(
|
||||
|
Reference in New Issue
Block a user