Skip to content

Commit 8222bf4

Browse files
committed
Merge remote-tracking branch 'origin/1.x' into update-1-to-2
2 parents c6c246f + 14b673c commit 8222bf4

29 files changed

+159
-27
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- dependencies: "php-http/guzzle7-adapter"
3535
php-version: "8.2"
3636
symfony-deprecations-helper: "weak"
37-
- dependencies: "php-http/guzzle7-adapter"
37+
- dependencies: "php-http/guzzle7-adapter php-http/throttle-plugin"
3838
php-version: "8.3"
3939
symfony-deprecations-helper: "weak"
4040

@@ -69,7 +69,7 @@ jobs:
6969

7070
steps:
7171
- name: "Checkout"
72-
uses: "actions/checkout@v3"
72+
uses: "actions/checkout@v4"
7373
with:
7474
fetch-depth: 2
7575

@@ -79,18 +79,18 @@ jobs:
7979
php-version: "${{ matrix.php-version }}"
8080
coverage: "pcov"
8181
ini-values: "zend.assertions=1"
82+
tools: "flex"
8283

8384
- name: "Enforce using stable dependencies"
8485
run: "composer config minimum-stability stable"
8586
if: "${{ matrix.stability == 'stable' }}"
8687

8788
- name: "Add dependencies and enable flex"
8889
run: |
89-
composer require --no-update symfony/flex ${{ matrix.dependencies }}
90-
composer config --no-plugins allow-plugins.symfony/flex true
90+
composer require --no-update ${{ matrix.dependencies }}
9191
9292
- name: "Install dependencies with Composer"
93-
uses: "ramsey/composer-install@v2"
93+
uses: "ramsey/composer-install@v3"
9494
with:
9595
dependency-versions: "${{ matrix.dependency-versions }}"
9696
composer-options: "${{ matrix.composer-options }}"

.github/workflows/php-cs-fixer.yml

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

1616
steps:
1717
- name: "Checkout"
18-
uses: "actions/checkout@v3"
18+
uses: "actions/checkout@v4"
1919
- name: "PHP-CS-Fixer"
2020
uses: "docker://oskarstark/php-cs-fixer-ga:3.26.0"
2121
with:

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/.phpunit.result.cache
2-
/.php_cs.cache
2+
/.php-cs-fixer.cache
33
/behat.yml
44
/build/
55
/composer.lock

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,26 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
2020

2121
# Version 1
2222

23+
# 1.34.3 - 2024-09-01
24+
25+
- Same as 1.34.2 but tagged on the 1.x banch instead of the feature branch.
26+
27+
# 1.34.2 - 2024-09-01
28+
29+
- More cleanup of the rate-limiter configuration. The service name is the full service name of the rate limiter, e.g. `limiter.my_name` when configuring `framework.rate_limiter.my_name`.
30+
31+
# 1.34.1 - 2024-09-01
32+
33+
- The rate-limiter name in the throttle plugin configuration is required.
34+
35+
# 1.34.0 - 2024-06-17
36+
37+
- Support to configure the throttle plugin.
38+
39+
# 1.33.1 - 2024-05-27
40+
41+
- Fixed extension to depend on the DependencyInjection component rather than the HttpKernel.
42+
2343
# 1.33.0 - 2024-02-27
2444

2545
- Support php-http/cache-plugin 2.0 and bump minimal version to 1.7 by defaulting the stream factory for cache to `httplug.psr17_stream_factory` (#448).

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,13 @@
4747
"php-http/curl-client": "<2.0",
4848
"php-http/socket-client": "<2.0",
4949
"kriswallsmith/buzz": "<0.17",
50-
"php-http/react-adapter": "<3.0"
50+
"php-http/react-adapter": "<3.0",
51+
"php-http/throttle-plugin": "<1.1"
5152
},
5253
"require-dev": {
5354
"guzzlehttp/psr7": "^1.7 || ^2.0",
5455
"matthiasnoback/symfony-config-test": "^5.2",
55-
"matthiasnoback/symfony-dependency-injection-test": "^4.0 || ^5.0",
56+
"matthiasnoback/symfony-dependency-injection-test": "^4.3.1 || ^5.0",
5657
"nyholm/nsa": "^1.1",
5758
"nyholm/psr7": "^1.2.1",
5859
"php-http/cache-plugin": "^1.7",
@@ -64,7 +65,6 @@
6465
"symfony/dom-crawler": "^6.4 || ^7.1",
6566
"symfony/framework-bundle": "^6.4 || ^7.1",
6667
"symfony/http-foundation": "^6.4 || ^7.1",
67-
"symfony/phpunit-bridge": "^7.1",
6868
"symfony/stopwatch": "^6.4 || ^7.1",
6969
"symfony/twig-bundle": "^6.4 || ^7.1",
7070
"symfony/web-profiler-bundle": "^6.4 || ^7.1",
@@ -97,7 +97,7 @@
9797
},
9898
"prefer-stable": false,
9999
"scripts": {
100-
"test": "vendor/bin/simple-phpunit",
101-
"test-ci": "vendor/bin/simple-phpunit --coverage-text --coverage-clover=build/coverage.xml"
100+
"test": "vendor/bin/phpunit",
101+
"test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"
102102
}
103103
}

src/ClientFactory/AutoDiscoveryFactory.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
* Use auto discovery to find a HTTP client.
1111
*
1212
* @author Tobias Nyholm <[email protected]>
13+
*
14+
* @final
1315
*/
1416
class AutoDiscoveryFactory implements ClientFactory
1517
{

src/ClientFactory/BuzzFactory.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
/**
1212
* @author Tobias Nyholm <[email protected]>
13+
*
14+
* @final
1315
*/
1416
class BuzzFactory implements ClientFactory
1517
{

src/ClientFactory/CurlFactory.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@
1010

1111
/**
1212
* @author Tobias Nyholm <[email protected]>
13+
*
14+
* @final
1315
*/
1416
class CurlFactory implements ClientFactory
1517
{
1618
public function __construct(
1719
private readonly ResponseFactoryInterface $responseFactory,
18-
private readonly StreamFactoryInterface $streamFactory
20+
private readonly StreamFactoryInterface $streamFactory,
1921
) {
2022
}
2123

src/ClientFactory/Guzzle6Factory.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
/**
1010
* @author Tobias Nyholm <[email protected]>
11+
*
12+
* @final
1113
*/
1214
class Guzzle6Factory implements ClientFactory
1315
{

src/ClientFactory/Guzzle7Factory.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
/**
1010
* @author Tobias Nyholm <[email protected]>
11+
*
12+
* @final
1113
*/
1214
class Guzzle7Factory implements ClientFactory
1315
{

0 commit comments

Comments
 (0)