Skip to content

Commit 4071cea

Browse files
saeedvazirysaeedvaziry
authored
Merge branch '2.x' into 2.x-fix-database-creation-with-hypens
2 parents 602d2fd + 0f06d81 commit 4071cea

File tree

454 files changed

+4912
-2278
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

454 files changed

+4912
-2278
lines changed

‎.github/workflows/code-quality.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: code-quality
2+
3+
on:
4+
push:
5+
branches:
6+
- 2.x
7+
pull_request:
8+
branches:
9+
- 2.x
10+
11+
jobs:
12+
tests:
13+
runs-on: ubuntu-22.04
14+
15+
strategy:
16+
fail-fast: true
17+
matrix:
18+
php: [ 8.2 ]
19+
20+
steps:
21+
- uses: actions/checkout@v4
22+
23+
- name: Setup PHP
24+
uses: shivammathur/setup-php@v2
25+
with:
26+
php-version: ${{ matrix.php }}
27+
28+
- name: Cache Composer packages
29+
id: composer-cache
30+
uses: actions/cache@v4
31+
with:
32+
path: vendor
33+
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
34+
restore-keys: |
35+
${{ runner.os }}-php-
36+
37+
- name: Install dependencies
38+
if: steps.composer-cache.outputs.cache-hit != 'true'
39+
run: composer install --prefer-dist --no-progress --no-suggest
40+
41+
- name: Run PHPStan
42+
run: ./vendor/bin/phpstan analyse

‎.github/workflows/code-style.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
node-version: [ "20.x" ]
2020

2121
steps:
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v4
2323

2424
- name: Setup PHP
2525
uses: shivammathur/setup-php@v2
@@ -28,7 +28,7 @@ jobs:
2828

2929
- name: Cache Composer packages
3030
id: composer-cache
31-
uses: actions/cache@v2
31+
uses: actions/cache@v4
3232
with:
3333
path: vendor
3434
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
@@ -43,7 +43,7 @@ jobs:
4343
run: ./vendor/bin/pint --test
4444

4545
- name: Setup Node.js
46-
uses: actions/setup-node@v2
46+
uses: actions/setup-node@v4
4747
with:
4848
node-version: "20.x"
4949

‎.github/workflows/docker-latest.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout code
14-
uses: actions/checkout@v2
14+
uses: actions/checkout@v4
1515

1616
- name: Set up QEMU
17-
uses: docker/setup-qemu-action@v1
17+
uses: docker/setup-qemu-action@v2
1818

1919
- name: Set up Docker Buildx
20-
uses: docker/setup-buildx-action@v1
20+
uses: docker/setup-buildx-action@v2
2121

2222
- name: Login to Docker Hub
23-
uses: docker/login-action@v2
23+
uses: docker/login-action@v3
2424
with:
2525
username: ${{ secrets.DOCKER_USERNAME }}
2626
password: ${{ secrets.DOCKER_PASSWORD }}

‎.github/workflows/docker-release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout code
13-
uses: actions/checkout@v2
13+
uses: actions/checkout@v4
1414

1515
- name: Set up QEMU
16-
uses: docker/setup-qemu-action@v1
16+
uses: docker/setup-qemu-action@v2
1717

1818
- name: Set up Docker Buildx
19-
uses: docker/setup-buildx-action@v1
19+
uses: docker/setup-buildx-action@v2
2020

2121
- name: Login to Docker Hub
22-
uses: docker/login-action@v2
22+
uses: docker/login-action@v3
2323
with:
2424
username: ${{ secrets.DOCKER_USERNAME }}
2525
password: ${{ secrets.DOCKER_PASSWORD }}

‎.github/workflows/tests.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
php: [ 8.2 ]
1919

2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v4
2222

2323
- name: Setup PHP
2424
uses: shivammathur/setup-php@v2
@@ -27,12 +27,13 @@ jobs:
2727

2828
- name: Cache Composer packages
2929
id: composer-cache
30-
uses: actions/cache@v2
30+
uses: actions/cache@v4
3131
with:
3232
path: vendor
3333
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
3434
restore-keys: |
3535
${{ runner.os }}-php-
36+
3637
- name: Install dependencies
3738
if: steps.composer-cache.outputs.cache-hit != 'true'
3839
run: composer install --prefer-dist --no-progress --no-suggest

‎app/Actions/CronJob/CreateCronJob.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010

1111
class CreateCronJob
1212
{
13+
/**
14+
* @param array<string, mixed> $input
15+
*/
1316
public function create(Server $server, array $input): CronJob
1417
{
1518
$cronJob = new CronJob([
@@ -28,6 +31,10 @@ public function create(Server $server, array $input): CronJob
2831
return $cronJob;
2932
}
3033

34+
/**
35+
* @param array<string, mixed> $input
36+
* @return array<string, array<mixed>>
37+
*/
3138
public static function rules(array $input, Server $server): array
3239
{
3340
$rules = [

‎app/Actions/Database/CreateDatabase.php‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@
55
use App\Enums\DatabaseStatus;
66
use App\Models\Database;
77
use App\Models\Server;
8+
use App\Models\Service;
89
use Illuminate\Validation\Rule;
910
use Illuminate\Validation\ValidationException;
1011

1112
class CreateDatabase
1213
{
14+
/**
15+
* @param array<string, mixed> $input
16+
*/
1317
public function create(Server $server, array $input): Database
1418
{
1519
$database = new Database([
@@ -18,8 +22,12 @@ public function create(Server $server, array $input): Database
1822
'collation' => $input['collation'],
1923
'name' => $input['name'],
2024
]);
25+
26+
/** @var Service $service */
27+
$service = $server->database();
28+
2129
/** @var \App\SSH\Services\Database\Database $databaseHandler */
22-
$databaseHandler = $server->database()->handler();
30+
$databaseHandler = $service->handler();
2331
$databaseHandler->create($database->name, $database->charset, $database->collation);
2432
$database->status = DatabaseStatus::READY;
2533
$database->save();
@@ -34,6 +42,9 @@ public function create(Server $server, array $input): Database
3442
}
3543

3644
/**
45+
* @param array<string, mixed> $input
46+
* @return array<string, mixed>
47+
*
3748
* @throws ValidationException
3849
*/
3950
public static function rules(Server $server, array $input): array

‎app/Actions/Database/CreateDatabaseUser.php‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,17 @@
55
use App\Enums\DatabaseUserStatus;
66
use App\Models\DatabaseUser;
77
use App\Models\Server;
8+
use App\Models\Service;
89
use App\SSH\Services\Database\Database;
910
use Illuminate\Validation\Rule;
1011
use Illuminate\Validation\ValidationException;
1112

1213
class CreateDatabaseUser
1314
{
1415
/**
16+
* @param array<string, mixed> $input
17+
* @param array<string> $links
18+
*
1519
* @throws ValidationException
1620
*/
1721
public function create(Server $server, array $input, array $links = []): DatabaseUser
@@ -23,8 +27,12 @@ public function create(Server $server, array $input, array $links = []): Databas
2327
'host' => (isset($input['remote']) && $input['remote']) || isset($input['host']) ? $input['host'] : 'localhost',
2428
'databases' => $links,
2529
]);
30+
31+
/** @var Service $service */
32+
$service = $server->database();
33+
2634
/** @var Database $databaseHandler */
27-
$databaseHandler = $server->database()->handler();
35+
$databaseHandler = $service->handler();
2836
$databaseHandler->createUser(
2937
$databaseUser->username,
3038
$databaseUser->password,
@@ -41,6 +49,9 @@ public function create(Server $server, array $input, array $links = []): Databas
4149
}
4250

4351
/**
52+
* @param array<string, mixed> $input
53+
* @return array<string, mixed>
54+
*
4455
* @throws ValidationException
4556
*/
4657
public static function rules(Server $server, array $input): array

‎app/Actions/Database/DeleteDatabase.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,17 @@
44

55
use App\Models\Database;
66
use App\Models\Server;
7+
use App\Models\Service;
78

89
class DeleteDatabase
910
{
1011
public function delete(Server $server, Database $database): void
1112
{
12-
$server->database()->handler()->delete($database->name);
13+
/** @var Service $service */
14+
$service = $server->database();
15+
/** @var \App\SSH\Services\Database\Database $handler */
16+
$handler = $service->handler();
17+
$handler->delete($database->name);
1318
$database->delete();
1419
}
1520
}

‎app/Actions/Database/DeleteDatabaseUser.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,18 @@
44

55
use App\Models\DatabaseUser;
66
use App\Models\Server;
7+
use App\Models\Service;
8+
use App\SSH\Services\Database\Database;
79

810
class DeleteDatabaseUser
911
{
1012
public function delete(Server $server, DatabaseUser $databaseUser): void
1113
{
12-
$server->database()->handler()->deleteUser($databaseUser->username, $databaseUser->host);
14+
/** @var Service $service */
15+
$service = $server->database();
16+
/** @var Database $handler */
17+
$handler = $service->handler();
18+
$handler->deleteUser($databaseUser->username, $databaseUser->host);
1319
$databaseUser->delete();
1420
}
1521
}

0 commit comments

Comments
 (0)