No multiple uses, fix cs

FriendsOfSymfony · Jul 11, 2012 · a58149a · a58149a
1 parent ece5468
commit a58149a
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 53 deletions.
diff --git a/DependencyInjection/FOSRestExtension.php b/DependencyInjection/FOSRestExtension.php
@@ -13,8 +13,6 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\HttpKernel\Kernel;

diff --git a/Request/ParamFetcherInterface.php b/Request/ParamFetcherInterface.php
@@ -36,7 +36,7 @@ public function setController($controller);
      *
      * @return mixed Value of the parameter.
      */
-    function get($name, $strict = null);
+    public function get($name, $strict = null);
 
     /**
      * Get all validated parameter.

diff --git a/Routing/Loader/AbstractRestRouteLoader.php b/Routing/Loader/AbstractRestRouteLoader.php
@@ -13,7 +13,6 @@
 
 use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 use FOS\RestBundle\Routing\Loader\Reader\RestControllerReader;

diff --git a/Routing/Loader/RestXmlCollectionLoader.php b/Routing/Loader/RestXmlCollectionLoader.php
@@ -12,9 +12,7 @@
 namespace FOS\RestBundle\Routing\Loader;
 
 use Symfony\Component\Config\FileLocatorInterface;
-use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Routing\Loader\XmlFileLoader;
-use Symfony\Component\Config\Loader\FileLoader;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\Route;
 
@@ -104,7 +102,7 @@ public function supports($resource, $type = null)
     }
 
     /**
-     * @param \DOMDocument $dom
+     * @param  \DOMDocument              $dom
      * @throws \InvalidArgumentException When xml doesn't validate its xsd schema
      */
     protected function validate(\DOMDocument $dom)

diff --git a/Routing/Loader/RestYamlCollectionLoader.php b/Routing/Loader/RestYamlCollectionLoader.php
@@ -15,7 +15,6 @@
 use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Yaml\Yaml;
 use Symfony\Component\Routing\Loader\YamlFileLoader;
-use Symfony\Component\Config\Loader\FileLoader;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\Route;
 

diff --git a/Tests/DependencyInjection/FOSRestExtensionTest.php b/Tests/DependencyInjection/FOSRestExtensionTest.php
@@ -11,9 +11,9 @@
 
 namespace FOS\RestBundle\Tests\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder,
-    Symfony\Component\DependencyInjection\Definition,
-    Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
 
 use FOS\RestBundle\DependencyInjection\FOSRestExtension;
 

diff --git a/Tests/EventListener/FormatListenerTest.php b/Tests/EventListener/FormatListenerTest.php
@@ -11,8 +11,8 @@
 
 namespace FOS\RestBundle\Tests\EventListener;
 
-use Symfony\Component\HttpKernel\HttpKernelInterface,
-    Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpFoundation\Request;
 
 use FOS\RestBundle\EventListener\FormatListener;
 

diff --git a/Tests/EventListener/ViewResponseListenerTest.php b/Tests/EventListener/ViewResponseListenerTest.php
@@ -11,8 +11,8 @@
 
 namespace FOS\RestBundle\Tests\EventListener;
 
-use Symfony\Component\HttpFoundation\Request,
-    Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 
 use FOS\RestBundle\EventListener\ViewResponseListener;
 

diff --git a/Tests/Fixtures/Controller/AnnotatedUsersController.php b/Tests/Fixtures/Controller/AnnotatedUsersController.php
@@ -13,14 +13,14 @@
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
-use FOS\RestBundle\Controller\Annotations\Route,
-    FOS\RestBundle\Controller\Annotations\NoRoute,
-    FOS\RestBundle\Controller\Annotations\Get,
-    FOS\RestBundle\Controller\Annotations\Post,
-    FOS\RestBundle\Controller\Annotations\Put,
-    FOS\RestBundle\Controller\Annotations\Patch,
-    FOS\RestBundle\Controller\Annotations\Delete,
-    FOS\RestBundle\Controller\Annotations\Head;
+use FOS\RestBundle\Controller\Annotations\Route;
+use FOS\RestBundle\Controller\Annotations\NoRoute;
+use FOS\RestBundle\Controller\Annotations\Get;
+use FOS\RestBundle\Controller\Annotations\Post;
+use FOS\RestBundle\Controller\Annotations\Put;
+use FOS\RestBundle\Controller\Annotations\Patch;
+use FOS\RestBundle\Controller\Annotations\Delete;
+use FOS\RestBundle\Controller\Annotations\Head;
 
 class AnnotatedUsersController extends Controller
 {

diff --git a/Tests/Fixtures/Controller/UsersController.php b/Tests/Fixtures/Controller/UsersController.php
@@ -11,9 +11,9 @@
 
 namespace FOS\RestBundle\Tests\Fixtures\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller,
-    Symfony\Component\HttpFoundation\Response,
-    Symfony\Component\HttpFoundation\Request;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\Request;
 
 class UsersController extends Controller
 {

diff --git a/Tests/Request/ParamFetcherTest.php b/Tests/Request/ParamFetcherTest.php
@@ -11,7 +11,6 @@
 
 namespace FOS\RestBundle\Tests\Request;
 
-use FOS\RestBundle\Controller\Annotations\NamePrefix;
 use FOS\RestBundle\Controller\Annotations\Param;
 use FOS\RestBundle\Controller\Annotations\RequestParam;
 use FOS\RestBundle\Controller\Annotations\QueryParam;
@@ -90,11 +89,11 @@ public function getParamFetcher($query = array(), $request = array(), $attribute
     /**
      * Test valid parameters.
      *
-     * @param string $param which param to test
-     * @param string $expected Expected query parameter value.
+     * @param string $param       which param to test
+     * @param string $expected    Expected query parameter value.
      * @param string $expectedAll Expected query parameter values.
-     * @param array  $query    Query parameters for the request.
-     * @param array  $request  Request parameters for the request.
+     * @param array  $query       Query parameters for the request.
+     * @param array  $request     Request parameters for the request.
      *
      * @dataProvider validatesConfiguredParamDataProvider
      */

diff --git a/Tests/Routing/Loader/RestXmlCollectionLoaderTest.php b/Tests/Routing/Loader/RestXmlCollectionLoaderTest.php
@@ -11,11 +11,11 @@
 
 namespace FOS\RestBundle\Tests\Routing\Loader;
 
-use Symfony\Component\Config\Loader\LoaderResolver,
-    Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Loader\LoaderResolver;
+use Symfony\Component\Config\FileLocator;
 
-use FOS\RestBundle\Routing\Loader\RestRouteProcessor,
-    FOS\RestBundle\Routing\Loader\RestXmlCollectionLoader;
+use FOS\RestBundle\Routing\Loader\RestRouteProcessor;
+use FOS\RestBundle\Routing\Loader\RestXmlCollectionLoader;
 
 /**
  * RestXmlCollectionLoader test.

diff --git a/Tests/Routing/Loader/RestYamlCollectionLoaderTest.php b/Tests/Routing/Loader/RestYamlCollectionLoaderTest.php
@@ -11,11 +11,11 @@
 
 namespace FOS\RestBundle\Tests\Routing\Loader;
 
-use Symfony\Component\Config\Loader\LoaderResolver,
-    Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Loader\LoaderResolver;
+use Symfony\Component\Config\FileLocator;
 
-use FOS\RestBundle\Routing\Loader\RestRouteProcessor,
-    FOS\RestBundle\Routing\Loader\RestYamlCollectionLoader;
+use FOS\RestBundle\Routing\Loader\RestRouteProcessor;
+use FOS\RestBundle\Routing\Loader\RestYamlCollectionLoader;
 
 /**
  * RestYamlCollectionLoader test.

diff --git a/Tests/View/ViewHandlerTest.php b/Tests/View/ViewHandlerTest.php
@@ -11,13 +11,13 @@
 
 namespace FOS\RestBundle\Tests\View;
 
-use FOS\RestBundle\View\View,
-    FOS\RestBundle\View\ViewHandler,
-    Symfony\Bundle\FrameworkBundle\Templating\TemplateReference,
-    FOS\Rest\Util\Codes,
-    Symfony\Component\HttpFoundation\Request,
-    Symfony\Component\HttpFoundation\Response,
-    Symfony\Component\Form\FormView;
+use FOS\RestBundle\View\View;
+use FOS\RestBundle\View\ViewHandler;
+use Symfony\Bundle\FrameworkBundle\Templating\TemplateReference;
+use FOS\Rest\Util\Codes;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Form\FormView;
 
 /**
  * View test

diff --git a/Tests/View/ViewTest.php b/Tests/View/ViewTest.php
@@ -11,13 +11,13 @@
 
 namespace FOS\RestBundle\Tests\View;
 
-use FOS\RestBundle\View\View,
-    FOS\RestBundle\View\RedirectView,
-    FOS\RestBundle\View\RouteRedirectView,
-    Symfony\Bundle\FrameworkBundle\Templating\TemplateReference,
-    FOS\Rest\Util\Codes,
-    Symfony\Component\HttpFoundation\Request,
-    Symfony\Component\HttpFoundation\Response;
+use FOS\RestBundle\View\View;
+use FOS\RestBundle\View\RedirectView;
+use FOS\RestBundle\View\RouteRedirectView;
+use Symfony\Bundle\FrameworkBundle\Templating\TemplateReference;
+use FOS\Rest\Util\Codes;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 
 /**
  * View test