Permalink
Browse files

Merge branch 'master' into query_param-proof-of-concept

  • Loading branch information...
2 parents e430694 + 603b68e commit bf75439cfbb5f972529bcc4ccefad8d06befcfae @lsmith77 lsmith77 committed Mar 2, 2012
@@ -18,6 +18,10 @@ method is the standard Symfony2 method.
Add the following lines in your `deps` file:
```
+[FOSRest]
+ git=git://github.com/FriendsOfSymfony/FOSRest.git
+ target=fos/FOS/RestBundle
+
[FOSRestBundle]
git=git://github.com/FriendsOfSymfony/FOSRestBundle.git
target=bundles/FOS/RestBundle
@@ -35,6 +39,7 @@ If you prefer instead to use git submodules, then run the following:
``` bash
$ git submodule add git://github.com/FriendsOfSymfony/FOSRestBundle.git vendor/bundles/FOS/RestBundle
+$ git submodule add git://github.com/FriendsOfSymfony/FOSRest.git vendor/fos/FOS/Rest
$ git submodule update --init
```
@@ -48,7 +53,7 @@ Add the `FOS` namespace to your autoloader:
$loader->registerNamespaces(array(
// ...
- 'FOS' => __DIR__.'/../vendor/bundles',
+ 'FOS' => array(__DIR__.'/../vendor/bundles', __DIR__.'/../vendor/fos'),
));
```
@@ -126,7 +126,7 @@ fos_rest:
```
Your custom decoder service must use a class that implements the
-``FOS\RestBundle\Decoder\DecoderInterface``.
+``FOS\Rest\Decoder\DecoderInterface``.
### Format listener
@@ -34,7 +34,7 @@ class BodyListenerTest extends \PHPUnit_Framework_TestCase
*/
public function testOnKernelRequest($decode, $request, $method, $contentType, $expectedParameters)
{
- $decoder = $this->getMockBuilder('FOS\RestBundle\Decoder\DecoderInterface')->disableOriginalConstructor()->getMock();
+ $decoder = $this->getMockBuilder('FOS\Rest\Decoder\DecoderInterface')->disableOriginalConstructor()->getMock();
$decoder->expects($this->any())
->method('decode')
->will($this->returnValue($request->getContent()));

0 comments on commit bf75439

Please sign in to comment.