wip

Author: freekmurze

composer.json

@@ -26,7 +26,8 @@
         "illuminate/console": "^7.13|^8.0",
         "illuminate/http": "^7.13|^8.0",
         "illuminate/support": "^7.13|^8.0",
-        "nesbot/carbon": "^2.35"
+        "nesbot/carbon": "^2.35",
+        "spatie/laravel-package-tools": "^1.1"
     },
     "require-dev": {
         "laravel/framework": "^7.13|^8.0",

phpunit.xml.dist

@@ -1,22 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="League Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="League Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

src/ResponseCacheServiceProvider.php

@@ -5,19 +5,27 @@
 use Illuminate\Cache\Repository;
 use Illuminate\Container\Container;
 use Illuminate\Support\ServiceProvider;
+use Spatie\LaravelPackageTools\Package;
+use Spatie\LaravelPackageTools\PackageServiceProvider;
 use Spatie\ResponseCache\CacheProfiles\CacheProfile;
 use Spatie\ResponseCache\Commands\ClearCommand;
 use Spatie\ResponseCache\Hasher\RequestHasher;
 use Spatie\ResponseCache\Serializers\Serializer;
 
-class ResponseCacheServiceProvider extends ServiceProvider
+class ResponseCacheServiceProvider extends PackageServiceProvider
 {
-    public function boot()
+    public function configurePackage(Package $package): void
     {
-        $this->publishes([
-            __DIR__.'/../config/responsecache.php' => config_path('responsecache.php'),
-        ], 'config');
+        $package
+            ->name('laravel-responsecache')
+            ->hasConfigFile()
+            ->hasCommands([
+                ClearCommand::class,
+            ]);
+    }
 
+    public function packageBooted()
+    {
         $this->app->bind(CacheProfile::class, function (Container $app) {
             return $app->make(config('responsecache.cache_profile'));
         });
@@ -42,16 +50,5 @@ public function boot()
             });
 
         $this->app->singleton('responsecache', ResponseCache::class);
-
-        if ($this->app->runningInConsole()) {
-            $this->commands([
-                ClearCommand::class,
-            ]);
-        }
-    }
-
-    public function register()
-    {
-        $this->mergeConfigFrom(__DIR__.'/../config/responsecache.php', 'responsecache');
     }
 }