Merge pull request #107 from FriendsOfSymfony/use-jsonp-callback-vali…

…dator Use JsonCallbackValidator lib
FriendsOfSymfony · Oct 21, 2013 · ca856bc · ca856bc
2 parents 3973b22 + 95c30b8
commit ca856bc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 146 deletions.
diff --git a/Controller/Controller.php b/Controller/Controller.php
@@ -14,7 +14,6 @@
 use FOS\JsRoutingBundle\Extractor\ExposedRoutesExtractorInterface;
 use FOS\JsRoutingBundle\Response\RoutesResponse;
 use FOS\JsRoutingBundle\Util\CacheControlConfig;
-use FOS\JsRoutingBundle\Validator\CallbackValidator;
 use Symfony\Component\Config\ConfigCache;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -103,8 +102,8 @@ public function indexAction(Request $request, $_format)
         $content = file_get_contents((string) $cache);
 
         if (null !== $callback = $request->query->get('callback')) {
-            $validator = new CallbackValidator();
-            if (!$validator->isValid($callback)) {
+            $validator = new \JsonpCallbackValidator();
+            if (!$validator->validate($callback)) {
                 throw new HttpException(400, 'Invalid JSONP callback value');
             }
 

diff --git a/Tests/Validator/CallbackValidatorTest.php b/Tests/Validator/CallbackValidatorTest.php
diff --git a/Validator/CallbackValidator.php b/Validator/CallbackValidator.php
diff --git a/composer.json b/composer.json
@@ -20,7 +20,8 @@
         "php": ">=5.3.2",
         "symfony/framework-bundle": "~2.0",
         "symfony/serializer": "~2.0",
-        "symfony/console": "~2.0"
+        "symfony/console": "~2.0",
+        "willdurand/jsonp-callback-validator": "~1.0"
     },
     "autoload": {
         "psr-0": { "FOS\\JsRoutingBundle": "" }