Merge pull request #1946 from stloyd/deprecations-cleanup

Remove direct deprecations reported on Symfony 6
hwi · Aug 21, 2023 · dd0e7f2 · dd0e7f2
2 parents 208ce9c + c0c81a1
commit dd0e7f2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/src/HWIOAuthBundle.php b/src/HWIOAuthBundle.php
@@ -28,7 +28,7 @@ class HWIOAuthBundle extends Bundle
     /**
      * {@inheritdoc}
      */
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         parent::build($container);
 

diff --git a/src/Security/Http/Firewall/AbstractRefreshAccessTokenListener.php b/src/Security/Http/Firewall/AbstractRefreshAccessTokenListener.php
@@ -48,7 +48,7 @@ public function supports(Request $request): ?bool
         return $this->enabled;
     }
 
-    public function authenticate(RequestEvent $event)
+    public function authenticate(RequestEvent $event): void
     {
         if (null === $token = $this->tokenStorage->getToken()) {
             return;

diff --git a/tests/App/Form/RegistrationFormType.php b/tests/App/Form/RegistrationFormType.php
@@ -26,7 +26,7 @@ final class RegistrationFormType extends AbstractType
     /**
      * {@inheritdoc}
      */
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
             ->add('email', EmailType::class, ['label' => 'form.email', 'translation_domain' => 'FOSUserBundle'])
@@ -49,7 +49,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults(
             [

diff --git a/tests/App/config/config.yaml b/tests/App/config/config.yaml
@@ -79,7 +79,6 @@ hwi_oauth:
         oauth2:
             service: 'app.oauth2_resource_owner'
         oauth1:
-            type: oauth1
             class: 'HWI\Bundle\OAuthBundle\Tests\App\ResourceOwner\OAuth1ResourceOwner'
             client_id: "fake_client_id"
             client_secret: "fake_client_secret"