RetailCRM-Mirror/NelmioApiDocBundle
1
0
Fork 0
mirror of https://github.com/retailcrm/NelmioApiDocBundle.git synced 2025-02-02 15:51:48 +03:00
Code Issues Projects Releases Wiki Activity

Allow sf2.3, fix scope issue

Browse Source
This commit is contained in:
Jordi Boggiano 2013-05-03 16:26:16 +02:00
parent 867f82d97d
commit 255d42830d
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Extractor/ApiDocExtractor.php
View File

@ -180,7 +180,7 @@ class ApiDocExtractor
$method = $matches[2]; $method = $matches[2];
if ($this->container->has($controller)) { if ($this->container->has($controller)) {
$this->container->enterScope('request'); $this->container->enterScope('request');
$this->container->set('request', new Request()); $this->container->set('request', new Request(), 'request');
$class = get_class($this->container->get($controller)); $class = get_class($this->container->get($controller));
$this->container->leaveScope('request'); $this->container->leaveScope('request');
} }

10
Tests/WebTestCase.php
View File

@ -14,6 +14,7 @@ namespace Nelmio\ApiDocBundle\Tests;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase as BaseWebTestCase; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase as BaseWebTestCase;
use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\HttpKernel\Kernel; use Symfony\Component\HttpKernel\Kernel;
use Symfony\Component\DependencyInjection\Scope;
abstract class WebTestCase extends BaseWebTestCase abstract class WebTestCase extends BaseWebTestCase
{ {
@ -43,7 +44,14 @@ abstract class WebTestCase extends BaseWebTestCase
} }
static::$kernel->boot(); static::$kernel->boot();
return static::$kernel->getContainer(); $container = static::$kernel->getContainer();
// add request scope if not created (for forward compat with sf2.3)
if (!$container->hasScope('request')) {
$container->addScope(new Scope('request'));
}
return $container;
} }
protected static function getKernelClass() protected static function getKernelClass()

6
composer.json
View File

@ -15,7 +15,7 @@
} }
], ],
"require": { "require": {
"symfony/framework-bundle": "~2.1,<2.3-dev", "symfony/framework-bundle": "~2.1",
"symfony/twig-bundle": "~2.1", "symfony/twig-bundle": "~2.1",
"symfony/form": "~2.1", "symfony/form": "~2.1",
"dflydev/markdown": "1.0.*" "dflydev/markdown": "1.0.*"
@ -28,9 +28,9 @@
"symfony/browser-kit": "~2.1", "symfony/browser-kit": "~2.1",
"symfony/validator": "~2.1", "symfony/validator": "~2.1",
"symfony/yaml": "~2.1", "symfony/yaml": "~2.1",
"friendsofsymfony/rest-bundle": "dev-master", "friendsofsymfony/rest-bundle": "0.12.*@dev",
"jms/serializer-bundle": ">=0.11", "jms/serializer-bundle": ">=0.11",
"sensio/framework-extra-bundle": "dev-master" "sensio/framework-extra-bundle": "~2.1"
}, },
"minimum-stability": "dev", "minimum-stability": "dev",
"autoload": { "autoload": {