Configuration cleanup

Author: manuxi

src/DependencyInjection/Configuration.php

@@ -71,7 +71,7 @@ private function addServiceDefinitionConfiguration(ArrayNodeDefinition $node) {
         $node
             ->children()
                 ->arrayNode('service_definition')
-                    ->arrayPrototype()
+                    ->prototype('array')
                         ->children()
                             ->scalarNode('service_name')->isRequired()->end()
                             ->arrayNode('options')

tests/DependencyInjection/EWZRecaptchaExtensionTest.php

@@ -59,6 +59,23 @@ public function testSimpleConfiguration()
         );
     }
 
+    public function testSimpleV3Configuration()
+    {
+        $this->configuration = new ContainerBuilder();
+        $loader = new EWZRecaptchaExtension();
+        $config = $this->getSimpleConfig();
+        $loader->load([$config], $this->configuration);
+
+        $this->assertParameter(true, 'ewz_recaptcha.enabled');
+        $this->assertParameter('foo_public_key', 'ewz_recaptcha.public_key');
+        $this->assertParameter('bar_private_key', 'ewz_recaptcha.private_key');
+
+        $this->assertHasDefinition('ewz_recaptcha.v3.form.type');
+        $this->assertHasDefinition('ewz_recaptcha.validator.v3.true');
+        $this->assertHasDefinition('ewz_recaptcha.recaptcha');
+
+    }
+
     public function testFullConfiguration()
     {
         $this->configuration = new ContainerBuilder();
@@ -140,6 +157,11 @@ private function assertHasDefinition($id)
         $this->assertTrue(($this->configuration->hasDefinition($id) ?: $this->configuration->hasAlias($id)));
     }
 
+    private function assertNotHasDefinition($id)
+    {
+        $this->assertFalse(($this->configuration->hasDefinition($id) ?: $this->configuration->hasAlias($id)));
+    }
+
     private function assertDefinitionHasReferenceArgument($id, $index, $expectedArgumentValue)
     {
         $definition = $this->configuration->getDefinition($id);

tests/Form/Type/EWZRecaptchaV3TypeTest.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace EWZ\Tests\Bundle\RecaptchaBundle\Form\Type;
+
+use EWZ\Bundle\RecaptchaBundle\Form\Type\EWZRecaptchaV3Type;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class EWZRecaptchaV3TypeTest extends TestCase
+{
+    /** @var EWZRecaptchaV3Type */
+    protected $type;
+
+    protected function setUp()
+    {
+        $requestStack = $this->createMock(RequestStack::class);
+        $this->type = new EWZRecaptchaV3Type('key', true, true, 'www.google.com');
+    }
+
+    /**
+     * @test
+     */
+    public function buildView()
+    {
+        $view = new FormView();
+
+        /** @var FormInterface $form */
+        $form = $this->createMock(FormInterface::class);
+
+        $this->assertArrayNotHasKey('ewz_recaptcha_enabled', $view->vars);
+        $this->assertArrayNotHasKey('ewz_recaptcha_hide_badge', $view->vars);
+
+        $this->type->buildView($view, $form, array());
+
+        $this->assertTrue($view->vars['ewz_recaptcha_enabled']);
+        $this->assertTrue($view->vars['ewz_recaptcha_hide_badge']);
+    }
+
+    /**
+     * @test
+     */
+    public function getParent()
+    {
+        $this->assertSame(HiddenType::class, $this->type->getParent());
+    }
+
+    /**
+     * @test
+     */
+    public function getPublicKey()
+    {
+        $this->assertSame('key', $this->type->getPublicKey());
+    }
+
+    /**
+     * @test
+     */
+    public function configureOptions()
+    {
+        $optionsResolver = new OptionsResolver();
+
+        $this->type->configureOptions($optionsResolver);
+
+        $options = $optionsResolver->resolve();
+
+        $expected = array(
+            'label' => false,
+            'mapped' => false,
+            'validation_groups' => [ 'Default' ],
+            'script_nonce_csp' => '',
+            'action_name' => 'form',
+        );
+
+        $this->assertSame($expected, $options);
+    }
+
+    /**
+     * @test
+     */
+    public function getBlockPrefix()
+    {
+        $this->assertEquals('ewz_recaptcha', $this->type->getBlockPrefix());
+    }
+}