Merge branch 'symfony:2.x' into 2.x

symfony · Oct 12, 2024 · 89c71d1 · 89c71d1
2 parents 134362d + 9cde8b8
commit 89c71d1
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/src/Autocomplete/src/AutocompleteBundle.php b/src/Autocomplete/src/AutocompleteBundle.php
@@ -20,7 +20,7 @@
  */
 final class AutocompleteBundle extends Bundle
 {
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         $container->addCompilerPass(new AutocompleteFormTypePass());
     }

diff --git a/src/Autocomplete/src/AutocompleterRegistry.php b/src/Autocomplete/src/AutocompleterRegistry.php
@@ -28,6 +28,9 @@ public function getAutocompleter(string $alias): ?EntityAutocompleterInterface
         return $this->autocompletersLocator->has($alias) ? $this->autocompletersLocator->get($alias) : null;
     }
 
+    /**
+     * @return list<string>
+     */
     public function getAutocompleterNames(): array
     {
         return array_keys($this->autocompletersLocator->getProvidedServices());

diff --git a/src/Autocomplete/src/DependencyInjection/AutocompleteExtension.php b/src/Autocomplete/src/DependencyInjection/AutocompleteExtension.php
@@ -40,7 +40,7 @@
  */
 final class AutocompleteExtension extends Extension implements PrependExtensionInterface
 {
-    public function prepend(ContainerBuilder $container)
+    public function prepend(ContainerBuilder $container): void
     {
         $bundles = $container->getParameter('kernel.bundles');
 
@@ -61,7 +61,7 @@ public function prepend(ContainerBuilder $container)
         }
     }
 
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $this->registerBasicServices($container);
         if (ContainerBuilder::willBeAvailable('symfony/form', Form::class, ['symfony/framework-bundle'])) {

diff --git a/src/Autocomplete/src/DependencyInjection/AutocompleteFormTypePass.php b/src/Autocomplete/src/DependencyInjection/AutocompleteFormTypePass.php
@@ -29,13 +29,13 @@ class AutocompleteFormTypePass implements CompilerPassInterface
     /** @var string Tag applied to EntityAutocompleterInterface classes */
     public const ENTITY_AUTOCOMPLETER_TAG = 'ux.entity_autocompleter';
 
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         $this->processEntityAutocompleteFieldTag($container);
         $this->processEntityAutocompleterTag($container);
     }
 
-    private function processEntityAutocompleteFieldTag(ContainerBuilder $container)
+    private function processEntityAutocompleteFieldTag(ContainerBuilder $container): void
     {
         foreach ($container->findTaggedServiceIds(self::ENTITY_AUTOCOMPLETE_FIELD_TAG, true) as $serviceId => $tag) {
             $serviceDefinition = $container->getDefinition($serviceId);
@@ -68,7 +68,7 @@ private function getAlias(string $serviceId, Definition $serviceDefinition, arra
         return $attribute->getAlias() ?: AsEntityAutocompleteField::shortName($class);
     }
 
-    private function processEntityAutocompleterTag(ContainerBuilder $container)
+    private function processEntityAutocompleterTag(ContainerBuilder $container): void
     {
         $servicesMap = [];
         foreach ($container->findTaggedServiceIds(self::ENTITY_AUTOCOMPLETER_TAG, true) as $serviceId => $tag) {

diff --git a/src/Autocomplete/src/Maker/MakeAutocompleteField.php b/src/Autocomplete/src/Maker/MakeAutocompleteField.php
@@ -53,7 +53,7 @@ public static function getCommandDescription(): string
         return 'Generates an Ajax-autocomplete form field class for symfony/ux-autocomplete.';
     }
 
-    public function configureCommand(Command $command, InputConfiguration $inputConfig)
+    public function configureCommand(Command $command, InputConfiguration $inputConfig): void
     {
         $command
              ->setHelp(<<<EOF
@@ -66,12 +66,12 @@ public function configureCommand(Command $command, InputConfiguration $inputConf
         ;
     }
 
-    public function configureDependencies(DependencyBuilder $dependencies)
+    public function configureDependencies(DependencyBuilder $dependencies): void
     {
         $dependencies->addClassDependency(FormInterface::class, 'symfony/form');
     }
 
-    public function interact(InputInterface $input, ConsoleStyle $io, Command $command)
+    public function interact(InputInterface $input, ConsoleStyle $io, Command $command): void
     {
         if (null === $this->doctrineHelper) {
             throw new \LogicException('Somehow the DoctrineHelper service is missing from MakerBundle.');
@@ -94,7 +94,7 @@ public function interact(InputInterface $input, ConsoleStyle $io, Command $comma
         );
     }
 
-    public function generate(InputInterface $input, ConsoleStyle $io, Generator $generator)
+    public function generate(InputInterface $input, ConsoleStyle $io, Generator $generator): void
     {
         if (null === $this->doctrineHelper) {
             throw new \LogicException('Somehow the DoctrineHelper service is missing from MakerBundle.');