Merge 5.x into 6.x

Author: SonataCI

src/DependencyInjection/Configuration.php

@@ -97,14 +97,12 @@ public function getConfigTreeBuilder(): TreeBuilder
                     ->children()
                         ->arrayNode('types')
                             ->info('container service ids')
-                            ->isRequired()
                             // add default value to well know users of BlockBundle
                             ->defaultValue(['sonata.block.service.container', 'sonata.page.block.container', 'sonata.dashboard.block.container', 'cmf.block.container', 'cmf.block.slideshow'])
                             ->prototype('scalar')->end()
                         ->end()
                         ->arrayNode('templates')
                             ->info('container templates')
-                            ->isRequired()
                             ->defaultValue($this->defaultContainerTemplates)
                             ->prototype('scalar')->end()
                         ->end()

tests/Command/DebugBlocksCommandTest.php

@@ -46,7 +46,10 @@ protected function setUp(): void
             ->method('getServices')
             ->willReturn([]);
 
-        $this->application->add(new DebugBlocksCommand($blockManager));
+        /** @phpstan-ignore function.impossibleType */
+        $method = method_exists($this->application, 'addCommand') ? 'addCommand' : 'add';
+        /* @phpstan-ignore method.notFound,method.dynamicName */
+        $this->application->{$method}(new DebugBlocksCommand($blockManager));
     }
 
     protected function tearDown(): void
@@ -110,7 +113,10 @@ public function getMetadata(): MetadataInterface
                 },
             ]);
 
-        $this->application->add(new DebugBlocksCommand($blockManager));
+        /** @phpstan-ignore function.impossibleType */
+        $method = method_exists($this->application, 'addCommand') ? 'addCommand' : 'add';
+        /* @phpstan-ignore method.notFound,method.dynamicName */
+        $this->application->{$method}(new DebugBlocksCommand($blockManager));
 
         $command = $this->application->find('debug:sonata:block');
         $commandTester = new CommandTester($command);