Merge pull request #1568 from simonberger/patch-deprecation

Fix PHP str_replace call with parameter #3 is null deprecation
liip · Feb 23, 2024 · 23483e8 · 23483e8
2 parents 80a51e8 + a877cbb
commit 23483e8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/DependencyInjection/Factory/Resolver/AwsS3ResolverFactory.php b/DependencyInjection/Factory/Resolver/AwsS3ResolverFactory.php
@@ -92,7 +92,7 @@ public function addConfiguration(ArrayNodeDefinition $builder)
                     ->cannotBeEmpty()
                 ->end()
                 ->scalarNode('cache_prefix')
-                    ->defaultValue(null)
+                    ->defaultValue('')
                 ->end()
                 ->arrayNode('client_config')
                     ->isRequired()

diff --git a/DependencyInjection/Factory/Resolver/FlysystemResolverFactory.php b/DependencyInjection/Factory/Resolver/FlysystemResolverFactory.php
@@ -49,7 +49,7 @@ public function addConfiguration(ArrayNodeDefinition $builder)
                     ->cannotBeEmpty()
                 ->end()
                 ->scalarNode('cache_prefix')
-                    ->defaultValue(null)
+                    ->defaultValue('')
                 ->end()
                 ->scalarNode('root_url')
                     ->isRequired()

diff --git a/Tests/DependencyInjection/Factory/Resolver/AwsS3ResolverFactoryTest.php b/Tests/DependencyInjection/Factory/Resolver/AwsS3ResolverFactoryTest.php
@@ -431,7 +431,7 @@ public function testAddDefaultOptionsIfNotSetOnAddConfiguration(): void
         $this->assertSame([], $config['get_options']);
 
         $this->assertArrayHasKey('cache_prefix', $config);
-        $this->assertNull($config['cache_prefix']);
+        $this->assertSame('', $config['cache_prefix']);
     }
 
     public function testSupportAwsV3ClientConfig(): void