Fix multiquery

Fix multiquery

Fix multiquery

Author: PedroTroller

spec/Knp/PhpSpec/WellDone/Locator/ResourceInspectorSpec.php

@@ -9,12 +9,16 @@ class ResourceInspectorSpec extends ObjectBehavior
 {
     /**
      * @param PhpSpec\Locator\PSR0\PSR0Resource $resource
+     * @param PhpSpec\Locator\PSR0\PSR0Resource $resource2
      * @param Knp\PhpSpec\WellDone\Util\Filesystem $filesystem
      **/
-    function let($resource, $filesystem)
+    function let($resource, $resource2, $filesystem)
     {
         $resource->getSpecFilename()->willReturn('spec/The/Path.php');
         $resource->getSrcFilename()->willReturn('src/The/Path.php');
+        $resource->getSrcClassname()->willReturn('The\Path');
+
+        $resource2->getSrcClassname()->willReturn('The\PathType');
 
         $this->beConstructedWith($filesystem);
     }
@@ -78,4 +82,30 @@ function it_should_detect_if_resource_is_not_abstract($resource, $filesystem)
 
         $this->isAbstract($resource)->shouldReturn(false);
     }
+
+    public function it_should_test_query_matching($resource)
+    {
+        $this->matchQuery($resource, '*Path')->shouldReturn(true);
+        $this->matchQuery($resource, 'The\*')->shouldReturn(true);
+        $this->matchQuery($resource, '*Pa*')->shouldReturn(true);
+    }
+
+    public function it_should_test_query_not_matching($resource)
+    {
+        $this->matchQuery($resource, 'Path')->shouldReturn(false);
+        $this->matchQuery($resource, 'The/')->shouldReturn(false);
+        $this->matchQuery($resource, '*path')->shouldReturn(false);
+    }
+
+    public function it_should_test_queries_matching($resource2)
+    {
+        $this->matchQueries($resource2, '*Type, App\*, *Controller')->shouldReturn(true);
+        $this->matchQueries($resource2, '*Type, The\*, *Controller')->shouldReturn(true);
+        $this->matchQueries($resource2, '*Type, The\*, *Path*')->shouldReturn(true);
+    }
+
+    public function it_should_test_queries_not_matching($resource2)
+    {
+        $this->matchQueries($resource2, '*Top, App\*, *Controller')->shouldReturn(false);
+    }
 }

src/Knp/PhpSpec/WellDone/Locator/NoSpecLocator.php

@@ -25,10 +25,18 @@ public function findResourcesWithExclusion($query)
         return $this->findNotSpecResources($this->getFullSrcPath(), $query);
     }
 
-    public function supportsExclusionQuery($query)
+    public function supportsExclusionQuery($query, $delim = ',')
     {
-        $query = preg_replace('/[A-Za-z_\\*]/', '', $query);
-        return empty($query);
+        foreach (explode($delim, $query) as $q) {
+            $q = preg_replace('/[A-Za-z_\\\*]/', '', trim($q));
+
+            if (false === empty($q)) {
+
+                return false;
+            }
+        }
+
+        return true;
     }
 
     protected function findNotSpecResources($path, $query = null)

src/Knp/PhpSpec/WellDone/Locator/ResourceInspector.php

@@ -38,7 +38,6 @@ public function matchQueries(PSR0Resource $resource, $queries, $delim = ',')
     {
         foreach (explode($delim, $queries) as $query) {
             if (true === $this->matchQuery($resource, trim($query))) {
-
                 return true;
             }
         }