Merge branch 'develop' into release/v4

* develop:
  Optimization and bug fix. Closes #27

Author: biscolab

README.md

@@ -1,4 +1,4 @@
-# Laravel ReCAPTCHA v3
+# Laravel ReCAPTCHA v3, checkbox and invisible
 Simple and painless Google reCAPTCHA package for Laravel 5 and 6
 
 Available reCAPTCHA versions:
@@ -14,7 +14,7 @@ Available reCAPTCHA versions:
 | Package | reCAPTCHA | PHP | Laravel | Docs |
 |-----------------|-------------|-------------|-----------------|-------------------|
 | 4.x             |v3, v2 Invisible, v2 Checkbox | 7.1 or greater | 5.5 or greater, 6 | [latest](https://laravel-recaptcha-docs.biscolab.com) |
-| 3.x             |v3, v2 Invisible, v2 Checkbox | 7.1 or greater | 5.5 or greater, 6 ready (*) | [latest](https://laravel-recaptcha-docs.biscolab.com/docs/3.6.1/intro) |
+| 3.x             |v3, v2 Invisible, v2 Checkbox | 7.1 or greater | 5.5 or greater, 6 ready (*) | [v3.6.1](https://laravel-recaptcha-docs.biscolab.com/docs/3.6.1/intro) |
 | 2.x             | v2 Invisible, v2 Checkbox | 5.5.9, 7.0 or greater | 5.0 or greater | [v2.0.4](https://laravel-recaptcha-docs.biscolab.com/docs/2.0.4/intro) |
 
 > (*) Latest version (3.6.1) is Laravel 6 ready 

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "biscolab/laravel-recaptcha",
     "description": "Simple ReCaptcha package for Laravel 5 and 6",
-    "version": "4.0.0",
+    "version": "4.0.1",
     "license": "MIT",
     "type": "library",
     "keywords": [

src/Facades/ReCaptcha.php

@@ -15,18 +15,23 @@
 /**
  * Class ReCaptcha
  * @package Biscolab\ReCaptcha\Facades
+ *
+ * @method static string htmlScriptTagJsApi(?array $config = [])
+ * @method static string htmlFormButton(?string $button_label = '', ?array $properties = [])
+ * @method static string htmlFormSnippet()
+ * @method static string getFormId()
  */
 class ReCaptcha extends Facade
 {
 
-	/**
-	 * Get the registered name of the component.
-	 *
-	 * @return string
-	 */
-	protected static function getFacadeAccessor()
-	{
+    /**
+     * Get the registered name of the component.
+     *
+     * @return string
+     */
+    protected static function getFacadeAccessor()
+    {
 
-		return 'recaptcha';
-	}
+        return 'recaptcha';
+    }
 }

src/ReCaptchaBuilder.php

@@ -213,7 +213,7 @@ public function htmlScriptTagJsApi(?array $configuration = []): string
 
         // Language: "hl" parameter
         // resources $configuration parameter overrides default language
-        $language = Arr::get($configuration, 'resources');
+        $language = Arr::get($configuration, 'lang');
         if (!$language) {
             $language = config('recaptcha.default_language', null);
         }
@@ -227,6 +227,7 @@ public function htmlScriptTagJsApi(?array $configuration = []): string
             Arr::set($query, 'render', 'explicit');
             Arr::set($query, 'onload', self::DEFAULT_ONLOAD_JS_FUNCTION);
 
+            /** @scrutinizer ignore-call */
             $html = $this->getOnLoadCallback();
         }
 

src/helpers.php

@@ -42,27 +42,6 @@ function htmlScriptTagJsApi(?array $config = []): string
     }
 }
 
-/**
- * call ReCaptcha::htmlScriptTagJsApi()
- * Write script HTML tag in you HTML code
- * Insert before </head> tag
- *
- */
-if (!function_exists('htmlScriptTagJsApiV3')) {
-
-    /**
-     * @param array $config
-     *
-     * @return string
-     * @deprecated
-     */
-    function htmlScriptTagJsApiV3(?array $config = []): string
-    {
-
-        return ReCaptcha::htmlScriptTagJsApiV3($config);
-    }
-}
-
 /**
  * call ReCaptcha::htmlFormButton()
  * Write HTML <button> tag in your HTML code

tests/ReCaptchaHelpersV2ExplicitTest.php

@@ -22,10 +22,11 @@ public function testGetOnLoadCallbackFunction()
     {
 
         $recaptcha = \recaptcha();
-
+        /** @scrutinizer ignore-call */
         $callback = $recaptcha->getOnLoadCallback();
 
-        $this->assertEquals('<script>var biscolabOnloadCallback = function() {grecaptcha.render(\'recaptcha-element\', {"sitekey":"api_site_key","theme":"dark","size":"compact","tabindex":"2","callback":"callbackFunction","expired-callback":"expiredCallbackFunction","error-callback":"errorCallbackFunction"});};</script>', $callback);
+        $this->assertEquals('<script>var biscolabOnloadCallback = function() {grecaptcha.render(\'recaptcha-element\', {"sitekey":"api_site_key","theme":"dark","size":"compact","tabindex":"2","callback":"callbackFunction","expired-callback":"expiredCallbackFunction","error-callback":"errorCallbackFunction"});};</script>',
+            $callback);
     }
 
     /**
@@ -47,7 +48,7 @@ public function testTagAttributes()
     {
 
         $recaptcha = \recaptcha();
-
+        /** @scrutinizer ignore-call */
         $tag_attributes = $recaptcha->getTagAttributes();
 
         $this->assertArrayHasKey('sitekey', $tag_attributes);
@@ -82,6 +83,7 @@ public function testExpectReCaptchaInstanceOfReCaptchaBuilderV2()
     public function testHtmlFormSnippet()
     {
 
+        /** @scrutinizer ignore-call */
         $html_snippet = \recaptcha()->htmlFormSnippet();
         $this->assertEquals('<div class="g-recaptcha" data-sitekey="api_site_key" data-theme="dark" data-size="compact" data-tabindex="2" data-callback="callbackFunction" data-expired-callback="expiredCallbackFunction" data-error-callback="errorCallbackFunction" id="recaptcha-element"></div>',
             $html_snippet);

tests/ReCaptchaLangTest.php

@@ -37,6 +37,16 @@ public function testHtmlScriptTagJsApiGetHtmlScriptWithHlParam()
 		$this->assertEquals('<script src="https://www.google.com/recaptcha/api.js?hl=it" async defer></script>', $r);
 	}
 
+	/**
+	 * @tests
+	 */
+	public function testHtmlScriptTagJsApiGetHtmlScriptOverridingHlParam()
+	{
+
+		$r = ReCaptcha::htmlScriptTagJsApi(['lang' => 'en']);
+		$this->assertEquals('<script src="https://www.google.com/recaptcha/api.js?hl=en" async defer></script>', $r);
+	}
+
 	/**
 	 * Define environment setup.
 	 *