archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2025-12-12 17:44:04 +00:00
Code Activity

wip

Browse source
This commit is contained in:
Samuel Štancl 2021-12-13 13:09:16 +01:00
parent f12c826df5
commit 9883219544
4 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View file

@ -15,7 +15,7 @@ jobs:
strategy: strategy:
matrix: matrix:
php: ["7.4", "8.0"] php: ["7.4", "8.0.11"]
laravel: ["^6.0", "^8.0"] laravel: ["^6.0", "^8.0"]
steps: steps:

18
composer.json
View file

@ -11,17 +11,17 @@
], ],
"require": { "require": {
"ext-json": "*", "ext-json": "*",
"illuminate/support": "^6.0|^7.0|^8.0", "illuminate/support": "dev-master",
"facade/ignition-contracts": "^1.0", "facade/ignition-contracts": "^1.0",
"ramsey/uuid": "^3.7|^4.0", "ramsey/uuid": "^3.7|^4.0",
"stancl/jobpipeline": "^1.0", "stancl/jobpipeline": "dev-master",
"stancl/virtualcolumn": "^1.0" "stancl/virtualcolumn": "dev-master"
}, },
"require-dev": { "require-dev": {
"vlucas/phpdotenv": "^3.3|^4.0|^5.0", "vlucas/phpdotenv": "^3.3|^4.0|^5.0",
"laravel/framework": "^6.0|^7.0|^8.0", "laravel/framework": "dev-master",
"orchestra/testbench-browser-kit": "^4.0|^5.0|^6.0", "orchestra/testbench-browser-kit": "dev-master",
"league/flysystem-aws-s3-v3": "~1.0", "league/flysystem-aws-s3-v3": "*",
"doctrine/dbal": "^2.10", "doctrine/dbal": "^2.10",
"spatie/valuestore": "^1.2.5" "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", "minimum-stability": "dev",
"prefer-stable": true "prefer-stable": true
} }

3
src/Bootstrappers/FilesystemTenancyBootstrapper.php
View file

@ -57,6 +57,9 @@ class FilesystemTenancyBootstrapper implements TenancyBootstrapper
foreach ($this->app['config']['tenancy.filesystem.disks'] as $disk) { foreach ($this->app['config']['tenancy.filesystem.disks'] as $disk) {
/** @var FilesystemAdapter $filesystemDisk */ /** @var FilesystemAdapter $filesystemDisk */
$filesystemDisk = Storage::disk($disk); $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(); $this->originalPaths['disks'][$disk] = $filesystemDisk->getAdapter()->getPathPrefix();
if ($root = str_replace( if ($root = str_replace(

7
tests/Etc/ConsoleKernel.php
View file

@ -4,15 +4,10 @@ declare(strict_types=1);
namespace Stancl\Tenancy\Tests\Etc; namespace Stancl\Tenancy\Tests\Etc;
use Orchestra\Testbench\Console\Kernel; use Orchestra\Testbench\Foundation\Console\Kernel;
class ConsoleKernel extends Kernel class ConsoleKernel extends Kernel
{ {
/**
* The Artisan commands provided by your application.
*
* @var array
*/
protected $commands = [ protected $commands = [
ExampleCommand::class, ExampleCommand::class,
AddUserCommand::class, AddUserCommand::class,