From 98832195448eb781235d9e1abcfa1de4b44104c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20=C5=A0tancl?= <samuel.stancl@gmail.com>
Date: Mon, 13 Dec 2021 13:09:16 +0100
Subject: [PATCH] wip

---
 .github/workflows/ci.yml                       |  2 +-
 composer.json                                  | 18 ++++++++++++------
 .../FilesystemTenancyBootstrapper.php          |  3 +++
 tests/Etc/ConsoleKernel.php                    |  7 +------
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index efb8ad02..37e3d449 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        php: ["7.4", "8.0"]
+        php: ["7.4", "8.0.11"]
         laravel: ["^6.0", "^8.0"]
 
     steps:
diff --git a/composer.json b/composer.json
index b10f2d16..faeb3d5e 100644
--- a/composer.json
+++ b/composer.json
@@ -11,17 +11,17 @@
     ],
     "require": {
         "ext-json": "*",
-        "illuminate/support": "^6.0|^7.0|^8.0",
+        "illuminate/support": "dev-master",
         "facade/ignition-contracts": "^1.0",
         "ramsey/uuid": "^3.7|^4.0",
-        "stancl/jobpipeline": "^1.0",
-        "stancl/virtualcolumn": "^1.0"
+        "stancl/jobpipeline": "dev-master",
+        "stancl/virtualcolumn": "dev-master"
     },
     "require-dev": {
         "vlucas/phpdotenv": "^3.3|^4.0|^5.0",
-        "laravel/framework": "^6.0|^7.0|^8.0",
-        "orchestra/testbench-browser-kit": "^4.0|^5.0|^6.0",
-        "league/flysystem-aws-s3-v3": "~1.0",
+        "laravel/framework": "dev-master",
+        "orchestra/testbench-browser-kit": "dev-master",
+        "league/flysystem-aws-s3-v3": "*",
         "doctrine/dbal": "^2.10",
         "spatie/valuestore": "^1.2.5"
     },
@@ -49,6 +49,12 @@
             }
         }
     },
+    "scripts": {
+        "docker-up": "PHP_VERSION=8.0.11 docker-compose up -d",
+        "docker-down": "PHP_VERSION=8.0.11 docker-compose down",
+        "docker-rebuild": "PHP_VERSION=8.0.11 docker-compose up -d --no-deps --build",
+        "test": "./test"
+    },
     "minimum-stability": "dev",
     "prefer-stable": true
 }
diff --git a/src/Bootstrappers/FilesystemTenancyBootstrapper.php b/src/Bootstrappers/FilesystemTenancyBootstrapper.php
index d5ae2d50..157a1337 100644
--- a/src/Bootstrappers/FilesystemTenancyBootstrapper.php
+++ b/src/Bootstrappers/FilesystemTenancyBootstrapper.php
@@ -57,6 +57,9 @@ class FilesystemTenancyBootstrapper implements TenancyBootstrapper
         foreach ($this->app['config']['tenancy.filesystem.disks'] as $disk) {
             /** @var FilesystemAdapter $filesystemDisk */
             $filesystemDisk = Storage::disk($disk);
+
+            // todo0 @v4 \League\Flysystem\PathPrefixer is making this a lot more painful in flysystem v2
+
             $this->originalPaths['disks'][$disk] = $filesystemDisk->getAdapter()->getPathPrefix();
 
             if ($root = str_replace(
diff --git a/tests/Etc/ConsoleKernel.php b/tests/Etc/ConsoleKernel.php
index 1bc66365..a548f113 100644
--- a/tests/Etc/ConsoleKernel.php
+++ b/tests/Etc/ConsoleKernel.php
@@ -4,15 +4,10 @@ declare(strict_types=1);
 
 namespace Stancl\Tenancy\Tests\Etc;
 
-use Orchestra\Testbench\Console\Kernel;
+use Orchestra\Testbench\Foundation\Console\Kernel;
 
 class ConsoleKernel extends Kernel
 {
-    /**
-     * The Artisan commands provided by your application.
-     *
-     * @var array
-     */
     protected $commands = [
         ExampleCommand::class,
         AddUserCommand::class,