Skip to content

Commit 7fe30ac

Browse files
gturpin-devgturpin-dev
committed
🔀 Merge branch 'main' into feat/console/generator-commands
2 parents 81944ec + f3dd1f3 commit 7fe30ac

Some content is hidden

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

45 files changed

+588
-133
lines changed

‎.env.example‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ CACHE=null
1111
# Enable or disable discovery cache
1212
DISCOVERY_CACHE=false
1313

14+
# Enable or disable config cache
15+
CONFIG_CACHE=false
16+
1417
# Enable or disable view cache
1518
VIEW_CACHE=false
1619

‎.github/workflows/coding-conventions.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,21 @@ jobs:
3535
- name: Run PHPStan
3636
run: vendor/bin/phpstan --error-format=github
3737

38-
rector:
39-
name: "Run Static Analysis: Rector"
40-
runs-on: ubuntu-latest
41-
42-
steps:
43-
- uses: actions/checkout@v4
44-
45-
- name: Setup PHP
46-
uses: shivammathur/setup-php@v2
47-
with:
48-
php-version: 8.3
49-
coverage: none
50-
51-
- name: Install composer dependencies
52-
uses: ramsey/composer-install@v3
53-
54-
- name: Run Rector
55-
run: vendor/bin/rector process --no-ansi --dry-run --no-progress-bar
38+
# rector:
39+
# name: "Run Static Analysis: Rector"
40+
# runs-on: ubuntu-latest
41+
#
42+
# steps:
43+
# - uses: actions/checkout@v4
44+
#
45+
# - name: Setup PHP
46+
# uses: shivammathur/setup-php@v2
47+
# with:
48+
# php-version: 8.3
49+
# coverage: none
50+
#
51+
# - name: Install composer dependencies
52+
# uses: ramsey/composer-install@v3
53+
#
54+
# - name: Run Rector
55+
# run: vendor/bin/rector process --no-ansi --dry-run --no-progress-bar

‎.github/workflows/integration-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
uses: ankane/setup-postgres@v1
5959

6060
- name: Set database config - ${{ matrix.database }}
61-
run: php -r "file_exists('tests/Fixtures/Config/database.php') || copy('tests/Fixtures/Config/database.${{ matrix.database }}.php', 'tests/Fixtures/Config/database.php');"
61+
run: php -r "file_exists('tests/Fixtures/Config/database.config.php') || copy('tests/Fixtures/Config/database.${{ matrix.database }}.php', 'tests/Fixtures/Config/database.config.php');"
6262

6363
- name: List Discovered Locations
6464
run: php ./tempest discovery:status

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -54,24 +54,24 @@ jobs:
5454
- name: Run PHPStan
5555
run: vendor/bin/phpstan --error-format=github
5656

57-
rector:
58-
name: Run Rector
59-
runs-on: ubuntu-latest
60-
61-
steps:
62-
- uses: actions/checkout@v4
63-
64-
- name: Setup PHP
65-
uses: shivammathur/setup-php@v2
66-
with:
67-
php-version: 8.3
68-
coverage: none
69-
70-
- name: Install composer dependencies
71-
uses: ramsey/composer-install@v3
72-
73-
- name: Run Rector
74-
run: vendor/bin/rector process --no-ansi --dry-run --no-progress-bar
57+
# rector:
58+
# name: Run Rector
59+
# runs-on: ubuntu-latest
60+
#
61+
# steps:
62+
# - uses: actions/checkout@v4
63+
#
64+
# - name: Setup PHP
65+
# uses: shivammathur/setup-php@v2
66+
# with:
67+
# php-version: 8.3
68+
# coverage: none
69+
#
70+
# - name: Install composer dependencies
71+
# uses: ramsey/composer-install@v3
72+
#
73+
# - name: Run Rector
74+
# run: vendor/bin/rector process --no-ansi --dry-run --no-progress-bar
7575

7676
phpunit:
7777
runs-on: ${{ matrix.os }}
@@ -128,7 +128,7 @@ jobs:
128128
uses: ankane/setup-postgres@v1
129129

130130
- name: Set database config - ${{ matrix.database }}
131-
run: php -r "file_exists('tests/Fixtures/Config/database.php') || copy('tests/Fixtures/Config/database.${{ matrix.database }}.php', 'tests/Fixtures/Config/database.php');"
131+
run: php -r "file_exists('tests/Fixtures/Config/database.config.php') || copy('tests/Fixtures/Config/database.${{ matrix.database }}.php', 'tests/Fixtures/Config/database.config.php');"
132132

133133
- name: List Discovered Locations
134134
run: php ./tempest discovery:status

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@ jobs:
2424
- name: Validate Composer
2525
run: composer validate
2626

27-
rector:
28-
name: Run Rector
29-
runs-on: ubuntu-latest
30-
steps:
31-
- uses: actions/checkout@v4
32-
33-
- name: Setup PHP
34-
uses: shivammathur/setup-php@v2
35-
with:
36-
php-version: 8.3
37-
coverage: none
38-
39-
- name: Install composer dependencies
40-
uses: ramsey/composer-install@v3
41-
42-
- name: Run Rector
43-
run: vendor/bin/rector process --no-ansi --no-progress-bar
27+
# rector:
28+
# name: Run Rector
29+
# runs-on: ubuntu-latest
30+
# steps:
31+
# - uses: actions/checkout@v4
32+
#
33+
# - name: Setup PHP
34+
# uses: shivammathur/setup-php@v2
35+
# with:
36+
# php-version: 8.3
37+
# coverage: none
38+
#
39+
# - name: Install composer dependencies
40+
# uses: ramsey/composer-install@v3
41+
#
42+
# - name: Run Rector
43+
# run: vendor/bin/rector process --no-ansi --no-progress-bar
4444

4545
fix-style:
4646
name: Fix Styling
@@ -131,7 +131,7 @@ jobs:
131131
uses: ankane/setup-postgres@v1
132132

133133
- name: Set database config - ${{ matrix.database }}
134-
run: php -r "file_exists('tests/Fixtures/Config/database.php') || copy('tests/Fixtures/Config/database.${{ matrix.database }}.php', 'tests/Fixtures/Config/database.php');"
134+
run: php -r "file_exists('tests/Fixtures/Config/database.config.php') || copy('tests/Fixtures/Config/database.${{ matrix.database }}.php', 'tests/Fixtures/Config/database.config.php');"
135135

136136
- name: List Discovered Locations
137137
run: php ./tempest discovery:status

‎composer.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@
150150
"composer merge",
151151
"./bin/validate-packages",
152152
"./tempest discovery:clear",
153-
"vendor/bin/rector process",
154153
"composer csfixer",
155154
"composer phpunit",
156155
"composer phpstan"

‎phpstan-baseline.neon‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,2 @@
11
parameters:
2-
ignoreErrors:
3-
-
4-
message: "#^Tempest\\\\Console\\\\Exceptions\\\\ConsoleException should be final$#"
5-
count: 1
6-
path: src/Tempest/Console/src/Exceptions/ConsoleException.php
7-
8-
-
9-
message: "#^Tempest\\\\Database\\\\Exceptions\\\\DatabaseException should be final$#"
10-
count: 1
11-
path: src/Tempest/Database/src/Exceptions/DatabaseException.php
12-
13-
-
14-
message: "#^Tempest\\\\Generation\\\\Tests\\\\TestCase should be final$#"
15-
count: 1
16-
path: src/Tempest/Generation/tests/TestCase.php
17-
2+
ignoreErrors: []

src/Tempest/Auth/src/Config/auth.php renamed to src/Tempest/Auth/src/Config/auth.config.php

File renamed without changes.

src/Tempest/Cache/src/Config/cache.php renamed to src/Tempest/Cache/src/Config/cache.config.php

File renamed without changes.

src/Tempest/CommandBus/src/Config/commandBus.php renamed to src/Tempest/CommandBus/src/Config/commandBus.config.php

File renamed without changes.

0 commit comments

Comments
 (0)