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

Author: dbu

CHANGELOG.md

@@ -19,6 +19,10 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 
 # Version 1
 
+# 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).
+
 # 1.32.0 - 2023-12-06
 
 - Added support for Symfony 7

composer.json

@@ -43,6 +43,7 @@
     },
     "conflict": {
         "php-http/guzzle6-adapter": "<1.1",
+        "php-http/cache-plugin": "<1.7.0",
         "php-http/curl-client": "<2.0",
         "php-http/socket-client": "<2.0",
         "kriswallsmith/buzz": "<0.17",

src/DependencyInjection/Configuration.php

@@ -13,8 +13,8 @@
 use Http\Client\Plugin\Vcr\Recorder\RecorderInterface;
 use Http\Message\CookieJar;
 use Http\Message\Formatter;
-use Http\Message\StreamFactory;
 use Psr\Cache\CacheItemPoolInterface;
+use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
@@ -739,7 +739,7 @@ private function createCachePluginNode(): NodeDefinition
                     // Cannot set both respect_cache_headers and respect_response_cache_directives
                     return isset($config['respect_cache_headers'], $config['respect_response_cache_directives']);
                 })
-                ->thenInvalid('You can\'t provide config option "respect_cache_headers" and "respect_response_cache_directives" simultaniously. Use "respect_response_cache_directives" instead.')
+                ->thenInvalid('You can\'t provide config option "respect_cache_headers" and "respect_response_cache_directives" simultaneously. Use "respect_response_cache_directives" instead.')
             ->end()
             ->children()
                 ->scalarNode('cache_key_generator')
@@ -851,7 +851,7 @@ private function createCachePluginNode(): NodeDefinition
                     ->cannotBeEmpty()
                 ->end()
                 ->scalarNode('stream_factory')
-                    ->info('This must be a service id to a service implementing '.StreamFactory::class)
+                    ->info('This must be a service id to a service implementing '.StreamFactoryInterface::class)
                     ->defaultValue('httplug.psr17_stream_factory')
                     ->cannotBeEmpty()
                 ->end()

tests/Unit/DependencyInjection/ConfigurationTest.php

@@ -348,7 +348,7 @@ public function testInvalidCacheConfig(): void
         $file = __DIR__.'/../../Resources/Fixtures/config/invalid_cache_config.yml';
 
         $this->expectException(InvalidConfigurationException::class);
-        $this->expectExceptionMessage('Invalid configuration for path "httplug.plugins.cache.config": You can\'t provide config option "respect_cache_headers" and "respect_response_cache_directives" simultaniously. Use "respect_response_cache_directives" instead.');
+        $this->expectExceptionMessage('Invalid configuration for path "httplug.plugins.cache.config": You can\'t provide config option "respect_cache_headers" and "respect_response_cache_directives" simultaneously. Use "respect_response_cache_directives" instead.');
         $this->assertProcessedConfigurationEquals([], [$file]);
     }