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

bump PHP to 8.2, minor ci fixes

Browse source
This commit is contained in:
Samuel Štancl 2023-01-04 02:43:10 +01:00
parent 03ac1ef127
commit d0dd87ab07
5 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -1,7 +1,7 @@
# add amd64 platform to support Mac M1 # add amd64 platform to support Mac M1
FROM --platform=linux/amd64 shivammathur/node:latest-amd64 FROM --platform=linux/amd64 shivammathur/node:latest-amd64
ARG PHP_VERSION=8.1 ARG PHP_VERSION=8.2
WORKDIR /var/www/html WORKDIR /var/www/html

12
composer.json
View file

@ -15,7 +15,7 @@
} }
], ],
"require": { "require": {
"php": "^8.1", "php": "^8.2",
"ext-json": "*", "ext-json": "*",
"illuminate/support": "^9.0", "illuminate/support": "^9.0",
"spatie/ignition": "^1.4", "spatie/ignition": "^1.4",
@ -58,16 +58,16 @@
} }
}, },
"scripts": { "scripts": {
"docker-up": "PHP_VERSION=8.1 docker-compose up -d", "docker-up": "PHP_VERSION=8.2 docker-compose up -d",
"docker-down": "PHP_VERSION=8.1 docker-compose down", "docker-down": "PHP_VERSION=8.2 docker-compose down",
"docker-rebuild": "PHP_VERSION=8.1 docker-compose up -d --no-deps --build", "docker-rebuild": "PHP_VERSION=8.2 docker-compose up -d --no-deps --build",
"docker-m1": "ln -s docker-compose-m1.override.yml docker-compose.override.yml", "docker-m1": "ln -s docker-compose-m1.override.yml docker-compose.override.yml",
"coverage": "open coverage/phpunit/html/index.html", "coverage": "open coverage/phpunit/html/index.html",
"phpstan": "vendor/bin/phpstan", "phpstan": "vendor/bin/phpstan",
"phpstan-pro": "vendor/bin/phpstan --pro", "phpstan-pro": "vendor/bin/phpstan --pro",
"cs": "php-cs-fixer fix --config=.php-cs-fixer.php", "cs": "php-cs-fixer fix --config=.php-cs-fixer.php",
"test": "PHP_VERSION=8.1 ./test --no-coverage", "test": "PHP_VERSION=8.2 ./test --no-coverage",
"test-full": "PHP_VERSION=8.1 ./test" "test-full": "PHP_VERSION=8.2 ./test"
}, },
"minimum-stability": "dev", "minimum-stability": "dev",
"prefer-stable": true, "prefer-stable": true,

2
docker-compose.yml
View file

@ -4,7 +4,7 @@ services:
build: build:
context: . context: .
args: args:
PHP_VERSION: ${PHP_VERSION:-8.1} PHP_VERSION: ${PHP_VERSION:-8.2}
depends_on: depends_on:
mysql: mysql:
condition: service_healthy condition: service_healthy

2
tests/CommandsTest.php
View file

@ -372,7 +372,7 @@ function runCommandWorks(): void
Artisan::call('tenants:migrate', ['--tenants' => [$id]]); Artisan::call('tenants:migrate', ['--tenants' => [$id]]);
pest()->artisan("tenants:run --tenants=$id 'foo foo --b=bar --c=xyz' ") pest()->artisan("tenants:run --tenants=$id 'foo foo --b=bar --c=xyz' ")
->expectsOutput("User's name is Test command") ->expectsOutput("User's name is Test user")
->expectsOutput('foo') ->expectsOutput('foo')
->expectsOutput('xyz'); ->expectsOutput('xyz');
} }

12
tests/Etc/Console/ExampleCommand.php
View file

@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Stancl\Tenancy\Tests\Etc\Console; namespace Stancl\Tenancy\Tests\Etc\Console;
use Illuminate\Support\Str;
use Illuminate\Console\Command; use Illuminate\Console\Command;
class ExampleCommand extends Command class ExampleCommand extends Command
@ -22,14 +23,13 @@ class ExampleCommand extends Command
*/ */
public function handle() public function handle()
{ {
User::create([ $id = User::create([
'id' => 999, 'name' => 'Test user',
'name' => 'Test command', 'email' => Str::random(8) . '@example.com',
'email' => 'test@command.com',
'password' => bcrypt('password'), 'password' => bcrypt('password'),
]); ])->id;
$this->line("User's name is " . User::find(999)->name); $this->line("User's name is " . User::find($id)->name);
$this->line($this->argument('a')); $this->line($this->argument('a'));
$this->line($this->option('c')); $this->line($this->option('c'));
} }