Merge branch 'main' into feature/alias-middleware-and-group-webhooks-…

…by-name

composer.json

@@ -16,9 +16,10 @@
         }
     ],
     "require": {
-        "php": ">8.0",
-        "spatie/laravel-package-tools": "^1.12.0",
-        "illuminate/contracts": ">8.0"
+        "php": "^8.1",
+        "guzzlehttp/guzzle": "^7.8",
+        "spatie/laravel-package-tools": "^1.14.0",
+        "illuminate/contracts": "^10.0"
     },
     "require-dev": {
         "laravel/pint": "^1.0",

src/Providers/DefaultProvider.php

@@ -3,6 +3,7 @@
 namespace Moneo\RequestForwarder\Providers;
 
 use Illuminate\Http\Client\Factory;
+use Illuminate\Http\Client\Response;
 
 class DefaultProvider implements ProviderInterface
 {
@@ -11,7 +12,10 @@ public function __construct(
     ) {
     }
 
-    public function send($url, $params, $webhook)
+    /**
+     * @throws \Exception
+     */
+    public function send(string $url, array $params, array $webhook): Response
     {
         return $this->client
             ->send($webhook['method'] ?? 'POST', $webhook['url']);

src/Providers/Discord.php

@@ -3,6 +3,7 @@
 namespace Moneo\RequestForwarder\Providers;
 
 use Illuminate\Http\Client\Factory;
+use Illuminate\Http\Client\Response;
 
 class Discord implements ProviderInterface
 {
@@ -11,7 +12,10 @@ public function __construct(
     ) {
     }
 
-    public function send($url, $params, $webhook)
+    /**
+     * @throws \Exception
+     */
+    public function send(string $url, array $params, array $webhook): Response
     {
         $content = $url.PHP_EOL;
         $content .= json_encode($params);

src/Providers/ProviderInterface.php

@@ -3,11 +3,11 @@
 namespace Moneo\RequestForwarder\Providers;
 
 use Illuminate\Http\Client\Factory;
+use Illuminate\Http\Client\Response;
 
 interface ProviderInterface
 {
     public function __construct(Factory $client);
 
-    /** @return \Illuminate\Http\Client\Response */
-    public function send($url, $params, $webhook);
+    public function send(string $url, array $params, array $webhook): Response;
 }

src/RequestForwarderServiceProvider.php

@@ -20,7 +20,7 @@ public function configurePackage(Package $package): void
             ->hasConfigFile();
     }
 
-    public function registeringPackage()
+    public function registeringPackage(): void
     {
         $this->app->bind('laravel_request_forwarder.client', function ($app): Factory {
             return $app[Factory::class];

tests/RequestForwarderTest.php

@@ -0,0 +1,21 @@
+<?php
+
+use Illuminate\Support\Facades\Http;
+
+use function Pest\Laravel\get;
+use function Pest\Laravel\post;
+
+it('must not call any http request', function () {
+    Http::fake();
+    get('/')->assertStatus(200);
+    post('/')->assertStatus(200);
+    Http::assertNothingSent();
+});
+
+it('must send hooks', function () {
+    Http::fake();
+    get('/middleware')->assertStatus(200);
+    Http::assertSentCount(2);
+    get('/middleware')->assertStatus(200);
+    Http::assertSentCount(4);
+});

tests/TestCase.php

@@ -2,7 +2,8 @@
 
 namespace Moneo\RequestForwarder\Tests;
 
-use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Facades\Route;
+use Moneo\RequestForwarder\RequestForwarderMiddleware;
 use Moneo\RequestForwarder\RequestForwarderServiceProvider;
 use Orchestra\Testbench\TestCase as Orchestra;
 
@@ -12,9 +13,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        Factory::guessFactoryNamesUsing(
-            fn (string $modelName) => 'Moneo\\RequestForwarder\\Database\\Factories\\'.class_basename($modelName).'Factory'
-        );
+        $this->registerTestRoutes();
     }
 
     protected function getPackageProviders($app)
@@ -27,10 +26,17 @@ protected function getPackageProviders($app)
     public function getEnvironmentSetUp($app)
     {
         config()->set('database.default', 'testing');
+    }
+
+    protected function registerTestRoutes(): void
+    {
+        Route::middleware('api')->group(function () {
+            Route::any('/', fn () => 'No Middleware')
+                ->name('no-middleware');
 
-        /*
-        $migration = include __DIR__.'/../database/migrations/create_laravel-request-forwarder_table.php.stub';
-        $migration->up();
-        */
+            Route::middleware(RequestForwarderMiddleware::class)
+                ->any('/middleware', fn () => 'With Middleware')
+                ->name('middleware');
+        });
     }
 }