Merge pull request #1320 from FriendsOfSymfony/BUGFIX2

Fix a typo in the RestActionLoader

Author: GuilhemN

Routing/Loader/Reader/RestActionReader.php

@@ -350,9 +350,9 @@ private function getMethodArguments(\ReflectionMethod $method)
 
             $argumentClass = $argument->getClass();
             if ($argumentClass) {
+                $className = $argumentClass->getName();
                 foreach ($ignoreClasses as $class) {
-                    $className = $argumentClass->getName();
-                    if ($className === $class || is_subclass_of($argumentClass, $className)) {
+                    if ($className === $class || is_subclass_of($className, $class)) {
                         continue 2;
                     }
                 }

Tests/Fixtures/Controller/AnnotatedConditionalUsersController.php

@@ -23,6 +23,7 @@
 use FOS\RestBundle\Controller\Annotations\Options;
 use FOS\RestBundle\Controller\Annotations\Link;
 use FOS\RestBundle\Controller\Annotations\Unlink;
+use FOS\RestBundle\Tests\Fixtures\User;
 
 class AnnotatedConditionalUsersController extends Controller
 {
@@ -50,7 +51,7 @@ public function getUsersAction()
     /**
      * @Route(requirements={"slug" = "[a-z]+"})
      */
-    public function getUserAction($slug)
+    public function getUserAction(User $slug)
     {
     }
 

Tests/Fixtures/Controller/AnnotatedPrefixedController.php

@@ -12,6 +12,7 @@
 namespace FOS\RestBundle\Tests\Fixtures\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Request;
 use FOS\RestBundle\Controller\Annotations\Prefix;
 
 /**
@@ -20,7 +21,7 @@
  */
 class AnnotatedPrefixedController extends Controller
 {
-    public function getSomethingAction()
+    public function getSomethingAction(Request $request)
     {
     }
 

Tests/Fixtures/Controller/ArticleController.php

@@ -14,6 +14,7 @@
 use FOS\RestBundle\Routing\ClassResourceInterface;
 use FOS\RestBundle\Controller\FOSRestController;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Validator\ConstraintViolationList;
 
 class ArticleController extends FosRestController implements ClassResourceInterface
 {
@@ -23,7 +24,7 @@ public function optionsAction()
 
  // [OPTIONS] /articles
 
-    public function cgetAction()
+    public function cgetAction(ConstraintViolationList $errors)
     {
     }
 

Tests/Fixtures/User.php

@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the FOSRestBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FOS\RestBundle\Tests\Fixtures;
+
+/**
+ * @author Ener-Getick <[email protected]>
+ */
+class User
+{
+}