WIP

Author: RhysLees

composer.json

@@ -10,10 +10,14 @@
     "license": "MIT",
     "authors": [
         {
-            "name": "Sebastian Fix",
-            "email": "sebastian.fix@codebar.ch",
+            "name": "Sebastian Bürgin-Fix",
+            "email": "sebastian.buergin@buergin.ch",
             "homepage": "https://www.codebar.ch",
-            "role": "Developer"
+            "role": "Sofware-Engineer"
+        },
+        {
+            "name": "Rhys Lees",
+            "role": "Software-Engineer"
         },
         {
             "name": "Casper Lai",
@@ -28,15 +32,20 @@
         }
     ],
     "require": {
-        "php": "^8.2|^8.3",
+        "php": "8.2.*|8.3.*|8.4.*",
         "guzzlehttp/guzzle": "^7.8",
-        "illuminate/support": "^11.0|^12.0",
+        "illuminate/contracts": "^12.0",
         "symfony/psr-http-message-bridge": "^7.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.50",
-        "orchestra/testbench": "^9.0|^10.0",
-        "phpunit/phpunit": "^10.5|^11.5.3"
+        "laravel/pint": "^1.21",
+        "larastan/larastan": "^v3.1",
+        "orchestra/testbench": "^10.0",
+        "pestphp/pest": "^3.7",
+        "phpstan/extension-installer": "^1.4",
+        "phpstan/phpstan-deprecation-rules": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0",
+        "spatie/laravel-ray": "^1.39"
     },
     "autoload": {
         "psr-4": {
@@ -56,7 +65,8 @@
     "config": {
         "sort-packages": true,
         "allow-plugins": {
-            "pestphp/pest-plugin": true
+            "pestphp/pest-plugin": true,
+            "phpstan/extension-installer": true
         }
     },
     "extra": {

phpunit.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+>
+    <testsuites>
+        <testsuite name="Test Suite">
+            <directory suffix="Test.php">./tests</directory>
+        </testsuite>
+    </testsuites>
+    <source>
+        <include>
+            <directory suffix=".php">./app</directory>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </source>
+</phpunit>

tests/PrerenderMiddlewareTest.php renamed to tests/Feature/PrerenderMiddlewareTest.php

@@ -1,7 +1,8 @@
 <?php
 
-namespace CodebarAg\LaravelPrerender\Tests;
+namespace CodebarAg\LaravelPrerender\Tests\Feature;
 
+use CodebarAg\LaravelPrerender\Tests\TestCase;
 use GuzzleHttp\Client;
 
 class PrerenderMiddlewareTest extends TestCase

tests/Pest.php

@@ -0,0 +1,6 @@
+<?php
+
+use CodebarAg\LaravelPrerender\Tests\TestCase;
+
+uses(TestCase::class)
+    ->in(__DIR__);

tests/TestCase.php

@@ -3,91 +3,34 @@
 namespace CodebarAg\LaravelPrerender\Tests;
 
 use CodebarAg\LaravelPrerender\LaravelPrerenderServiceProvider;
-use CodebarAg\LaravelPrerender\PrerenderMiddleware;
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\ConnectException;
-use GuzzleHttp\Handler\MockHandler;
-use GuzzleHttp\HandlerStack;
-use GuzzleHttp\Psr7\Request;
-use GuzzleHttp\Psr7\Response;
-use Illuminate\Foundation\Application;
-use Illuminate\Foundation\Http\Kernel;
-use Illuminate\Support\Facades\Route;
-use Psr\Http\Message\RequestInterface;
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Orchestra\Testbench\TestCase as Orchestra;
 
-class TestCase extends \Orchestra\Testbench\TestCase
+class TestCase extends Orchestra
 {
     protected function setUp(): void
     {
         parent::setUp();
 
-        $this->setupRoutes();
+        Factory::guessFactoryNamesUsing(
+            fn (string $modelName) => 'CodebarAg\\LaravelPrerender\\Database\\Factories\\'.class_basename($modelName).'Factory',
+        );
     }
 
-    /**
-     * @param  Application  $app
-     */
     protected function getPackageProviders($app): array
     {
         return [
             LaravelPrerenderServiceProvider::class,
         ];
     }
 
-    /**
-     * @param  Application  $app
-     */
-    protected function getEnvironmentSetUp($app): void
+    public function getEnvironmentSetUp($app): void
     {
-        $app->make(Kernel::class)->prependMiddleware(PrerenderMiddleware::class);
-
-        // mock guzzle client
-        $app->bind(Client::class, function () {
-            $mock = new MockHandler([
-                new Response(200, ['prerender.io-mock' => true]),
-            ]);
-            $stack = HandlerStack::create($mock);
-
-            return new Client(['handler' => $stack]);
-        });
-    }
-
-    protected function createMockTimeoutClient(): Client
-    {
-        $mock = new MockHandler([
-            new ConnectException('Could not connect', new Request('GET', 'test')),
+        $app['config']->set('database.default', 'sqlite');
+        $app['config']->set('database.connections.sqlite', [
+            'driver' => 'sqlite',
+            'database' => ':memory:',
+            'prefix' => '',
         ]);
-
-        $stack = HandlerStack::create($mock);
-
-        return new Client(['handler' => $stack]);
-    }
-
-    protected function createMockUrlTrackingClient(): Client
-    {
-        $mock = new MockHandler([
-            function (RequestInterface $request) {
-                return new Response(
-                    200,
-                    ['prerender.io-mock' => true],
-                    (string) $request->getUri()
-                );
-            },
-        ]);
-
-        $stack = HandlerStack::create($mock);
-
-        return new Client(['handler' => $stack]);
-    }
-
-    protected function setupRoutes(): void
-    {
-        Route::get('test-middleware', function () {
-            return 'GET - Success';
-        });
-
-        Route::post('test-middleware', function () {
-            return 'Success';
-        });
     }
 }