Skip to content

Commit e4bfa4a

Browse files
committed
Merge branch 'main' into refactor/filesystem
2 parents 224965d + be80673 commit e4bfa4a

File tree

83 files changed

+2477
-174
lines changed

Some content is hidden

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

83 files changed

+2477
-174
lines changed

.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

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: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"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",
@@ -42,6 +43,14 @@
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",
@@ -76,6 +85,7 @@
7685
"tempest/mapper": "self.version",
7786
"tempest/reflection": "self.version",
7887
"tempest/router": "self.version",
88+
"tempest/storage": "self.version",
7989
"tempest/support": "self.version",
8090
"tempest/validation": "self.version",
8191
"tempest/view": "self.version",
@@ -108,6 +118,7 @@
108118
"Tempest\\Mapper\\": "src/Tempest/Mapper/src",
109119
"Tempest\\Reflection\\": "src/Tempest/Reflection/src",
110120
"Tempest\\Router\\": "src/Tempest/Router/src",
121+
"Tempest\\Storage\\": "src/Tempest/Storage/src",
111122
"Tempest\\Support\\": "src/Tempest/Support/src",
112123
"Tempest\\Validation\\": "src/Tempest/Validation/src",
113124
"Tempest\\View\\": "src/Tempest/View/src",
@@ -159,6 +170,7 @@
159170
"Tempest\\Mapper\\Tests\\": "src/Tempest/Mapper/tests",
160171
"Tempest\\Reflection\\Tests\\": "src/Tempest/Reflection/tests",
161172
"Tempest\\Router\\Tests\\": "src/Tempest/Router/tests",
173+
"Tempest\\Storage\\Tests\\": "src/Tempest/Storage/tests",
162174
"Tempest\\Support\\Tests\\": "src/Tempest/Support/tests",
163175
"Tempest\\Validation\\Tests\\": "src/Tempest/Validation/tests",
164176
"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",

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/Cache/composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
"psr/cache": "^3.0",
77
"symfony/cache": "^7.2",
88
"tempest/core": "dev-main",
9-
"tempest/container": "dev-main",
10-
"tempest/highlight": "^2.11.2"
9+
"tempest/container": "dev-main"
1110
},
1211
"require-dev": {
1312
"tempest/clock": "dev-main"

src/Tempest/Clock/composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"description": "A clock component that handle few simple clock operations.",
44
"require": {
55
"php": "^8.4",
6-
"psr/clock": "^1.0.0",
7-
"tempest/highlight": "^2.11.2"
6+
"psr/clock": "^1.0.0"
87
},
98
"autoload": {
109
"psr-4": {

src/Tempest/CommandBus/composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
"require": {
55
"php": "^8.4",
66
"tempest/core": "dev-main",
7-
"tempest/container": "dev-main",
8-
"tempest/highlight": "^2.11.2"
7+
"tempest/container": "dev-main"
98
},
109
"autoload": {
1110
"files": [

src/Tempest/Console/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"tempest/container": "dev-main",
1111
"tempest/debug": "dev-main",
1212
"tempest/generation": "dev-main",
13-
"tempest/highlight": "^2.11.2",
13+
"tempest/highlight": "^2.11.4",
1414
"tempest/log": "dev-main",
1515
"tempest/reflection": "dev-main",
1616
"tempest/support": "dev-main",

src/Tempest/Container/composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
"minimum-stability": "dev",
66
"require": {
77
"php": "^8.4",
8-
"tempest/reflection": "dev-main",
9-
"tempest/highlight": "^2.11.2"
8+
"tempest/reflection": "dev-main"
109
},
1110
"autoload": {
1211
"files": [

0 commit comments

Comments
 (0)