Merge pull request #3 from m-shule/dev

Fix Param matching

Author: Naoray

src/Matching/CueValidator.php

@@ -21,7 +21,7 @@ public function matches(Pipe $pipe, Request $request)
         // if cue has no static params we have to let the request
         // pass and trust in the PatternValidator to detect
         // mistakes with the parameters.
-        if (Str::startsWith($pipe->cue(), '{')) {
+        if ($pipe->cueStartsWithPlaceholder()) {
             return true;
         }
 

src/Pipe.php

@@ -172,7 +172,7 @@ public static function getValidators()
     public function path(Request $request)
     {
         $replacements = collect($this->parameterNames())->map(function ($param) use ($request) {
-            return $request->{$param};
+            return $request->{$this->paramKey($param)};
         })->toArray();
 
         $path = preg_replace_array('/\\{[a-zA-Z]+\\}/', $replacements, $this->uri());
@@ -234,4 +234,40 @@ public function getAlias()
     {
         return $this->alias;
     }
+
+    /**
+     * Checks if cue of this pipe starts with a placeholder.
+     *
+     * @return bool
+     */
+    public function cueStartsWithPlaceholder()
+    {
+        return Str::startsWith($this->cue(), '{');
+    }
+
+    /**
+     * Checks if cue only contains one placeholder.
+     *
+     * @return bool
+     */
+    public function cueIsPlaceholder()
+    {
+        return preg_match('/^\\{[A-Za-z]+\\}$/', $this->cue());
+    }
+
+    /**
+     * Get param key for the path matching of a pipe.
+     *
+     * @return string
+     */
+    public function paramKey($param)
+    {
+        if ($this->key() === resolve('pipe_any')) {
+            return $param;
+        }
+
+        return $this->cueIsPlaceholder()
+                ? $this->key()
+                : $param ?? $this->key();
+    }
 }

src/Request.php

@@ -41,9 +41,11 @@ public static function destruct(HttpRequest $request)
      *
      * @return self
      */
-    public static function reconstruct($data)
+    public static function reconstruct($data, $request = self::class)
     {
-        return new self(...$data);
+        return tap(resolve($request), function ($request) use ($data) {
+            $request->initialize(...$data);
+        });
     }
 
     /**

tests/PipeRequestTest.php

@@ -2,10 +2,12 @@
 
 namespace Mshule\LaravelPipes\Tests;
 
+use Illuminate\Support\Facades\Event;
 use Mshule\LaravelPipes\Facades\Pipe;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Mshule\LaravelPipes\Testing\MakesPipeRequests;
 use Mshule\LaravelPipes\Tests\Fixtures\Models\Todo;
+use Mshule\LaravelPipes\Events\IncomingPipeResponse;
 use Mshule\LaravelPipes\Exceptions\NotFoundPipeException;
 
 class PipeRequestTest extends TestCase
@@ -191,6 +193,7 @@ public function it_can_add_fallback_pipes_to_handle_any_request_which_could_not_
     /** @test */
     public function it_can_match_dynamic_parameters()
     {
+        $this->withoutExceptionHandling();
         Pipe::fake();
 
         Pipe::match('trigger:name {text}', function ($text) {
@@ -205,6 +208,32 @@ public function it_can_match_dynamic_parameters()
         });
     }
 
+    /** @test */
+    public function its_dynamic_pattern_match_checks_first_for_placeholder_name_in_request_then_for_default_cue_value()
+    {
+        Pipe::fake();
+
+        Pipe::match('trigger:{text}', function ($text) {
+            return "you said {$text}";
+        });
+
+        $this->pipe(['trigger' => 'something']);
+
+        Pipe::assertResponded(function ($response) {
+            $response->assertOk()
+                ->assertSee('you said something');
+        });
+
+        Event::listen(IncomingPipeResponse::class, function () {
+            $this->pipe(['trigger' => 'something', 'text' => 'another']);
+
+            Pipe::assertResponded(function ($response) {
+                $response->assertOk()
+                    ->assertSee('you said another');
+            });
+        });
+    }
+
     /** @test */
     public function it_can_match_multiple_dynamic_parameters()
     {