Merge pull request #13 from 80Quattro/input_label

[BUGFIX] Empty input label

Author: 80Quattro

.github/workflows/core11.yml

@@ -27,7 +27,7 @@ jobs:
         run: Build/Scripts/runTests.sh -t 11 -p ${{ matrix.php }} -s lint
 
       - name: Validate code against CGL
-        run: PHP_CS_FIXER_IGNORE_ENV=1 Build/Scripts/runTests.sh -t 11 -p 8.1 -s cgl -n
+        run: PHP_CS_FIXER_IGNORE_ENV=1 Build/Scripts/runTests.sh -t 11 -p 8.2 -s cgl -n
 
       - name: Unit Tests
-        run: Build/Scripts/runTests.sh -t 11 -p ${{ matrix.php }} -s unit
+        run: Build/Scripts/runTests.sh -t 11 -p ${{ matrix.php }} -s unit

.github/workflows/core12.yml

@@ -24,7 +24,7 @@ jobs:
         run: Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -s lint
 
       - name: Validate code against CGL
-        run: PHP_CS_FIXER_IGNORE_ENV=1 Build/Scripts/runTests.sh -t 12 -p 8.1 -s cgl -n
+        run: PHP_CS_FIXER_IGNORE_ENV=1 Build/Scripts/runTests.sh -t 12 -p 8.2 -s cgl -n
 
       - name: Unit Tests
-        run: Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -s unit
+        run: Build/Scripts/runTests.sh -t 12 -p ${{ matrix.php }} -s unit

Build/php-cs-fixer/php-cs-fixer.php

@@ -22,7 +22,7 @@
     ->setRiskyAllowed(true)
     ->setRules([
         '@DoctrineAnnotation' => true,
-        '@PER' => true,
+        '@PER-CS' => true,
         'array_syntax' => ['syntax' => 'short'],
         'blank_line_after_opening_tag' => true,
         'control_structure_braces' => true,
@@ -45,7 +45,6 @@
         'no_blank_lines_after_phpdoc' => true,
         'no_empty_phpdoc' => true,
         'no_empty_statement' => true,
-        'no_extra_blank_lines' => true,
         'no_leading_import_slash' => true,
         'no_leading_namespace_whitespace' => true,
         'no_null_property_initialization' => true,

Resources/Private/Form/Partials/Friendlycaptcha.html

@@ -9,12 +9,20 @@
             <f:then>
                 <f:asset.script defer="1" async="1" identifier="friendlycaptcha" src="{captchaConfiguration.jsPath}" />
 
-                <f:render partial="Field/Field" arguments="{element: element, doNotShowLabel: 1}" contentAs="elementContent">
+                <f:if condition="{element.label} == ''">
+                    <f:then>
+                        <f:variable name="dontShowLabel" value="1" />
+                    </f:then>
+                    <f:else>
+                        <f:variable name="dontShowLabel" value="0" />
+                    </f:else>
+                </f:if>
+                <f:render partial="Field/Field" arguments="{element: element, doNotShowLabel: dontShowLabel}" contentAs="elementContent">
                     <f:form.hidden
                         property="{element.identifier}"
                         id="{element.uniqueIdentifier}"
                         value="1"
-                        additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
+                        additionalAttributes="{f:if(condition: \"{element.label} == ''\", then: \"{aria-label:'Friendly Captcha'}\")}"
                     />
                     <div class="frc-captcha" data-sitekey="{captchaConfiguration.siteKey}" data-lang="{captchaConfiguration.languageIsoCode}" data-puzzle-endpoint="{captchaConfiguration.puzzleUrl}"></div>
                 </f:render>

Tests/Unit/ViewHelpers/ConfigurationViewHelperTest.php

@@ -30,6 +30,6 @@ public function __construct() {}
             'puzzleUrl' => 'https://puzzle',
             'jsPath' => 'EXT:friendlycaptcha_official/Resources/Public/JavaScript/lib/widget-0.9.12.min.js',
             'enabled' => true,
-        ], ConfigurationViewHelper::renderStatic([], static fn () => '', $renderingContext));
+        ], ConfigurationViewHelper::renderStatic([], static fn() => '', $renderingContext));
     }
 }

composer.json

@@ -13,7 +13,7 @@
 		"typo3/cms-form": "^11.5.30 || ^12.4.5",
 		"phpunit/phpunit": "^9",
 		"typo3/coding-standards": "^0.5.3",
-		"friendsofphp/php-cs-fixer": "^3.13.0",
+		"friendsofphp/php-cs-fixer": "^3.51.0",
 		"webmozart/assert": "^1.11.0"
 	},
 	"suggest": {

ext_emconf.php

@@ -17,5 +17,5 @@
         ],
     ],
     'state' => 'beta',
-    'version' => '0.1.1',
+    'version' => '0.1.2',
 ];