Merge remote-tracking branch 'origin/1.x' into update-1-to-2

dbu · dbu · commit 8222bf44f1bc · 2024-09-02T08:04:27.000+02:00
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -34,7 +34,7 @@ jobs:
           - dependencies: "php-http/guzzle7-adapter"
             php-version: "8.2"
             symfony-deprecations-helper: "weak"
-          - dependencies: "php-http/guzzle7-adapter"
+          - dependencies: "php-http/guzzle7-adapter php-http/throttle-plugin"
             php-version: "8.3"
             symfony-deprecations-helper: "weak"
 
@@ -69,7 +69,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           fetch-depth: 2
 
@@ -79,18 +79,18 @@ jobs:
           php-version: "${{ matrix.php-version }}"
           coverage: "pcov"
           ini-values: "zend.assertions=1"
+          tools: "flex"
 
       - name: "Enforce using stable dependencies"
         run: "composer config minimum-stability stable"
         if: "${{ matrix.stability == 'stable' }}"
 
       - name: "Add dependencies and enable flex"
         run: |
-          composer require --no-update symfony/flex ${{ matrix.dependencies }}
-          composer config --no-plugins allow-plugins.symfony/flex true
+          composer require --no-update ${{ matrix.dependencies }}
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           dependency-versions: "${{ matrix.dependency-versions }}"
           composer-options: "${{ matrix.composer-options }}"
diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
       - name: "PHP-CS-Fixer"
         uses: "docker://oskarstark/php-cs-fixer-ga:3.26.0"
         with:
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 /.phpunit.result.cache
-/.php_cs.cache
+/.php-cs-fixer.cache
 /behat.yml
 /build/
 /composer.lock
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,26 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 
 # Version 1
 
+# 1.34.3 - 2024-09-01
+
+- Same as 1.34.2 but tagged on the 1.x banch instead of the feature branch.
+
+# 1.34.2 - 2024-09-01
+
+- 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`.
+
+# 1.34.1 - 2024-09-01
+
+- The rate-limiter name in the throttle plugin configuration is required.
+
+# 1.34.0 - 2024-06-17
+
+- Support to configure the throttle plugin.
+
+# 1.33.1 - 2024-05-27
+
+- Fixed extension to depend on the DependencyInjection component rather than the HttpKernel.
+
 # 1.33.0 - 2024-02-27
 
 - 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).
diff --git a/composer.json b/composer.json
@@ -47,12 +47,13 @@
         "php-http/curl-client": "<2.0",
         "php-http/socket-client": "<2.0",
         "kriswallsmith/buzz": "<0.17",
-        "php-http/react-adapter": "<3.0"
+        "php-http/react-adapter": "<3.0",
+        "php-http/throttle-plugin": "<1.1"
     },
     "require-dev": {
         "guzzlehttp/psr7": "^1.7 || ^2.0",
         "matthiasnoback/symfony-config-test": "^5.2",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.0 || ^5.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^4.3.1 || ^5.0",
         "nyholm/nsa": "^1.1",
         "nyholm/psr7": "^1.2.1",
         "php-http/cache-plugin": "^1.7",
@@ -64,7 +65,6 @@
         "symfony/dom-crawler": "^6.4 || ^7.1",
         "symfony/framework-bundle": "^6.4 || ^7.1",
         "symfony/http-foundation": "^6.4 || ^7.1",
-        "symfony/phpunit-bridge": "^7.1",
         "symfony/stopwatch": "^6.4 || ^7.1",
         "symfony/twig-bundle": "^6.4 || ^7.1",
         "symfony/web-profiler-bundle": "^6.4 || ^7.1",
@@ -97,7 +97,7 @@
     },
     "prefer-stable": false,
     "scripts": {
-        "test": "vendor/bin/simple-phpunit",
-        "test-ci": "vendor/bin/simple-phpunit --coverage-text --coverage-clover=build/coverage.xml"
+        "test": "vendor/bin/phpunit",
+        "test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"
     }
 }
diff --git a/src/ClientFactory/AutoDiscoveryFactory.php b/src/ClientFactory/AutoDiscoveryFactory.php
@@ -10,6 +10,8 @@
  * Use auto discovery to find a HTTP client.
  *
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ *
+ * @final
  */
 class AutoDiscoveryFactory implements ClientFactory
 {
diff --git a/src/ClientFactory/BuzzFactory.php b/src/ClientFactory/BuzzFactory.php
@@ -10,6 +10,8 @@
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ *
+ * @final
  */
 class BuzzFactory implements ClientFactory
 {
diff --git a/src/ClientFactory/CurlFactory.php b/src/ClientFactory/CurlFactory.php
@@ -10,12 +10,14 @@
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ *
+ * @final
  */
 class CurlFactory implements ClientFactory
 {
     public function __construct(
         private readonly ResponseFactoryInterface $responseFactory,
-        private readonly StreamFactoryInterface $streamFactory
+        private readonly StreamFactoryInterface $streamFactory,
     ) {
     }
 
diff --git a/src/ClientFactory/Guzzle6Factory.php b/src/ClientFactory/Guzzle6Factory.php
@@ -8,6 +8,8 @@
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ *
+ * @final
  */
 class Guzzle6Factory implements ClientFactory
 {
diff --git a/src/ClientFactory/Guzzle7Factory.php b/src/ClientFactory/Guzzle7Factory.php
@@ -8,6 +8,8 @@
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ *
+ * @final
  */
 class Guzzle7Factory implements ClientFactory
 {
diff --git a/src/ClientFactory/ReactFactory.php b/src/ClientFactory/ReactFactory.php
@@ -8,6 +8,8 @@
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ *
+ * @final
  */
 class ReactFactory implements ClientFactory
 {
diff --git a/src/ClientFactory/SocketFactory.php b/src/ClientFactory/SocketFactory.php
@@ -8,6 +8,8 @@
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ *
+ * @final
  */
 class SocketFactory implements ClientFactory
 {
diff --git a/src/ClientFactory/SymfonyFactory.php b/src/ClientFactory/SymfonyFactory.php
@@ -11,12 +11,14 @@
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ *
+ * @final
  */
 class SymfonyFactory implements ClientFactory
 {
     public function __construct(
         private readonly ResponseFactoryInterface $responseFactory,
-        private readonly StreamFactoryInterface $streamFactory
+        private readonly StreamFactoryInterface $streamFactory,
     ) {
     }
 
diff --git a/src/Collector/Collector.php b/src/Collector/Collector.php
@@ -18,6 +18,8 @@
  * @author Fabien Bourigault <bourigaultfabien@gmail.com>
  *
  * @internal
+ *
+ * @final
  */
 class Collector extends DataCollector
 {
diff --git a/src/Collector/Formatter.php b/src/Collector/Formatter.php
@@ -19,6 +19,8 @@
  * @author Fabien Bourigault <bourigaultfabien@gmail.com>
  *
  * @internal
+ *
+ * @final
  */
 class Formatter implements MessageFormatter
 {
diff --git a/src/Collector/PluginClientFactory.php b/src/Collector/PluginClientFactory.php
@@ -23,7 +23,7 @@ final class PluginClientFactory
     public function __construct(
         private readonly Collector $collector,
         private readonly Formatter $formatter,
-        private readonly Stopwatch $stopwatch
+        private readonly Stopwatch $stopwatch,
     ) {
     }
 
diff --git a/src/Collector/ProfileClient.php b/src/Collector/ProfileClient.php
@@ -21,6 +21,8 @@
  * @author Fabien Bourigault <bourigaultfabien@gmail.com>
  *
  * @internal
+ *
+ * @final
  */
 class ProfileClient implements ClientInterface, HttpAsyncClient
 {
@@ -40,7 +42,7 @@ public function __construct(
         $client,
         private readonly Collector $collector,
         private readonly Formatter $formatter,
-        private readonly Stopwatch $stopwatch
+        private readonly Stopwatch $stopwatch,
     ) {
         if (!($client instanceof ClientInterface && $client instanceof HttpAsyncClient)) {
             $client = new FlexibleHttpClient($client);
diff --git a/src/Collector/ProfileClientFactory.php b/src/Collector/ProfileClientFactory.php
@@ -16,6 +16,8 @@
  * @author Fabien Bourigault <bourigaultfabien@gmail.com>
  *
  * @internal
+ *
+ * @final
  */
 class ProfileClientFactory implements ClientFactory
 {
@@ -28,7 +30,7 @@ public function __construct(
         ClientFactory|callable $factory,
         private readonly Collector $collector,
         private readonly Formatter $formatter,
-        private readonly Stopwatch $stopwatch
+        private readonly Stopwatch $stopwatch,
     ) {
         $this->factory = $factory;
     }
diff --git a/src/Collector/ProfilePlugin.php b/src/Collector/ProfilePlugin.php
@@ -15,6 +15,8 @@
  * @author Fabien Bourigault <bourigaultfabien@gmail.com>
  *
  * @internal
+ *
+ * @final
  */
 class ProfilePlugin implements Plugin
 {
@@ -74,7 +76,7 @@ private function onException(
         RequestInterface $request,
         Profile $profile,
         \Exception $exception,
-        Stack $stack
+        Stack $stack,
     ): void {
         $profile->setFailed(true);
         $profile->setResponse($this->formatter->formatException($exception));
diff --git a/src/Collector/StackPlugin.php b/src/Collector/StackPlugin.php
@@ -15,6 +15,8 @@
  * @author Fabien Bourigault <bourigaultfabien@gmail.com>
  *
  * @internal
+ *
+ * @final
  */
 class StackPlugin implements Plugin
 {
diff --git a/src/Collector/Twig/HttpMessageMarkupExtension.php b/src/Collector/Twig/HttpMessageMarkupExtension.php
@@ -13,6 +13,8 @@
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ *
+ * @final
  */
 class HttpMessageMarkupExtension extends AbstractExtension
 {
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -31,6 +31,8 @@
  *
  * @author David Buchmann <mail@davidbu.ch>
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ *
+ * @final
  */
 class Configuration implements ConfigurationInterface
 {
@@ -593,14 +595,38 @@ private function addSharedPluginNodes(ArrayNodeDefinition $pluginNode, bool $dis
         ->end();
         // End stopwatch plugin
 
-        $error = $children->arrayNode('error')
+        $children->arrayNode('error')
             ->canBeEnabled()
             ->addDefaultsIfNotSet()
             ->children()
                 ->scalarNode('only_server_exception')->defaultFalse()->end()
             ->end()
         ->end();
         // End error plugin
+
+        $children->arrayNode('throttle')
+            ->canBeEnabled()
+            ->addDefaultsIfNotSet()
+            ->children()
+                ->scalarNode('name')
+                    ->isRequired()
+                    ->info('Rate limiter service name from symfony/rate-limiter configuration. E.g. for a rate limiter http_client you specify limiter.http_client here')
+                ->end()
+                ->scalarNode('key')
+                    ->defaultNull()
+                    ->info('Key to avoid sharing this rate limiter with other clients or other services. You can use the name of the client for example.')
+                ->end()
+                ->integerNode('tokens')
+                    ->defaultValue(1)
+                    ->info('How many tokens spending per request')
+                ->end()
+                ->floatNode('max_time')
+                    ->defaultNull()
+                    ->info('Maximum accepted waiting time in seconds')
+                ->end()
+            ->end()
+        ->end();
+        // End throttle plugin
     }
 
     /**
diff --git a/src/DependencyInjection/HttplugExtension.php b/src/DependencyInjection/HttplugExtension.php
@@ -10,6 +10,7 @@
 use Http\Client\Common\HttpMethodsClient;
 use Http\Client\Common\HttpMethodsClientInterface;
 use Http\Client\Common\Plugin\AuthenticationPlugin;
+use Http\Client\Common\Plugin\ThrottlePlugin;
 use Http\Client\Common\PluginClient;
 use Http\Client\Common\PluginClientFactory;
 use Http\Client\HttpAsyncClient;
@@ -33,11 +34,14 @@
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\RateLimiter\LimiterInterface;
 use Twig\Environment as TwigEnvironment;
 
 /**
  * @author David Buchmann <mail@davidbu.ch>
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ *
+ * @final
  */
 class HttplugExtension extends Extension
 {
@@ -279,6 +283,24 @@ private function configurePluginByName(string $name, Definition $definition, arr
 
                 break;
 
+            case 'throttle':
+                if (!\class_exists(ThrottlePlugin::class)) {
+                    throw new InvalidConfigurationException('You need to require the Throttle Plugin to be able to use it: "composer require php-http/throttle-plugin".');
+                }
+
+                $limiterServiceId = $serviceId.'.'.$config['name'];
+                $container
+                    ->register($limiterServiceId, LimiterInterface::class)
+                    ->setFactory([new Reference($config['name']), 'create'])
+                    ->addArgument($config['key'])
+                    ->setPublic(false);
+
+                $definition->replaceArgument(0, new Reference($limiterServiceId));
+                $definition->setArgument('$tokens', $config['tokens']);
+                $definition->setArgument('$maxTime', $config['max_time']);
+
+                break;
+
                 /* client specific plugins */
 
             case 'add_host':
diff --git a/src/Discovery/ConfiguredClientsStrategy.php b/src/Discovery/ConfiguredClientsStrategy.php
diff --git a/src/Discovery/ConfiguredClientsStrategyListener.php b/src/Discovery/ConfiguredClientsStrategyListener.php
diff --git a/src/HttplugBundle.php b/src/HttplugBundle.php
diff --git a/src/Resources/config/plugins.xml b/src/Resources/config/plugins.xml
diff --git a/tests/Unit/DependencyInjection/ConfigurationTest.php b/tests/Unit/DependencyInjection/ConfigurationTest.php
diff --git a/tests/Unit/DependencyInjection/HttplugExtensionTest.php b/tests/Unit/DependencyInjection/HttplugExtensionTest.php

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@`
`10`	`10`	`* Use auto discovery to find a HTTP client.`
`11`	`11`	`*`
`12`	`12`	`* @author Tobias Nyholm <[email protected]>`
	`13`	`+ *`
	`14`	`+ * @final`
`13`	`15`	`*/`
`14`	`16`	`class AutoDiscoveryFactory implements ClientFactory`
`15`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,14 @@`
`10`	`10`
`11`	`11`	`/**`
`12`	`12`	`* @author Tobias Nyholm <[email protected]>`
	`13`	`+ *`
	`14`	`+ * @final`
`13`	`15`	`*/`
`14`	`16`	`class CurlFactory implements ClientFactory`
`15`	`17`	`{`
`16`	`18`	`public function __construct(`
`17`	`19`	`private readonly ResponseFactoryInterface $responseFactory,`
`18`		`- private readonly StreamFactoryInterface $streamFactory`
	`20`	`+ private readonly StreamFactoryInterface $streamFactory,`
`19`	`21`	`) {`
`20`	`22`	`}`
`21`	`23`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`
`9`	`9`	`/**`
`10`	`10`	`* @author Tobias Nyholm <[email protected]>`
	`11`	`+ *`
	`12`	`+ * @final`
`11`	`13`	`*/`
`12`	`14`	`class Guzzle6Factory implements ClientFactory`
`13`	`15`	`{`