FIX blade directive

Author: enricodelazzari

src/GoogleRecaptchaV3.php

@@ -13,8 +13,8 @@ class GoogleRecaptchaV3
 {
     public function boot(): void
     {
-        Blade::directive('recaptcha', fn (Badge $badge) => (
-            $this->toHtml($badge)
+        Blade::directive('recaptcha', fn (string $expression) => (
+            "<?php echo app(".static::class.")->renderHtml({$expression}); ?>"
         ));
 
         Rule::macro('googleRecaptchaV3', fn (?float $scoreThreshold = null) => (
@@ -69,7 +69,7 @@ private function getHiddenBadgeStyle(): string
         CSS;
     }
 
-    private function toHtml(Badge $badge): string
+    public function renderHtml(Badge $badge): string
     {
         if (! Config::isEnabled()) {
             return '';

tests/GoogleRecaptchaV3Test.php

@@ -12,7 +12,7 @@
 it('renders recaptcha HTML with badge parameter', function (Badge $badge, bool $shouldContainBadgeParam) {
     $recaptcha = new GoogleRecaptchaV3;
 
-    $html = (fn () => $this->toHtml($badge))->call($recaptcha);
+    $html = $recaptcha->renderHtml($badge);
 
     expect($html)
         ->toContain('https://www.google.com/recaptcha/api.js')
@@ -35,7 +35,7 @@
 it('renders hidden badge style for hidden badge', function () {
     $recaptcha = new GoogleRecaptchaV3;
 
-    $html = (fn () => $this->toHtml(Badge::HIDDEN))->call($recaptcha);
+    $html = $recaptcha->renderHtml(Badge::HIDDEN);
 
     expect($html)
         ->toContain('.grecaptcha-badge')
@@ -47,7 +47,7 @@
 it('does not render hidden badge style for non-hidden badges', function (Badge $badge) {
     $recaptcha = new GoogleRecaptchaV3;
 
-    $html = (fn () => $this->toHtml($badge))->call($recaptcha);
+    $html = $recaptcha->renderHtml($badge);
 
     expect($html)
         ->not->toContain('.grecaptcha-badge')
@@ -62,7 +62,7 @@
     config()->set('google-recaptcha-v3.enabled', false);
 
     $recaptcha = new GoogleRecaptchaV3;
-    $html = (fn () => $this->toHtml(Badge::BOTTOMRIGHT))->call($recaptcha);
+    $html = $recaptcha->renderHtml(Badge::BOTTOMRIGHT);
 
     expect($html)->toBe('');
 });
@@ -71,7 +71,7 @@
     config()->set('google-recaptcha-v3.site_key', null);
 
     $recaptcha = new GoogleRecaptchaV3;
-    $html = (fn () => $this->toHtml(Badge::BOTTOMRIGHT))->call($recaptcha);
+    $html = $recaptcha->renderHtml(Badge::BOTTOMRIGHT);
 
     expect($html)->toBe('');
 });
@@ -80,15 +80,15 @@
     config()->set('google-recaptcha-v3.secret_key', null);
 
     $recaptcha = new GoogleRecaptchaV3;
-    $html = (fn () => $this->toHtml(Badge::BOTTOMRIGHT))->call($recaptcha);
+    $html = $recaptcha->renderHtml(Badge::BOTTOMRIGHT);
 
     expect($html)->toBe('');
 });
 
 it('includes window.recaptcha function in output', function () {
     $recaptcha = new GoogleRecaptchaV3;
 
-    $html = (fn () => $this->toHtml(Badge::BOTTOMRIGHT))->call($recaptcha);
+    $html = $recaptcha->renderHtml(Badge::BOTTOMRIGHT);
 
     expect($html)
         ->toContain('window.recaptcha = function')
@@ -100,15 +100,15 @@
 it('includes site key in grecaptcha execute call', function () {
     $recaptcha = new GoogleRecaptchaV3;
 
-    $html = (fn () => $this->toHtml(Badge::BOTTOMRIGHT))->call($recaptcha);
+    $html = $recaptcha->renderHtml(Badge::BOTTOMRIGHT);
 
     expect($html)->toContain("grecaptcha.execute('test-site-key'");
 });
 
 it('wraps scripts in script tags', function () {
     $recaptcha = new GoogleRecaptchaV3;
 
-    $html = (fn () => $this->toHtml(Badge::BOTTOMRIGHT))->call($recaptcha);
+    $html = $recaptcha->renderHtml(Badge::BOTTOMRIGHT);
 
     expect($html)
         ->toMatch('/<script>.*?<\/script>/s')