Skip to content

Commit 3e9a138

Browse files
authored
Merge branch 'main' into has-tags-interface
2 parents fd437c4 + afcfb4d commit 3e9a138

File tree

179 files changed

+4167
-339
lines changed

Some content is hidden

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

179 files changed

+4167
-339
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
Welcome aboard! We're excited that you are interested in contributing to the Tempest framework. We value all contributions to the project and have assembled the following resources to help you get started. Thanks for being a contributor!
44

5-
You can read our full contribution guide on [https://tempestphp.com/docs/internals/contributing/](https://tempestphp.com/docs/internals/contributing/).
5+
You can read our full contribution guide on [https://tempestphp.com/main/extra-topics/contributing/](https://tempestphp.com/main/extra-topics/contributing/).

.github/workflows/integration-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: shivammathur/setup-php@v2
2929
with:
3030
php-version: ${{ matrix.php }}
31-
extensions: dom, curl, libxml, mbstring, pcntl, fileinfo, pdo, sqlite, pdo_sqlite, pdo_mysql
31+
extensions: dom, curl, libxml, mbstring, pcntl, fileinfo, pdo, sqlite, pdo_sqlite, pdo_mysql, ftp, zip
3232
coverage: pcov
3333

3434
- name: Setup Bun
@@ -71,7 +71,7 @@ jobs:
7171
uses: shivammathur/setup-php@v2
7272
with:
7373
php-version: ${{ matrix.php }}
74-
extensions: dom, curl, libxml, mbstring, pcntl, fileinfo, pdo, sqlite, pdo_sqlite, pdo_mysql
74+
extensions: dom, curl, libxml, mbstring, pcntl, fileinfo, pdo, sqlite, pdo_sqlite, pdo_mysql, ftp, zip
7575
coverage: pcov
7676

7777
- name: Setup problem matchers

.github/workflows/isolated-tests.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,11 @@ jobs:
5656
with:
5757
php-version: ${{ matrix.php }}
5858
extensions: dom, curl, libxml, mbstring, pcntl, fileinfo
59-
tools: phpunit
6059
coverage: pcov
6160

61+
- name: Install PHPUnit
62+
run: composer global require phpunit/phpunit:^11.5.17
63+
6264
- name: Setup problem matchers
6365
run: |
6466
echo "::add-matcher::${{ runner.tool_cache }}/php.json"

bin/release

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ function setPhpDependencyVersion(string $package, string $version): void
4848
updateJsonFile(
4949
path: $path,
5050
callback: function (array $content) use ($version, $package) {
51+
if (! isset($content['require'][$package])) {
52+
return $content;
53+
}
54+
5155
$content['require'][$package] = $version;
5256

5357
return $content;

composer.json

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
"ext-readline": "*",
1414
"ext-simplexml": "*",
1515
"filp/whoops": "^2.15",
16-
"giggsey/libphonenumber-for-php": "^8.13.40",
16+
"giggsey/libphonenumber-for-php-lite": "^9.0",
1717
"guzzlehttp/guzzle": "^7.8",
1818
"laminas/laminas-diactoros": "^3.3",
19+
"league/flysystem": "^3.29.1",
1920
"monolog/monolog": "^3.7.0",
2021
"nette/php-generator": "^4.1.6",
2122
"nikic/php-parser": "^5.3",
@@ -33,7 +34,7 @@
3334
"symfony/uid": "^7.1",
3435
"symfony/var-dumper": "^7.1",
3536
"symfony/var-exporter": "^7.1",
36-
"tempest/highlight": "^2.11.2",
37+
"tempest/highlight": "^2.11.4",
3738
"vlucas/phpdotenv": "^5.6",
3839
"voku/portable-ascii": "^2.0.3"
3940
},
@@ -42,16 +43,24 @@
4243
"carthage-software/mago": "0.22.2",
4344
"guzzlehttp/psr7": "^2.6.1",
4445
"illuminate/view": "~11.7.0",
46+
"league/flysystem-aws-s3-v3": "^3.0",
47+
"league/flysystem-azure-blob-storage": "^3.0",
48+
"league/flysystem-ftp": "^3.0",
49+
"league/flysystem-google-cloud-storage": "^3.0",
50+
"league/flysystem-memory": "^3.0",
51+
"league/flysystem-read-only": "^3.0",
52+
"league/flysystem-sftp-v3": "^3.0",
53+
"league/flysystem-ziparchive": "^3.0",
4554
"masterminds/html5": "^2.9",
4655
"mikey179/vfsstream": "^2.0@dev",
4756
"nesbot/carbon": "^3.8",
4857
"nyholm/psr7": "^1.8",
4958
"phpat/phpat": "^0.11.0",
5059
"phpbench/phpbench": "84.x-dev",
5160
"phpstan/phpstan": "^2.0",
52-
"phpunit/phpunit": "^11.3.5",
61+
"phpunit/phpunit": "^11.5.17",
5362
"rector/rector": "^2.0-rc2",
54-
"spatie/phpunit-snapshot-assertions": "^5.1.6",
63+
"spatie/phpunit-snapshot-assertions": "^5.1.8",
5564
"spaze/phpstan-disallowed-calls": "^4.0",
5665
"symplify/monorepo-builder": "^11.2",
5766
"tempest/blade": "^0.1.0",
@@ -77,6 +86,7 @@
7786
"tempest/mapper": "self.version",
7887
"tempest/reflection": "self.version",
7988
"tempest/router": "self.version",
89+
"tempest/storage": "self.version",
8090
"tempest/support": "self.version",
8191
"tempest/validation": "self.version",
8292
"tempest/view": "self.version",
@@ -110,6 +120,7 @@
110120
"Tempest\\Mapper\\": "src/Tempest/Mapper/src",
111121
"Tempest\\Reflection\\": "src/Tempest/Reflection/src",
112122
"Tempest\\Router\\": "src/Tempest/Router/src",
123+
"Tempest\\Storage\\": "src/Tempest/Storage/src",
113124
"Tempest\\Support\\": "src/Tempest/Support/src",
114125
"Tempest\\Validation\\": "src/Tempest/Validation/src",
115126
"Tempest\\View\\": "src/Tempest/View/src",
@@ -161,6 +172,7 @@
161172
"Tempest\\Mapper\\Tests\\": "src/Tempest/Mapper/tests",
162173
"Tempest\\Reflection\\Tests\\": "src/Tempest/Reflection/tests",
163174
"Tempest\\Router\\Tests\\": "src/Tempest/Router/tests",
175+
"Tempest\\Storage\\Tests\\": "src/Tempest/Storage/tests",
164176
"Tempest\\Support\\Tests\\": "src/Tempest/Support/tests",
165177
"Tempest\\Validation\\Tests\\": "src/Tempest/Validation/tests",
166178
"Tempest\\View\\Tests\\": "src/Tempest/View/tests",

mago.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ paths = ["src", "tests"]
55
includes = ["vendor"]
66
excludes = [
77
"./vendor/symfony/cache/Traits/ValueWrapper.php",
8+
"./vendor/google/common-protos/metadata",
9+
"./vendor/google/gax/metadata",
10+
"./vendor/google/longrunning/metadata",
811
"./vendor/composer",
912
"**/.cache",
1013
"**/*.stub.php",

phpstan.neon.dist

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ parameters:
2929
message: '#.*uninitialized readonly property \$composer*#'
3030
-
3131
message: '#.*uninitialized readonly property \$stubFileGenerator*#'
32-
-
33-
message: '#.*undefined method Dom*#'
3432

3533
disallowedFunctionCalls:
3634
-

src/Tempest/Auth/composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
"php": "^8.4",
66
"tempest/core": "dev-main",
77
"tempest/router": "dev-main",
8-
"tempest/database": "dev-main",
9-
"tempest/highlight": "^2.11.2"
8+
"tempest/database": "dev-main"
109
},
1110
"autoload": {
1211
"psr-4": {

src/Tempest/Auth/src/Install/CreatePermissionsTable.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
use Tempest\Database\DatabaseMigration;
88
use Tempest\Database\QueryStatements\CreateTableStatement;
99
use Tempest\Database\QueryStatements\DropTableStatement;
10-
use Tempest\Discovery\DoNotDiscover;
10+
use Tempest\Discovery\SkipDiscovery;
1111

12-
#[DoNotDiscover]
12+
#[SkipDiscovery]
1313
final class CreatePermissionsTable implements DatabaseMigration
1414
{
1515
private(set) string $name = '0000-00-01_create_permissions_table';

src/Tempest/Auth/src/Install/CreateUserPermissionsTable.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
use Tempest\Database\DatabaseMigration;
88
use Tempest\Database\QueryStatements\CreateTableStatement;
99
use Tempest\Database\QueryStatements\DropTableStatement;
10-
use Tempest\Discovery\DoNotDiscover;
10+
use Tempest\Discovery\SkipDiscovery;
1111

12-
#[DoNotDiscover]
12+
#[SkipDiscovery]
1313
final class CreateUserPermissionsTable implements DatabaseMigration
1414
{
1515
private(set) string $name = '0000-00-02_create_user_permissions_table';

0 commit comments

Comments
 (0)