use FOS\Rest lib

daFish · Mar 2, 2012 · 3fa2da6 · 3fa2da6
1 parent 10d5243
commit 3fa2da6
Show file tree

Hide file tree

Showing 26 changed files with 26 additions and 430 deletions.
diff --git a/Controller/ExceptionController.php b/Controller/ExceptionController.php
@@ -18,7 +18,7 @@
     Symfony\Component\HttpFoundation\Request,
     Symfony\Component\HttpFoundation\Response;
 
-use FOS\RestBundle\Response\Codes,
+use FOS\Rest\Util\Codes,
     FOS\RestBundle\View\ViewHandler,
     FOS\RestBundle\View\View,
     FOS\RestBundle\Util\ExceptionWrapper;

diff --git a/Decoder/ContainerDecoderProvider.php b/Decoder/ContainerDecoderProvider.php
@@ -13,6 +13,8 @@
 
 use Symfony\Component\DependencyInjection\ContainerAware;
 
+use FOS\Rest\Decoder\DecoderProviderInterface;
+
 /**
  * Provides encoders through the Symfony2 DIC
  *

diff --git a/Decoder/DecoderInterface.php b/Decoder/DecoderInterface.php
diff --git a/Decoder/DecoderProviderInterface.php b/Decoder/DecoderProviderInterface.php
diff --git a/Decoder/JsonDecoder.php b/Decoder/JsonDecoder.php
diff --git a/Decoder/XmlDecoder.php b/Decoder/XmlDecoder.php
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -15,7 +15,7 @@
     Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition,
     Symfony\Component\Config\Definition\ConfigurationInterface;
 
-use FOS\RestBundle\Response\Codes;
+use FOS\Rest\Util\Codes;
 
 /**
  * This class contains the configuration information for the bundle

diff --git a/DependencyInjection/FOSRestExtension.php b/DependencyInjection/FOSRestExtension.php
@@ -18,7 +18,7 @@
     Symfony\Component\DependencyInjection\ContainerBuilder,
     Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 
-use FOS\RestBundle\Response\Codes;
+use FOS\Rest\Util\Codes;
 
 class FOSRestExtension extends Extension
 {
@@ -63,7 +63,7 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setParameter($this->getAlias().'.force_redirects', $config['view']['force_redirects']);
 
         if (!is_numeric($config['view']['failed_validation'])) {
-            $config['view']['failed_validation'] = constant('\FOS\RestBundle\Response\Codes::'.$config['view']['failed_validation']);
+            $config['view']['failed_validation'] = constant('\FOS\Rest\Util\Codes::'.$config['view']['failed_validation']);
         }
         $container->setParameter($this->getAlias().'.failed_validation', $config['view']['failed_validation']);
 
@@ -76,7 +76,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         foreach ($config['exception']['codes'] as $exception => $code) {
             if (!is_numeric($code)) {
-                $config['exception']['codes'][$exception] = constant("\FOS\RestBundle\Response\Codes::$code");
+                $config['exception']['codes'][$exception] = constant("\FOS\Rest\Util\Codes::$code");
             }
             $this->testExceptionExists($exception);
         }

diff --git a/EventListener/BodyListener.php b/EventListener/BodyListener.php
@@ -11,7 +11,7 @@
 
 namespace FOS\RestBundle\EventListener;
 
-use FOS\RestBundle\Decoder\DecoderProviderInterface;
+use FOS\Rest\Decoder\DecoderProviderInterface;
 
 use Symfony\Component\HttpFoundation\ParameterBag,
     Symfony\Component\HttpKernel\Event\GetResponseEvent;

diff --git a/EventListener/FormatListener.php b/EventListener/FormatListener.php
@@ -16,8 +16,8 @@
     Symfony\Component\HttpKernel\Exception\HttpException,
     Symfony\Component\HttpKernel\HttpKernelInterface;
 
-use FOS\RestBundle\Response\Codes,
-    FOS\RestBundle\Util\FormatNegotiatorInterface;
+use FOS\Rest\Util\Codes,
+    FOS\Rest\Util\FormatNegotiatorInterface;
 
 /**
  * This listener handles Accept header format negotiations.

diff --git a/Resources/config/body_listener.xml b/Resources/config/body_listener.xml
@@ -6,9 +6,9 @@
 
     <services>
 
-        <service id="fos_rest.decoder.json" class="FOS\RestBundle\Decoder\JsonDecoder" />
+        <service id="fos_rest.decoder.json" class="FOS\Rest\Decoder\JsonDecoder" />
 
-        <service id="fos_rest.decoder.xml" class="FOS\RestBundle\Decoder\XmlDecoder" />
+        <service id="fos_rest.decoder.xml" class="FOS\Rest\Decoder\XmlDecoder" />
 
         <service id="fos_rest.decoder_provider" class="FOS\RestBundle\Decoder\ContainerDecoderProvider">
             <argument>%fos_rest.decoders%</argument>

diff --git a/Resources/config/util.xml b/Resources/config/util.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="fos_rest.format_negotiator.class">FOS\RestBundle\Util\FormatNegotiator</parameter>
+        <parameter key="fos_rest.format_negotiator.class">FOS\Rest\Util\FormatNegotiator</parameter>
     </parameters>
 
     <services>

diff --git a/Resources/doc/2-the-view-layer.md b/Resources/doc/2-the-view-layer.md
@@ -70,7 +70,7 @@ formats if needed.
 
 Finally the HTTP response status code for failed validation defaults to
 ``400``. Note when changing the default you can use name constants of
-``FOS\RestBundle\Response\Codes`` class or an integer status code.
+``FOS\Rest\Util\Codes`` class or an integer status code.
 
 You can also set the default templating engine to something different than the
 default of ``twig``:

diff --git a/Resources/doc/4-exception-controller-support.md b/Resources/doc/4-exception-controller-support.md
@@ -15,7 +15,7 @@ twig:
 To map Exception classes to HTTP response status codes an “exception map” may
 be configured, where the keys match a fully qualified class name and the values
 are either an integer HTTP response status code or a string matching a class
-constant of the ``FOS\RestBundle\Response\Codes`` class:
+constant of the ``FOS\Rest\Util\Codes`` class:
 
 ```yaml
 # app/config/config.yml

diff --git a/Resources/doc/examples/RssHandler.php b/Resources/doc/examples/RssHandler.php
@@ -4,7 +4,7 @@
 
 use FOS\RestBundle\View\View,
     FOS\RestBundle\View\ViewHandler,
-    FOS\RestBundle\Response\Codes;
+    FOS\Rest\Util\Codes;
 
 use Symfony\Bridge\Monolog\Logger,
     Symfony\Component\HttpFoundation\Request,

diff --git a/Response/Codes.php b/Response/Codes.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,8 @@ @@
     use Symfony\Component\DependencyInjection\ContainerAware;
+    use FOS\Rest\Decoder\DecoderProviderInterface;
     /**
      * Provides encoders through the Symfony2 DIC
      *
@@ Expand Down @@