Skip to content

Commit d44f13d

Browse files
authored
Merge branch 'async-aws:master' into feature-CloudWatchLogs-describeLogGroups
2 parents ee35195 + 0cc191a commit d44f13d

File tree

1,096 files changed

+10814
-9597
lines changed

Some content is hidden

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

1,096 files changed

+10814
-9597
lines changed

.github/workflows/checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
tools: composer-normalize
1717

1818
- name: Checkout code
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v5
2020

2121
- name: Normalize
2222
run: |
@@ -50,7 +50,7 @@ jobs:
5050
coverage: none
5151

5252
- name: Checkout code
53-
uses: actions/checkout@v4
53+
uses: actions/checkout@v5
5454

5555
- name: Get composer cache directory
5656
id: composer-cache

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
tools: flex
3030

3131
- name: Checkout code
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v5
3333

3434
- name: Initialize tests
3535
run: make initialize -j 4
@@ -58,7 +58,7 @@ jobs:
5858
sed -i -re 's/"require": \{/"repositories": [{"type": "path","url": "..\/..\/Core", "options": {"versions": {"async-aws\/core": "dev-master"}}, "canonical": ${{matrix.strategy != 'lowest' && 'true' || 'false'}} }],"require": \{/' composer.json
5959
composer config minimum-stability dev
6060
composer config prefer-stable true
61-
composer require --dev --no-update symfony/phpunit-bridge
61+
composer require --dev --no-update symfony/phpunit-bridge:^7.3.2
6262
cat composer.json
6363
6464
echo ::endgroup::
@@ -93,7 +93,7 @@ jobs:
9393
cd "$CURRENT_DIR/$COMPONENT"
9494
9595
localExit=0
96-
composer require symfony/phpunit-bridge --no-update --no-install
96+
composer require symfony/phpunit-bridge:^7.3.2@dev --dev --no-update --no-install
9797
composer update --no-interaction --no-scripts --prefer-dist --optimize-autoloader ${{ matrix.strategy == 'lowest' && '--prefer-lowest' || '' }} $COMPOSER_OPTIONS || localExit=1
9898
./vendor/bin/simple-phpunit install
9999
echo ::endgroup::
@@ -138,11 +138,11 @@ jobs:
138138
- name: Set up PHP
139139
uses: shivammathur/setup-php@v2
140140
with:
141-
php-version: 8.3
141+
php-version: 8.4
142142
coverage: none
143143

144144
- name: Checkout code
145-
uses: actions/checkout@v4
145+
uses: actions/checkout@v5
146146
with:
147147
fetch-depth: 0
148148

.github/workflows/static.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
coverage: none
2020

2121
- name: Checkout code
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v5
2323

2424
- name: Get composer cache directory
2525
id: composer-cache
@@ -53,7 +53,7 @@ jobs:
5353

5454
steps:
5555
- name: Checkout code
56-
uses: actions/checkout@v4
56+
uses: actions/checkout@v5
5757

5858
- name: Get composer cache directory
5959
id: composer-cache
@@ -90,7 +90,7 @@ jobs:
9090
coverage: none
9191

9292
- name: Checkout code
93-
uses: actions/checkout@v4
93+
uses: actions/checkout@v5
9494

9595
- name: Get composer cache directory
9696
id: composer-cache

.github/workflows/watch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
coverage: none
2020

2121
- name: Checkout code
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v5
2323
with:
2424
ref: master
2525

.github/workflows/website.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
php-version: 8.4
2424

2525
- name: Checkout code
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v5
2727
with:
2828
path: 'source'
2929

composer.json

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
"ext-json": "*",
1212
"ext-simplexml": "*",
1313
"psr/log": "^1.0 || ^2.0 || ^3.0",
14-
"symfony/http-client": "^4.4.16 || ^5.1.7 || ^6.0 || ^7.0",
14+
"symfony/http-client": "^4.4.16 || ^5.1.7 || ^6.0 || ^7.0 || ^8.0",
1515
"symfony/http-client-contracts": "^1.0 || ^2.0 || ^3.0",
16-
"symfony/process": "^4.4 || ^5.0 || ^6.0 || ^7.0",
16+
"symfony/process": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
1717
"symfony/service-contracts": "^1.0 || ^2.0 || ^3.0"
1818
},
1919
"require-dev": {
20-
"friendsofphp/php-cs-fixer": "~3.64.0",
20+
"friendsofphp/php-cs-fixer": "~3.87.0",
2121
"illuminate/cache": "^6.18.13 || ^7.10 || ^8.0 || ^9.0 || ^10.0 || ^11.0",
2222
"illuminate/queue": "^6.18.11 || ^7.10 || ^8.0 || ^9.0 || ^10.0 || ^11.0",
2323
"illuminate/support": "^6.18.13 || ^7.10 || ^8.0 || ^9.0 || ^10.0 || ^11.0",
@@ -31,18 +31,19 @@
3131
"psalm/phar": "~5.14.1",
3232
"psr/cache": "^1.0 || ^2.0 || ^3.0",
3333
"swaggest/json-diff": "^3.7",
34-
"symfony/cache": "^4.4 || ^5.0 || ^6.0 || ^7.0",
35-
"symfony/config": "^4.4 || ^5.0 || ^6.0 || ^7.0",
36-
"symfony/console": "^4.4 || ^5.0 || ^6.0 || ^7.0",
37-
"symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0 || ^7.0",
34+
"symfony/cache": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
35+
"symfony/config": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
36+
"symfony/console": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
37+
"symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
3838
"symfony/deprecation-contracts": "^2.1 || ^3.0",
39-
"symfony/filesystem": "^5.0 || ^6.0 || ^7.0",
40-
"symfony/finder": "^4.4 || ^5.0 || ^6.0 || ^7.0",
41-
"symfony/http-kernel": "^4.4 || ^5.0 || ^6.0 || ^7.0",
42-
"symfony/phpunit-bridge": "^5.3 || ^6.0 || ^7.0",
39+
"symfony/filesystem": "^5.0 || ^6.0 || ^7.0 || ^8.0",
40+
"symfony/finder": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
41+
"symfony/http-kernel": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
42+
"symfony/phpunit-bridge": "^5.3 || ^6.0 || ^7.0 || ^8.0",
4343
"symfony/polyfill-uuid": "^1.13.1"
4444
},
4545
"conflict": {
46+
"phpunit/phpunit": ">=10",
4647
"symfony/http-client": "5.2.0"
4748
},
4849
"autoload": {

manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"variables": {
3-
"${LATEST}": "3.351.3"
3+
"${LATEST}": "3.356.43"
44
},
55
"endpoints": "https://raw.githubusercontent.com/aws/aws-sdk-php/${LATEST}/src/data/endpoints.json",
66
"services": {

src/CodeGenerator/.github/workflows/checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v5
1616
with:
1717
fetch-depth: 0
1818

src/CodeGenerator/.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
coverage: none
2424

2525
- name: Checkout code
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v5
2727

2828
- name: Download dependencies
2929
run: |

src/CodeGenerator/composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
"nette/php-generator": "^3.6 || ^4.1",
1313
"nette/utils": "^3.0 || ^4.0",
1414
"nikic/php-parser": "^4.0",
15-
"symfony/console": "^4.4 || ^5.0 || ^6.0 || ^7.0",
16-
"symfony/finder": "^4.4 || ^5.0 || ^6.0 || ^7.0",
17-
"symfony/http-client": "^4.4 || ^5.0 || ^6.0 || ^7.0",
15+
"symfony/console": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
16+
"symfony/finder": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
17+
"symfony/http-client": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
1818
"symfony/http-client-contracts": "^1.0 || ^2.0 || ^3.0",
19-
"symfony/process": "^4.4 || ^5.0 || ^6.0 || ^7.0",
19+
"symfony/process": "^4.4 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
2020
"symfony/service-contracts": "^2.0 || ^3.0"
2121
},
2222
"autoload": {

0 commit comments

Comments
 (0)