Skip to content

Commit 1d11dbd

Browse files
committed
Merge branch 'main' into feat/mailer
2 parents 6f6caaa + d0a4e1e commit 1d11dbd

File tree

836 files changed

+23939
-5788
lines changed

Some content is hidden

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

836 files changed

+23939
-5788
lines changed

.commitlintrc.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"extends": ["@commitlint/config-conventional"],
3-
"rules": {
4-
"subject-case": [
5-
2,
6-
"never",
2+
"extends": ["@commitlint/config-conventional"],
3+
"rules": {
4+
"subject-case": [
5+
2,
6+
"never",
77
["sentence-case", "start-case", "pascal-case", "upper-case"]
8-
]
9-
}
8+
]
9+
}
1010
}

.env.example

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,12 @@ ENVIRONMENT=local
44
# The base URI that's used for all generated URIs
55
BASE_URI=http://localhost
66

7-
# The CACHE key is used as a global override to turn all caches on or off
8-
# Should be true in production, but null or false in local development
9-
CACHE=null
7+
# Setting to `false` force-disable internal caches.
8+
INTERNAL_CACHES=true
109

11-
# Enable or disable discovery cache
10+
# Enable or disable discovery cache. Can be `true`, `partial` or `false`.
1211
DISCOVERY_CACHE=false
1312

14-
# Enable or disable config cache
15-
CONFIG_CACHE=false
16-
17-
# Enable or disable icon cache
18-
ICON_CACHE=true
19-
20-
# Enable or disable view cache
21-
VIEW_CACHE=false
22-
23-
# Enable or disable project cache (allround cache)
24-
PROJECT_CACHE=false
25-
2613
# Overwrite default log paths (null = default)
2714
DEBUG_LOG_PATH=null
28-
SERVER_LOG_PATH=null
15+
SERVER_LOG_PATH=null

.gitattributes

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# Fix line endings for Windows
2+
tempest text=auto eol=lf
3+
bin/* text=auto eol=lf
4+
packages/console/bin/tempest text=auto eol=lf
5+
packages/console/src/Installers/tempest text=auto eol=lf
6+
src/Tempest/Framework/Installers/tempest text=auto eol=lf
7+
18
# Exclude build/test files from the release
29
/bin/ export-ignore
310
.github/ export-ignore
@@ -15,5 +22,9 @@ rector.php export-ignore
1522
cliff.toml export-ignore
1623
.commitlintrc.json export-ignore
1724

18-
# Configure diff output for .php and .phar files.
25+
# Configure diff output
26+
*.view.php diff=html
1927
*.php diff=php
28+
*.css diff=css
29+
*.html diff=html
30+
*.md diff=markdown

.github/workflows/close-stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ jobs:
2222
close-issue-message: "This issue was closed because it has been inactive for 1 day since being marked as stale."
2323
stale-pr-label: "Stale"
2424
stale-pr-message: "This pull request is stale because it has been open for 30 days with no activity."
25-
close-pr-message: "This pull request was closed because it has been inactive for 1 day since being marked as stale."
25+
close-pr-message: "This pull request was closed because it has been inactive for 1 day since being marked as stale."
2626
repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/coding-conventions.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
# CSFixer and Rector are temporarily disabled until they have proper PHP 8.4 support
88
jobs:
9-
check-style:
9+
check-style:
1010
name: Run style check
1111
runs-on: ubuntu-latest
1212
steps:
@@ -23,7 +23,7 @@ jobs:
2323
composer update --prefer-dist --no-interaction
2424
composer mago:install-binary
2525
26-
- name: Run Mago
26+
- name: Run Mago
2727
run: |
2828
./vendor/bin/mago fmt --dry-run
2929
./vendor/bin/mago lint --reporting-format=github
@@ -34,10 +34,10 @@ jobs:
3434
- name: Install dependencies
3535
run: bun install --frozen-lockfile
3636

37-
- name: Run ESLint
38-
run: bun run lint
37+
- name: Format
38+
run: bun run fmt:check
3939

40-
phpstan:
40+
phpstan:
4141
name: "Run static analysis: PHPStan"
4242
runs-on: ubuntu-latest
4343
steps:

.github/workflows/integration-tests.yml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ on:
44
pull_request:
55
workflow_dispatch:
66
schedule:
7-
- cron: '0 0 * * *'
7+
- cron: "0 0 * * *"
8+
env:
9+
POSTGRES_USER: runner
10+
POSTGRES_PASSWORD: ""
11+
POSTGRES_DB: postgres
812

913
jobs:
1014
vitest:
@@ -28,7 +32,7 @@ jobs:
2832
uses: shivammathur/setup-php@v2
2933
with:
3034
php-version: ${{ matrix.php }}
31-
extensions: dom, curl, libxml, mbstring, pcntl, fileinfo, pdo, sqlite, pdo_sqlite, pdo_mysql, intl, ftp, zip
35+
extensions: dom, curl, libxml, mbstring, pcntl, fileinfo, pdo, sqlite, pdo_sqlite, pdo_mysql, pdo_pgsql intl, ftp, zip
3236
coverage: pcov
3337

3438
- name: Setup Bun
@@ -60,6 +64,9 @@ jobs:
6064
stability:
6165
- prefer-stable
6266
- prefer-lowest
67+
exclude:
68+
- os: windows-latest
69+
database: postgres
6370

6471
name: "Run tests: PHP ${{ matrix.php }} - ${{ matrix.database }} - ${{ matrix.stability }} - ${{ matrix.os }}"
6572

@@ -82,19 +89,22 @@ jobs:
8289
- name: Install dependencies
8390
run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction
8491

85-
- name: 'Setup MySQL'
92+
- name: "Setup MySQL"
8693
if: ${{ matrix.database == 'mysql' }}
8794
uses: ankane/setup-mysql@v1
8895
with:
8996
mysql-version: 8.0
90-
database: 'app'
97+
database: "app"
9198

92-
- name: 'Setup PostgreSQL'
99+
- name: "Setup PostgreSQL"
93100
if: ${{ matrix.database == 'postgres' }}
94101
uses: ankane/setup-postgres@v1
95102

96103
- name: Set database config - ${{ matrix.database }}
97-
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');"
104+
run: php -r "copy('tests/Fixtures/Config/database.${{ matrix.database }}.php', 'tests/Fixtures/Config/database.config.php');"
105+
106+
- name: Tempest about
107+
run: php ./tempest about
98108

99109
- name: List discovered locations
100110
run: php ./tempest discovery:status

.github/workflows/isolated-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
pull_request:
55
workflow_dispatch:
66
schedule:
7-
- cron: '0 0 * * *'
7+
- cron: "0 0 * * *"
88

99
jobs:
1010
get_packages:
@@ -59,7 +59,7 @@ jobs:
5959
coverage: pcov
6060

6161
- name: Install PHPUnit
62-
run: composer global require phpunit/phpunit:^11.5.17
62+
run: composer global require phpunit/phpunit:^12.2.3
6363

6464
- name: Setup problem matchers
6565
run: |

.github/workflows/publish-javascript-packages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Release JavaScript packages
33
on:
44
push:
55
tags:
6-
- 'v*'
6+
- "v*"
77

88
jobs:
99
release:

.github/workflows/subsplit-packages.yml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
name: 'Sub-split packages'
1+
name: "Sub-split packages"
22

33
on:
44
push:
55
branches: [main]
6-
tags: ['v*']
6+
tags: ["v*"]
77
workflow_dispatch:
88

99
env:
@@ -40,36 +40,34 @@ jobs:
4040
matrix:
4141
package: ${{ fromJson(needs.get_packages.outputs.matrix) }}
4242
steps:
43-
- uses: actions/checkout@v4
43+
- uses: actions/checkout@v4
4444
# no tag
45-
-
46-
if: "!startsWith(github.ref, 'refs/tags/')"
45+
- if: "!startsWith(github.ref, 'refs/tags/')"
4746
uses: "symplify/[email protected]"
4847
with:
4948
# ↓ split "packages/console" directory
50-
package_directory: '${{ matrix.package.directory }}'
49+
package_directory: "${{ matrix.package.directory }}"
5150

5251
# ↓ into https://github.com/tempestphp/tempest-console repository
53-
repository_organization: '${{ matrix.package.organization }}'
54-
repository_name: '${{ matrix.package.repository }}'
52+
repository_organization: "${{ matrix.package.organization }}"
53+
repository_name: "${{ matrix.package.repository }}"
5554

5655
# ↓ the user signed under the split commit
5756
user_name: "aidan-casey"
5857
user_email: "[email protected]"
5958

6059
# with tag
61-
-
62-
if: "startsWith(github.ref, 'refs/tags/')"
60+
- if: "startsWith(github.ref, 'refs/tags/')"
6361
uses: "symplify/[email protected]"
6462
with:
6563
tag: ${GITHUB_REF#refs/tags/}
6664

6765
# ↓ split "packages/console" directory
68-
package_directory: '${{ matrix.package.directory }}'
66+
package_directory: "${{ matrix.package.directory }}"
6967

7068
# ↓ into https://github.com/tempestphp/tempest-console repository
71-
repository_organization: '${{ matrix.package.organization }}'
72-
repository_name: '${{ matrix.package.repository }}'
69+
repository_organization: "${{ matrix.package.organization }}"
70+
repository_name: "${{ matrix.package.repository }}"
7371

7472
# ↓ the user signed under the split commit
7573
user_name: "aidan-casey"

.github/workflows/trigger-tempest-app-qa.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
steps:
1212
- name: Trigger tempest/app QA workflow
1313
run: |
14-
repo_owner="tempestphp"
15-
repo_name="tempest-app"
16-
event_type="trigger-workflow"
17-
14+
repo_owner="tempestphp"
15+
repo_name="tempest-app"
16+
event_type="trigger-workflow"
17+
1818
curl -L \
1919
-X POST \
2020
-H "Accept: application/vnd.github+json" \

0 commit comments

Comments
 (0)