biscolab / laravel-recaptcha

src/ReCaptchaServiceProvider.php

Indentation +97 added lines, -97 removed lines

@@ -20,103 +20,103 @@
  */
 class ReCaptchaServiceProvider extends ServiceProvider {
 
-	/**
-	 * Indicates if loading of the provider is deferred.
-	 *
-	 * @var bool
-	 */
-	protected $defer = false;
-
-	/**
-	 *
-	 */
-	public function boot() {
-
-		$this->addValidationRule();
+    /**
+     * Indicates if loading of the provider is deferred.
+     *
+     * @var bool
+     */
+    protected $defer = false;
+
+    /**
+     *
+     */
+    public function boot() {
+
+        $this->addValidationRule();
 //		$this->loadRoutesFrom(__DIR__ . '/routes/routes.php');
-		$this->registerRoutes();
-		$this->publishes([
-			__DIR__ . '/../config/recaptcha.php' => config_path('recaptcha.php'),
-		]);
-
-	}
-
-	/**
-	 * Extends Validator to include a recaptcha type
-	 */
-	public function addValidationRule() {
-
-		Validator::extendImplicit('recaptcha', function ($attribute, $value, $parameters, $validator) {
-
-			return app('recaptcha')->validate($value);
-		}, trans('validation.recaptcha'));
-	}
-
-	/**
-	 * Register the service provider.
-	 *
-	 * @return void
-	 */
-	public function register() {
-
-		$this->mergeConfigFrom(
-			__DIR__ . '/../config/recaptcha.php', 'recaptcha'
-		);
-
-		$this->registerReCaptchaBuilder();
-	}
-
-	/**
-	 * Get the services provided by the provider.
-	 *
-	 * @return array
-	 */
-	public function provides(): array {
-
-		return ['recaptcha'];
-	}
-
-	/**
-	 * @return ReCaptchaServiceProvider
-	 *
-	 * @since v3.4.1
-	 */
-	protected function registerRoutes(): ReCaptchaServiceProvider {
-
-		Route::get(
-			config('recaptcha.default_validation_route', 'biscolab-recaptcha/validate'),
-			['uses' => 'Biscolab\ReCaptcha\Controllers\ReCaptchaController@validateV3']
-		)->middleware('web');
-
-		return $this;
-	}
-
-	/**
-	 * Register the HTML builder instance.
-	 *
-	 * @return void
-	 */
-	protected function registerReCaptchaBuilder() {
-
-		$this->app->singleton('recaptcha', function ($app) {
-
-			$recaptcha_class = '';
-
-			switch (config('recaptcha.version')) {
-				case 'v3' :
-					$recaptcha_class = ReCaptchaBuilderV3::class;
-					break;
-				case 'v2' :
-					$recaptcha_class = ReCaptchaBuilderV2::class;
-					break;
-				case 'invisible':
-					$recaptcha_class = ReCaptchaBuilderInvisible::class;
-					break;
-			}
-
-			return new $recaptcha_class(config('recaptcha.api_site_key'), config('recaptcha.api_secret_key'), config('recaptcha.curl_timeout'));
-
-		});
-	}
+        $this->registerRoutes();
+        $this->publishes([
+            __DIR__ . '/../config/recaptcha.php' => config_path('recaptcha.php'),
+        ]);
+
+    }
+
+    /**
+     * Extends Validator to include a recaptcha type
+     */
+    public function addValidationRule() {
+
+        Validator::extendImplicit('recaptcha', function ($attribute, $value, $parameters, $validator) {
+
+            return app('recaptcha')->validate($value);
+        }, trans('validation.recaptcha'));
+    }
+
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register() {
+
+        $this->mergeConfigFrom(
+            __DIR__ . '/../config/recaptcha.php', 'recaptcha'
+        );
+
+        $this->registerReCaptchaBuilder();
+    }
+
+    /**
+     * Get the services provided by the provider.
+     *
+     * @return array
+     */
+    public function provides(): array {
+
+        return ['recaptcha'];
+    }
+
+    /**
+     * @return ReCaptchaServiceProvider
+     *
+     * @since v3.4.1
+     */
+    protected function registerRoutes(): ReCaptchaServiceProvider {
+
+        Route::get(
+            config('recaptcha.default_validation_route', 'biscolab-recaptcha/validate'),
+            ['uses' => 'Biscolab\ReCaptcha\Controllers\ReCaptchaController@validateV3']
+        )->middleware('web');
+
+        return $this;
+    }
+
+    /**
+     * Register the HTML builder instance.
+     *
+     * @return void
+     */
+    protected function registerReCaptchaBuilder() {
+
+        $this->app->singleton('recaptcha', function ($app) {
+
+            $recaptcha_class = '';
+
+            switch (config('recaptcha.version')) {
+                case 'v3' :
+                    $recaptcha_class = ReCaptchaBuilderV3::class;
+                    break;
+                case 'v2' :
+                    $recaptcha_class = ReCaptchaBuilderV2::class;
+                    break;
+                case 'invisible':
+                    $recaptcha_class = ReCaptchaBuilderInvisible::class;
+                    break;
+            }
+
+            return new $recaptcha_class(config('recaptcha.api_site_key'), config('recaptcha.api_secret_key'), config('recaptcha.curl_timeout'));
+
+        });
+    }
 
 }

config/recaptcha.php

Indentation +50 added lines, -50 removed lines

@@ -13,60 +13,60 @@
  */
 return [
 
-	/**
-	 *
-	 * The site key
-	 * get site key @ www.google.com/recaptcha/admin
-	 *
-	 */
-	'api_site_key'                 => env('RECAPTCHA_SITE_KEY', ''),
+    /**
+     *
+     * The site key
+     * get site key @ www.google.com/recaptcha/admin
+     *
+     */
+    'api_site_key'                 => env('RECAPTCHA_SITE_KEY', ''),
 
-	/**
-	 *
-	 * The secret key
-	 * get secret key @ www.google.com/recaptcha/admin
-	 *
-	 */
-	'api_secret_key'               => env('RECAPTCHA_SECRET_KEY', ''),
+    /**
+     *
+     * The secret key
+     * get secret key @ www.google.com/recaptcha/admin
+     *
+     */
+    'api_secret_key'               => env('RECAPTCHA_SECRET_KEY', ''),
 
-	/**
-	 *
-	 * ReCATCHA version
-	 * Supported: "v2", "invisible", "v3",
-	 *
-	 * get more info @ https://developers.google.com/recaptcha/docs/versions
-	 *
-	 */
-	'version'                      => env('RECAPTCHA_DEFAULT_VERSION', 'v2'),
+    /**
+     *
+     * ReCATCHA version
+     * Supported: "v2", "invisible", "v3",
+     *
+     * get more info @ https://developers.google.com/recaptcha/docs/versions
+     *
+     */
+    'version'                      => env('RECAPTCHA_DEFAULT_VERSION', 'v2'),
 
-	/**
-	 *
-	 * The curl timout in seconds to validate a recaptcha token
-	 * @since v3.5.0
-	 *
-	 */
-	'curl_timeout'                 => env('RECAPTCHA_CURL_TIMEOUT', 10),
+    /**
+     *
+     * The curl timout in seconds to validate a recaptcha token
+     * @since v3.5.0
+     *
+     */
+    'curl_timeout'                 => env('RECAPTCHA_CURL_TIMEOUT', 10),
 
-	/**
-	 *
-	 * IP addresses for which validation will be skipped
-	 *
-	 */
-	'skip_ip'                      => [],
+    /**
+     *
+     * IP addresses for which validation will be skipped
+     *
+     */
+    'skip_ip'                      => [],
 
-	/**
-	 *
-	 * Default route called to check the Google reCAPTCHA token
-	 * @since v3.2.0
-	 *
-	 */
-	'default_validation_route'     => env('RECAPTCHA_DEFAULT_VALIDATION_ROUTE', 'biscolab-recaptcha/validate'),
+    /**
+     *
+     * Default route called to check the Google reCAPTCHA token
+     * @since v3.2.0
+     *
+     */
+    'default_validation_route'     => env('RECAPTCHA_DEFAULT_VALIDATION_ROUTE', 'biscolab-recaptcha/validate'),
 
-	/**
-	 *
-	 * The name of the parameter used to send Google reCAPTCHA token to verify route
-	 * @since v3.2.0
-	 *
-	 */
-	'default_token_parameter_name' => env('RECAPTCHA_DEFAULT_TOKEN_PARAMETER_NAME', 'token')
+    /**
+     *
+     * The name of the parameter used to send Google reCAPTCHA token to verify route
+     * @since v3.2.0
+     *
+     */
+    'default_token_parameter_name' => env('RECAPTCHA_DEFAULT_TOKEN_PARAMETER_NAME', 'token')
 ];

src/ReCaptchaBuilderInvisible.php

Indentation +21 added lines, -21 removed lines

@@ -16,29 +16,29 @@
  */
 class ReCaptchaBuilderInvisible extends ReCaptchaBuilder {
 
-	/**
-	 * ReCaptchaBuilderInvisible constructor.
-	 *
-	 * @param string   $api_site_key
-	 * @param string   $api_secret_key
-	 * @param int|null $curl_timeout
-	 */
-	public function __construct(string $api_site_key, string $api_secret_key, ?int $curl_timeout = null) {
+    /**
+     * ReCaptchaBuilderInvisible constructor.
+     *
+     * @param string   $api_site_key
+     * @param string   $api_secret_key
+     * @param int|null $curl_timeout
+     */
+    public function __construct(string $api_site_key, string $api_secret_key, ?int $curl_timeout = null) {
 
-		parent::__construct($api_site_key, $api_secret_key, 'invisible', $curl_timeout);
-	}
+        parent::__construct($api_site_key, $api_secret_key, 'invisible', $curl_timeout);
+    }
 
-	/**
-	 * Write HTML <button> tag in your HTML code
-	 * Insert before </form> tag
-	 *
-	 * @param string $buttonInnerHTML
-	 *
-	 * @return string
-	 */
-	public function htmlFormButton($buttonInnerHTML = 'Submit'): string {
+    /**
+     * Write HTML <button> tag in your HTML code
+     * Insert before </form> tag
+     *
+     * @param string $buttonInnerHTML
+     *
+     * @return string
+     */
+    public function htmlFormButton($buttonInnerHTML = 'Submit'): string {
 
-		return ($this->version == 'invisible') ? '<button class="g-recaptcha" data-sitekey="' . $this->api_site_key . '" data-callback="biscolabLaravelReCaptcha">' . $buttonInnerHTML . '</button>' : '';
-	}
+        return ($this->version == 'invisible') ? '<button class="g-recaptcha" data-sitekey="' . $this->api_site_key . '" data-callback="biscolabLaravelReCaptcha">' . $buttonInnerHTML . '</button>' : '';
+    }
 
 }
\ No newline at end of file

src/ReCaptchaBuilderV2.php

Indentation +18 added lines, -18 removed lines

@@ -16,26 +16,26 @@
  */
 class ReCaptchaBuilderV2 extends ReCaptchaBuilder {
 
-	/**
-	 * ReCaptchaBuilderV2 constructor.
-	 *
-	 * @param string   $api_site_key
-	 * @param string   $api_secret_key
-	 * @param int|null $curl_timeout
-	 */
-	public function __construct(string $api_site_key, string $api_secret_key, ?int $curl_timeout = null) {
+    /**
+     * ReCaptchaBuilderV2 constructor.
+     *
+     * @param string   $api_site_key
+     * @param string   $api_secret_key
+     * @param int|null $curl_timeout
+     */
+    public function __construct(string $api_site_key, string $api_secret_key, ?int $curl_timeout = null) {
 
-		parent::__construct($api_site_key, $api_secret_key, 'v2', $curl_timeout);
-	}
+        parent::__construct($api_site_key, $api_secret_key, 'v2', $curl_timeout);
+    }
 
-	/**
-	 * Write ReCAPTCHA HTML tag in your FORM
-	 * Insert before </form> tag
-	 * @return string
-	 */
-	public function htmlFormSnippet(): string {
+    /**
+     * Write ReCAPTCHA HTML tag in your FORM
+     * Insert before </form> tag
+     * @return string
+     */
+    public function htmlFormSnippet(): string {
 
-		return ($this->version == 'v2') ? '<div class="g-recaptcha" data-sitekey="' . $this->api_site_key . '"></div>' : '';
-	}
+        return ($this->version == 'v2') ? '<div class="g-recaptcha" data-sitekey="' . $this->api_site_key . '"></div>' : '';
+    }
 
 }
\ No newline at end of file

src/ReCaptchaBuilderV3.php

Indentation +10 added lines, -10 removed lines

@@ -16,16 +16,16 @@
  */
 class ReCaptchaBuilderV3 extends ReCaptchaBuilder {
 
-	/**
-	 * ReCaptchaBuilderV3 constructor.
-	 *
-	 * @param string   $api_site_key
-	 * @param string   $api_secret_key
-	 * @param int|null $curl_timeout
-	 */
-	public function __construct(string $api_site_key, string $api_secret_key, ?int $curl_timeout = null) {
+    /**
+     * ReCaptchaBuilderV3 constructor.
+     *
+     * @param string   $api_site_key
+     * @param string   $api_secret_key
+     * @param int|null $curl_timeout
+     */
+    public function __construct(string $api_site_key, string $api_secret_key, ?int $curl_timeout = null) {
 
-		parent::__construct($api_site_key, $api_secret_key, 'v3', $curl_timeout);
-	}
+        parent::__construct($api_site_key, $api_secret_key, 'v3', $curl_timeout);
+    }
 
 }
\ No newline at end of file

src/ReCaptchaBuilder.php

Indentation +307 added lines, -307 removed lines

@@ -19,237 +19,237 @@ 
  */
 class ReCaptchaBuilder {
 
-	/**
-	 * @var string
-	 */
-	const DEFAULT_API_VERSION = 'v2';
-
-	/**
-	 * @var int
-	 */
-	const DEFAULT_CURL_TIMEOUT = 10;
-
-	/**
-	 * The Site key
-	 * please visit https://developers.google.com/recaptcha/docs/start
-	 * @var string
-	 */
-	protected $api_site_key;
-
-	/**
-	 * The Secret key
-	 * please visit https://developers.google.com/recaptcha/docs/start
-	 * @var string
-	 */
-	protected $api_secret_key;
-
-	/**
-	 * The chosen ReCAPTCHA version
-	 * please visit https://developers.google.com/recaptcha/docs/start
-	 * @var string
-	 */
-	protected $version;
-
-	/**
-	 * The curl timeout
-	 * please visit https://curl.haxx.se/libcurl/c/CURLOPT_TIMEOUT.html
-	 * @var int
-	 */
-	protected $curl_timeout;
-
-	/**
-	 * Whether is true the ReCAPTCHA is inactive
-	 * @var boolean
-	 */
-	protected $skip_by_ip = false;
-
-	/**
-	 * The API request URI
-	 */
-	protected $api_url = 'https://www.google.com/recaptcha/api/siteverify';
-
-	/**
-	 * ReCaptchaBuilder constructor.
-	 *
-	 * @param string      $api_site_key
-	 * @param string      $api_secret_key
-	 * @param null|string $version
-	 * @param int|null    $curl_timeout
-	 */
-	public function __construct(
-		string $api_site_key,
-		string $api_secret_key,
-		?string $version = self::DEFAULT_API_VERSION,
-		?int $curl_timeout = self::DEFAULT_CURL_TIMEOUT
-	) {
-
-		$this->setApiSiteKey($api_site_key);
-		$this->setApiSecretKey($api_secret_key);
-		$this->setVersion($version);
-		$this->setCurlTimeout($curl_timeout);
-		$this->setSkipByIp($this->skipByIp());
-	}
-
-	/**
-	 * @param string $api_site_key
-	 *
-	 * @return ReCaptchaBuilder
-	 */
-	public function setApiSiteKey(string $api_site_key): ReCaptchaBuilder {
-
-		$this->api_site_key = $api_site_key;
-
-		return $this;
-	}
-
-	/**
-	 * @param string $api_secret_key
-	 *
-	 * @return ReCaptchaBuilder
-	 */
-	public function setApiSecretKey(string $api_secret_key): ReCaptchaBuilder {
-
-		$this->api_secret_key = $api_secret_key;
-
-		return $this;
-	}
-
-	/**
-	 * @param int|null $curl_timeout
-	 *
-	 * @return ReCaptchaBuilder
-	 */
-	public function setCurlTimeout(?int $curl_timeout = null): ReCaptchaBuilder {
-
-		if($curl_timeout === null) {
-			$curl_timeout = config('recaptcha.curl_timeout', ReCaptchaBuilder::DEFAULT_CURL_TIMEOUT);
-		}
-		$this->curl_timeout = $curl_timeout;
-
-		return $this;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getCurlTimeout(): int {
-
-		return $this->curl_timeout;
-	}
-
-	/**
-	 * @param string $version
-	 *
-	 * @return ReCaptchaBuilder
-	 */
-	public function setVersion(string $version): ReCaptchaBuilder {
-
-		$this->version = $version;
-
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getVersion(): string {
-
-		return $this->version;
-	}
-
-	/**
-	 * @param bool $skip_by_ip
-	 *
-	 * @return ReCaptchaBuilder
-	 */
-	public function setSkipByIp(bool $skip_by_ip): ReCaptchaBuilder {
-
-		$this->skip_by_ip = $skip_by_ip;
-
-		return $this;
-	}
-
-	/**
-	 * @return array|mixed
-	 */
-	public function getIpWhitelist() {
-
-		$whitelist = config('recaptcha.skip_ip', []);
-
-		if (!is_array($whitelist)) {
-			$whitelist = explode(',', $whitelist);
-		}
-
-		return $whitelist;
-	}
-
-	/**
-	 * Checks whether the user IP address is among IPs "to be skipped"
-	 *
-	 * @return boolean
-	 */
-	public function skipByIp(): bool {
-
-		return (in_array(request()->ip(), $this->getIpWhitelist()));
-	}
-
-	/**
-	 * Write script HTML tag in you HTML code
-	 * Insert before </head> tag
-	 *
-	 * @param string|null $formId
-	 * @param array|null  $configuration
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	public function htmlScriptTagJsApi(?string $formId = '', ?array $configuration = []): string {
-
-		if ($this->skip_by_ip) {
-			return '';
-		}
-
-		switch ($this->version) {
-			case 'v3':
-				$html = "<script src=\"https://www.google.com/recaptcha/api.js?render={$this->api_site_key}\"></script>";
-				break;
-			default:
-				$html = "<script src=\"https://www.google.com/recaptcha/api.js\" async defer></script>";
-		}
-
-		if ($this->version == 'invisible') {
-			if (!$formId) {
-				throw new Exception("formId required", 1);
-			}
-			$html .= '<script>
+    /**
+     * @var string
+     */
+    const DEFAULT_API_VERSION = 'v2';
+
+    /**
+     * @var int
+     */
+    const DEFAULT_CURL_TIMEOUT = 10;
+
+    /**
+     * The Site key
+     * please visit https://developers.google.com/recaptcha/docs/start
+     * @var string
+     */
+    protected $api_site_key;
+
+    /**
+     * The Secret key
+     * please visit https://developers.google.com/recaptcha/docs/start
+     * @var string
+     */
+    protected $api_secret_key;
+
+    /**
+     * The chosen ReCAPTCHA version
+     * please visit https://developers.google.com/recaptcha/docs/start
+     * @var string
+     */
+    protected $version;
+
+    /**
+     * The curl timeout
+     * please visit https://curl.haxx.se/libcurl/c/CURLOPT_TIMEOUT.html
+     * @var int
+     */
+    protected $curl_timeout;
+
+    /**
+     * Whether is true the ReCAPTCHA is inactive
+     * @var boolean
+     */
+    protected $skip_by_ip = false;
+
+    /**
+     * The API request URI
+     */
+    protected $api_url = 'https://www.google.com/recaptcha/api/siteverify';
+
+    /**
+     * ReCaptchaBuilder constructor.
+     *
+     * @param string      $api_site_key
+     * @param string      $api_secret_key
+     * @param null|string $version
+     * @param int|null    $curl_timeout
+     */
+    public function __construct(
+        string $api_site_key,
+        string $api_secret_key,
+        ?string $version = self::DEFAULT_API_VERSION,
+        ?int $curl_timeout = self::DEFAULT_CURL_TIMEOUT
+    ) {
+
+        $this->setApiSiteKey($api_site_key);
+        $this->setApiSecretKey($api_secret_key);
+        $this->setVersion($version);
+        $this->setCurlTimeout($curl_timeout);
+        $this->setSkipByIp($this->skipByIp());
+    }
+
+    /**
+     * @param string $api_site_key
+     *
+     * @return ReCaptchaBuilder
+     */
+    public function setApiSiteKey(string $api_site_key): ReCaptchaBuilder {
+
+        $this->api_site_key = $api_site_key;
+
+        return $this;
+    }
+
+    /**
+     * @param string $api_secret_key
+     *
+     * @return ReCaptchaBuilder
+     */
+    public function setApiSecretKey(string $api_secret_key): ReCaptchaBuilder {
+
+        $this->api_secret_key = $api_secret_key;
+
+        return $this;
+    }
+
+    /**
+     * @param int|null $curl_timeout
+     *
+     * @return ReCaptchaBuilder
+     */
+    public function setCurlTimeout(?int $curl_timeout = null): ReCaptchaBuilder {
+
+        if($curl_timeout === null) {
+            $curl_timeout = config('recaptcha.curl_timeout', ReCaptchaBuilder::DEFAULT_CURL_TIMEOUT);
+        }
+        $this->curl_timeout = $curl_timeout;
+
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCurlTimeout(): int {
+
+        return $this->curl_timeout;
+    }
+
+    /**
+     * @param string $version
+     *
+     * @return ReCaptchaBuilder
+     */
+    public function setVersion(string $version): ReCaptchaBuilder {
+
+        $this->version = $version;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getVersion(): string {
+
+        return $this->version;
+    }
+
+    /**
+     * @param bool $skip_by_ip
+     *
+     * @return ReCaptchaBuilder
+     */
+    public function setSkipByIp(bool $skip_by_ip): ReCaptchaBuilder {
+
+        $this->skip_by_ip = $skip_by_ip;
+
+        return $this;
+    }
+
+    /**
+     * @return array|mixed
+     */
+    public function getIpWhitelist() {
+
+        $whitelist = config('recaptcha.skip_ip', []);
+
+        if (!is_array($whitelist)) {
+            $whitelist = explode(',', $whitelist);
+        }
+
+        return $whitelist;
+    }
+
+    /**
+     * Checks whether the user IP address is among IPs "to be skipped"
+     *
+     * @return boolean
+     */
+    public function skipByIp(): bool {
+
+        return (in_array(request()->ip(), $this->getIpWhitelist()));
+    }
+
+    /**
+     * Write script HTML tag in you HTML code
+     * Insert before </head> tag
+     *
+     * @param string|null $formId
+     * @param array|null  $configuration
+     *
+     * @return string
+     * @throws Exception
+     */
+    public function htmlScriptTagJsApi(?string $formId = '', ?array $configuration = []): string {
+
+        if ($this->skip_by_ip) {
+            return '';
+        }
+
+        switch ($this->version) {
+            case 'v3':
+                $html = "<script src=\"https://www.google.com/recaptcha/api.js?render={$this->api_site_key}\"></script>";
+                break;
+            default:
+                $html = "<script src=\"https://www.google.com/recaptcha/api.js\" async defer></script>";
+        }
+
+        if ($this->version == 'invisible') {
+            if (!$formId) {
+                throw new Exception("formId required", 1);
+            }
+            $html .= '<script>
 		       function biscolabLaravelReCaptcha(token) {
 		         document.getElementById("' . $formId . '").submit();
 		       }
 		     </script>';
-		}
-		elseif ($this->version == 'v3') {
+        }
+        elseif ($this->version == 'v3') {
 
-			$action = Arr::get($configuration, 'action', 'homepage');
+            $action = Arr::get($configuration, 'action', 'homepage');
 
-			$js_custom_validation = Arr::get($configuration, 'custom_validation', '');
+            $js_custom_validation = Arr::get($configuration, 'custom_validation', '');
 
-			// Check if set custom_validation. That function will override default fetch validation function
-			if ($js_custom_validation) {
+            // Check if set custom_validation. That function will override default fetch validation function
+            if ($js_custom_validation) {
 
-				$validate_function = ($js_custom_validation) ? "{$js_custom_validation}(token);" : '';
-			}
-			else {
+                $validate_function = ($js_custom_validation) ? "{$js_custom_validation}(token);" : '';
+            }
+            else {
 
-				$js_then_callback = Arr::get($configuration, 'callback_then', '');
-				$js_callback_catch = Arr::get($configuration, 'callback_catch', '');
+                $js_then_callback = Arr::get($configuration, 'callback_then', '');
+                $js_callback_catch = Arr::get($configuration, 'callback_catch', '');
 
-				$js_then_callback = ($js_then_callback) ? "{$js_then_callback}(response)" : '';
-				$js_callback_catch = ($js_callback_catch) ? "{$js_callback_catch}(err)" : '';
+                $js_then_callback = ($js_then_callback) ? "{$js_then_callback}(response)" : '';
+                $js_callback_catch = ($js_callback_catch) ? "{$js_callback_catch}(err)" : '';
 
-				$validate_function = "
+                $validate_function = "
                 fetch('/" . config('recaptcha.default_validation_route',
-						'biscolab-recaptcha/validate') . "?" . config('recaptcha.default_token_parameter_name',
-						'token') . "=' + token, {
+                        'biscolab-recaptcha/validate') . "?" . config('recaptcha.default_token_parameter_name',
+                        'token') . "=' + token, {
                     headers: {
                         \"X-Requested-With\": \"XMLHttpRequest\",
                         \"X-CSRF-TOKEN\": csrfToken.content
@@ -261,9 +261,9 @@ 
                 .catch(function(err) {
                     {$js_callback_catch}
                 });";
-			}
+            }
 
-			$html .= "<script>
+            $html .= "<script>
                     var csrfToken = document.head.querySelector('meta[name=\"csrf-token\"]');
                   grecaptcha.ready(function() {
                       grecaptcha.execute('{$this->api_site_key}', {action: '{$action}'}).then(function(token) {
@@ -271,90 +271,90 @@ 
                       });
                   });
 		     </script>";
-		}
-
-		return $html;
-	}
-
-	/**
-	 * @param array|null $configuration
-	 *
-	 * @return string
-	 */
-	public function htmlScriptTagJsApiV3(?array $configuration = []): string {
-
-		return $this->htmlScriptTagJsApi('', $configuration);
-	}
-
-	/**
-	 * Call out to reCAPTCHA and process the response
-	 *
-	 * @param string $response
-	 *
-	 * @return boolean|array
-	 */
-	public function validate($response) {
-
-		if ($this->skip_by_ip) {
-			if ($this->returnArray()) {
-				// Add 'skip_by_ip' field to response
-				return [
-					'skip_by_ip' => true,
-					'score'      => 0.9,
-					'success'    => true
-				];
-			}
-
-			return true;
-		}
-
-		$params = http_build_query([
-			'secret'   => $this->api_secret_key,
-			'remoteip' => request()->getClientIp(),
-			'response' => $response,
-		]);
-
-		$url = $this->api_url . '?' . $params;
-
-		if (function_exists('curl_version')) {
-			$curl = curl_init($url);
-			curl_setopt($curl, CURLOPT_HEADER, false);
-			curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-			curl_setopt($curl, CURLOPT_TIMEOUT, $this->curl_timeout);
-			curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
-			$curl_response = curl_exec($curl);
-		}
-		else {
-			$curl_response = file_get_contents($url);
-		}
-
-		if (is_null($curl_response) || empty($curl_response)) {
-			if ($this->returnArray()) {
-				// Add 'error' field to response
-				return [
-					'error'   => 'cURL response empty',
-					'score'   => 0.1,
-					'success' => false
-				];
-			}
-
-			return false;
-		}
-		$response = json_decode(trim($curl_response), true);
-
-		if ($this->returnArray()) {
-			return $response;
-		}
-
-		return $response['success'];
-
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function returnArray(): bool {
-
-		return ($this->version == 'v3');
-	}
+        }
+
+        return $html;
+    }
+
+    /**
+     * @param array|null $configuration
+     *
+     * @return string
+     */
+    public function htmlScriptTagJsApiV3(?array $configuration = []): string {
+
+        return $this->htmlScriptTagJsApi('', $configuration);
+    }
+
+    /**
+     * Call out to reCAPTCHA and process the response
+     *
+     * @param string $response
+     *
+     * @return boolean|array
+     */
+    public function validate($response) {
+
+        if ($this->skip_by_ip) {
+            if ($this->returnArray()) {
+                // Add 'skip_by_ip' field to response
+                return [
+                    'skip_by_ip' => true,
+                    'score'      => 0.9,
+                    'success'    => true
+                ];
+            }
+
+            return true;
+        }
+
+        $params = http_build_query([
+            'secret'   => $this->api_secret_key,
+            'remoteip' => request()->getClientIp(),
+            'response' => $response,
+        ]);
+
+        $url = $this->api_url . '?' . $params;
+
+        if (function_exists('curl_version')) {
+            $curl = curl_init($url);
+            curl_setopt($curl, CURLOPT_HEADER, false);
+            curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+            curl_setopt($curl, CURLOPT_TIMEOUT, $this->curl_timeout);
+            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
+            $curl_response = curl_exec($curl);
+        }
+        else {
+            $curl_response = file_get_contents($url);
+        }
+
+        if (is_null($curl_response) || empty($curl_response)) {
+            if ($this->returnArray()) {
+                // Add 'error' field to response
+                return [
+                    'error'   => 'cURL response empty',
+                    'score'   => 0.1,
+                    'success' => false
+                ];
+            }
+
+            return false;
+        }
+        $response = json_decode(trim($curl_response), true);
+
+        if ($this->returnArray()) {
+            return $response;
+        }
+
+        return $response['success'];
+
+    }
+
+    /**
+     * @return bool
+     */
+    protected function returnArray(): bool {
+
+        return ($this->version == 'v3');
+    }
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -121,7 +121,7 @@ 
 	 */
 	public function setCurlTimeout(?int $curl_timeout = null): ReCaptchaBuilder {
 
-		if($curl_timeout === null) {
+		if ($curl_timeout === null) {
 			$curl_timeout = config('recaptcha.curl_timeout', ReCaptchaBuilder::DEFAULT_CURL_TIMEOUT);
 		}
 		$this->curl_timeout = $curl_timeout;
@@ -223,7 +223,7 @@ 
 			}
 			$html .= '<script>
 		       function biscolabLaravelReCaptcha(token) {
-		         document.getElementById("' . $formId . '").submit();
+		         document.getElementById("' . $formId.'").submit();
 		       }
 		     </script>';
 		}
@@ -248,8 +248,8 @@ 
 
 				$validate_function = "
                 fetch('/" . config('recaptcha.default_validation_route',
-						'biscolab-recaptcha/validate') . "?" . config('recaptcha.default_token_parameter_name',
-						'token') . "=' + token, {
+						'biscolab-recaptcha/validate')."?".config('recaptcha.default_token_parameter_name',
+						'token')."=' + token, {
                     headers: {
                         \"X-Requested-With\": \"XMLHttpRequest\",
                         \"X-CSRF-TOKEN\": csrfToken.content
@@ -314,7 +314,7 @@ 
 			'response' => $response,
 		]);
 
-		$url = $this->api_url . '?' . $params;
+		$url = $this->api_url.'?'.$params;
 
 		if (function_exists('curl_version')) {
 			$curl = curl_init($url);

Braces +3 added lines, -6 removed lines

@@ -226,8 +226,7 @@ 
 		         document.getElementById("' . $formId . '").submit();
 		       }
 		     </script>';
-		}
-		elseif ($this->version == 'v3') {
+		} elseif ($this->version == 'v3') {
 
 			$action = Arr::get($configuration, 'action', 'homepage');
 
@@ -237,8 +236,7 @@ 
 			if ($js_custom_validation) {
 
 				$validate_function = ($js_custom_validation) ? "{$js_custom_validation}(token);" : '';
-			}
-			else {
+			} else {
 
 				$js_then_callback = Arr::get($configuration, 'callback_then', '');
 				$js_callback_catch = Arr::get($configuration, 'callback_catch', '');
@@ -323,8 +321,7 @@ 
 			curl_setopt($curl, CURLOPT_TIMEOUT, $this->curl_timeout);
 			curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
 			$curl_response = curl_exec($curl);
-		}
-		else {
+		} else {
 			$curl_response = file_get_contents($url);
 		}
 

tests/ReCaptchaConfigurationTest.php

Indentation +36 added lines, -36 removed lines

@@ -22,48 +22,48 @@
  */
 class ReCaptchaConfigurationTest extends TestCase {
 
-	/**
-	 * @var ReCaptchaBuilder
-	 */
-	protected $recaptcha;
+    /**
+     * @var ReCaptchaBuilder
+     */
+    protected $recaptcha;
 
-	/**
-	 * @test
-	 */
-	public function testSkipIpWhiteListIsArray() {
+    /**
+     * @test
+     */
+    public function testSkipIpWhiteListIsArray() {
 
-		$ip_whitelist = $this->recaptcha->getIpWhitelist();
-		$this->assertTrue(is_array($ip_whitelist));
-		$this->assertCount(2, $ip_whitelist);
-	}
+        $ip_whitelist = $this->recaptcha->getIpWhitelist();
+        $this->assertTrue(is_array($ip_whitelist));
+        $this->assertCount(2, $ip_whitelist);
+    }
 
-	/**
-	 * @test
-	 */
-	public function testCurlTimeoutIsSet() {
-		$this->assertEquals(3, $this->recaptcha->getCurlTimeout());
-	}
+    /**
+     * @test
+     */
+    public function testCurlTimeoutIsSet() {
+        $this->assertEquals(3, $this->recaptcha->getCurlTimeout());
+    }
 
-	/**
-	 * Define environment setup.
-	 *
-	 * @param  \Illuminate\Foundation\Application $app
-	 *
-	 * @return void
-	 */
-	protected function getEnvironmentSetUp($app) {
+    /**
+     * Define environment setup.
+     *
+     * @param  \Illuminate\Foundation\Application $app
+     *
+     * @return void
+     */
+    protected function getEnvironmentSetUp($app) {
 
-		$app['config']->set('recaptcha.skip_ip', '10.0.0.1,10.0.0.2');
-		$app['config']->set('recaptcha.curl_timeout', 3);
-	}
+        $app['config']->set('recaptcha.skip_ip', '10.0.0.1,10.0.0.2');
+        $app['config']->set('recaptcha.curl_timeout', 3);
+    }
 
-	/**
-	 * Setup the test environment.
-	 */
-	protected function setUp(): void {
+    /**
+     * Setup the test environment.
+     */
+    protected function setUp(): void {
 
-		parent::setUp(); // TODO: Change the autogenerated stub
+        parent::setUp(); // TODO: Change the autogenerated stub
 
-		$this->recaptcha = new ReCaptchaBuilderV2('api_site_key', 'api_secret_key');
-	}
+        $this->recaptcha = new ReCaptchaBuilderV2('api_site_key', 'api_secret_key');
+    }
 }
\ No newline at end of file

tests/ReCaptchaTest.php

Indentation +93 added lines, -93 removed lines

@@ -22,97 +22,97 @@
  */
 class ReCaptchaTest extends TestCase {
 
-	/**
-	 * @var ReCaptchaBuilderInvisible
-	 */
-	protected $recaptcha_invisible = null;
-
-	/**
-	 * @var ReCaptchaBuilderV2
-	 */
-	protected $recaptcha_v2 = null;
-
-	/**
-	 * @var ReCaptchaBuilderV3
-	 */
-	protected $recaptcha_v3 = null;
-
-	/**
-	 * @tests
-	 */
-	public function testHtmlScriptTagJsApiGetHtmlScriptTag() {
-
-		$r = ReCaptcha::htmlScriptTagJsApi();
-		$this->assertEquals('<script src="https://www.google.com/recaptcha/api.js" async defer></script>', $r);
-	}
-
-	/**
-	 * @test
-	 */
-	public function testReCaptchaInvisibleHtmlFormButtonDefault() {
-
-		$recaptcha = $this->recaptcha_invisible;
-		$html_button = $recaptcha->htmlFormButton();
-		$this->assertEquals('<button class="g-recaptcha" data-sitekey="api_site_key" data-callback="biscolabLaravelReCaptcha">Submit</button>',
-			$html_button);
-	}
-
-	/**
-	 * @test
-	 */
-	public function testReCaptchaInvisibleHtmlFormButtonCustom() {
-
-		$recaptcha = $this->recaptcha_invisible;
-		$html_button = $recaptcha->htmlFormButton('Custom Text');
-		$this->assertEquals('<button class="g-recaptcha" data-sitekey="api_site_key" data-callback="biscolabLaravelReCaptcha">Custom Text</button>',
-			$html_button);
-	}
-
-	/**
-	 * @test
-	 */
-	public function testReCaptchaV2HtmlFormSnippet() {
-
-		$recaptcha = $this->recaptcha_v2;
-		$html_snippet = $recaptcha->htmlFormSnippet();
-		$this->assertEquals('<div class="g-recaptcha" data-sitekey="api_site_key"></div>', $html_snippet);
-	}
-
-	/**
-	 * @test
-	 * @expectedException     \Error
-	 */
-	public function testReCaptchaInvisibleHtmlFormSnippetShouldThrowError() {
-
-		$this->recaptcha_invisible->htmlFormSnippet();
-	}
-
-	/**
-	 * @test
-	 */
-	public function testDefaultCurlTimeout() {
-
-		$this->assertEquals($this->recaptcha_invisible->getCurlTimeout(), ReCaptchaBuilder::DEFAULT_CURL_TIMEOUT);
-		$this->assertEquals($this->recaptcha_v2->getCurlTimeout(), ReCaptchaBuilder::DEFAULT_CURL_TIMEOUT);
-		$this->assertEquals($this->recaptcha_v3->getCurlTimeout(), ReCaptchaBuilder::DEFAULT_CURL_TIMEOUT);
-	}
-
-	/**
-	 * @test
-	 * @expectedException     \Error
-	 */
-	public function testReCaptchaV2htmlFormButtonShouldThrowError() {
-
-		$this->recaptcha_v2->htmlFormButton();
-	}
-
-	protected function setUp(): void {
-
-		parent::setUp(); // TODO: Change the autogenerated stub
-
-		$this->recaptcha_invisible = new ReCaptchaBuilderInvisible('api_site_key', 'api_secret_key');
-		$this->recaptcha_v2 = new ReCaptchaBuilderV2('api_site_key', 'api_secret_key');
-		$this->recaptcha_v3 = new ReCaptchaBuilderV3('api_site_key', 'api_secret_key');
-
-	}
+    /**
+     * @var ReCaptchaBuilderInvisible
+     */
+    protected $recaptcha_invisible = null;
+
+    /**
+     * @var ReCaptchaBuilderV2
+     */
+    protected $recaptcha_v2 = null;
+
+    /**
+     * @var ReCaptchaBuilderV3
+     */
+    protected $recaptcha_v3 = null;
+
+    /**
+     * @tests
+     */
+    public function testHtmlScriptTagJsApiGetHtmlScriptTag() {
+
+        $r = ReCaptcha::htmlScriptTagJsApi();
+        $this->assertEquals('<script src="https://www.google.com/recaptcha/api.js" async defer></script>', $r);
+    }
+
+    /**
+     * @test
+     */
+    public function testReCaptchaInvisibleHtmlFormButtonDefault() {
+
+        $recaptcha = $this->recaptcha_invisible;
+        $html_button = $recaptcha->htmlFormButton();
+        $this->assertEquals('<button class="g-recaptcha" data-sitekey="api_site_key" data-callback="biscolabLaravelReCaptcha">Submit</button>',
+            $html_button);
+    }
+
+    /**
+     * @test
+     */
+    public function testReCaptchaInvisibleHtmlFormButtonCustom() {
+
+        $recaptcha = $this->recaptcha_invisible;
+        $html_button = $recaptcha->htmlFormButton('Custom Text');
+        $this->assertEquals('<button class="g-recaptcha" data-sitekey="api_site_key" data-callback="biscolabLaravelReCaptcha">Custom Text</button>',
+            $html_button);
+    }
+
+    /**
+     * @test
+     */
+    public function testReCaptchaV2HtmlFormSnippet() {
+
+        $recaptcha = $this->recaptcha_v2;
+        $html_snippet = $recaptcha->htmlFormSnippet();
+        $this->assertEquals('<div class="g-recaptcha" data-sitekey="api_site_key"></div>', $html_snippet);
+    }
+
+    /**
+     * @test
+     * @expectedException     \Error
+     */
+    public function testReCaptchaInvisibleHtmlFormSnippetShouldThrowError() {
+
+        $this->recaptcha_invisible->htmlFormSnippet();
+    }
+
+    /**
+     * @test
+     */
+    public function testDefaultCurlTimeout() {
+
+        $this->assertEquals($this->recaptcha_invisible->getCurlTimeout(), ReCaptchaBuilder::DEFAULT_CURL_TIMEOUT);
+        $this->assertEquals($this->recaptcha_v2->getCurlTimeout(), ReCaptchaBuilder::DEFAULT_CURL_TIMEOUT);
+        $this->assertEquals($this->recaptcha_v3->getCurlTimeout(), ReCaptchaBuilder::DEFAULT_CURL_TIMEOUT);
+    }
+
+    /**
+     * @test
+     * @expectedException     \Error
+     */
+    public function testReCaptchaV2htmlFormButtonShouldThrowError() {
+
+        $this->recaptcha_v2->htmlFormButton();
+    }
+
+    protected function setUp(): void {
+
+        parent::setUp(); // TODO: Change the autogenerated stub
+
+        $this->recaptcha_invisible = new ReCaptchaBuilderInvisible('api_site_key', 'api_secret_key');
+        $this->recaptcha_v2 = new ReCaptchaBuilderV2('api_site_key', 'api_secret_key');
+        $this->recaptcha_v3 = new ReCaptchaBuilderV3('api_site_key', 'api_secret_key');
+
+    }
 }
\ No newline at end of file

tests/ReCaptchaV3Test.php

Indentation +97 added lines, -97 removed lines

@@ -20,101 +20,101 @@
  */
 class ReCaptchaV3Test extends TestCase {
 
-	protected $recaptcha_v3 = null;
-
-	/**
-	 * @test
-	 */
-	public function testGetApiVersion() {
-
-		$this->assertEquals($this->recaptcha_v3->getVersion(), 'v3');
-	}
-
-	/**
-	 * @test
-	 */
-	public function testHtmlScriptTagJsApiV3GetHtmlScriptTag() {
-
-		$r = $this->recaptcha_v3->htmlScriptTagJsApiV3();
-		$this->assertRegexp('/csrfToken/', $r);
-	}
-
-	/**
-	 * @test
-	 */
-	public function testAction() {
-
-		$r = $this->recaptcha_v3->htmlScriptTagJsApiV3(['action' => 'someAction']);
-		$this->assertRegexp('/someAction/', $r);
-	}
-
-	/**
-	 * @test
-	 */
-	public function testFetchCallbackFunction() {
-
-		$r = $this->recaptcha_v3->htmlScriptTagJsApiV3(['callback_then' => 'functionCallbackThen']);
-		$this->assertRegexp('/functionCallbackThen\(response\)/', $r);
-	}
-
-	/**
-	 * @test
-	 */
-	public function testcCatchCallbackFunction() {
-
-		$r = $this->recaptcha_v3->htmlScriptTagJsApiV3(['callback_catch' => 'functionCallbackCatch']);
-		$this->assertRegexp('/functionCallbackCatch\(err\)/', $r);
-	}
-
-	/**
-	 * @test
-	 */
-	public function testCustomValidationFunction() {
-
-		$r = $this->recaptcha_v3->htmlScriptTagJsApiV3(['custom_validation' => 'functionCustomValidation']);
-		$this->assertRegexp('/functionCustomValidation\(token\)/', $r);
-	}
-
-	/**
-	 * @test
-	 */
-	public function testValidateController() {
-
-		$controller = App::make(ReCaptchaController::class);
-		$return = $controller->validateV3();
-
-		$this->assertArrayHasKey("success", $return);
-		$this->assertArrayHasKey("error-codes", $return);
-	}
-
-	/**
-	 * @test
-	 */
-	public function testCurlTimeoutIsSet() {
-		$this->assertEquals($this->recaptcha_v3->getCurlTimeout(), 3);
-	}
-
-	/**
-	 * Define environment setup.
-	 *
-	 * @param  \Illuminate\Foundation\Application $app
-	 *
-	 * @return void
-	 */
-	protected function getEnvironmentSetUp($app) {
-
-		$app['config']->set('recaptcha.version', 'v3');
-		$app['config']->set('recaptcha.curl_timeout', 3);
-	}
-
-	/**
-	 * Setup the test environment.
-	 */
-	protected function setUp(): void {
-
-		parent::setUp(); // TODO: Change the autogenerated stub
-
-		$this->recaptcha_v3 = new ReCaptchaBuilderV3('api_site_key', 'api_secret_key');
-
-	}
+    protected $recaptcha_v3 = null;
+
+    /**
+     * @test
+     */
+    public function testGetApiVersion() {
+
+        $this->assertEquals($this->recaptcha_v3->getVersion(), 'v3');
+    }
+
+    /**
+     * @test
+     */
+    public function testHtmlScriptTagJsApiV3GetHtmlScriptTag() {
+
+        $r = $this->recaptcha_v3->htmlScriptTagJsApiV3();
+        $this->assertRegexp('/csrfToken/', $r);
+    }
+
+    /**
+     * @test
+     */
+    public function testAction() {
+
+        $r = $this->recaptcha_v3->htmlScriptTagJsApiV3(['action' => 'someAction']);
+        $this->assertRegexp('/someAction/', $r);
+    }
+
+    /**
+     * @test
+     */
+    public function testFetchCallbackFunction() {
+
+        $r = $this->recaptcha_v3->htmlScriptTagJsApiV3(['callback_then' => 'functionCallbackThen']);
+        $this->assertRegexp('/functionCallbackThen\(response\)/', $r);
+    }
+
+    /**
+     * @test
+     */
+    public function testcCatchCallbackFunction() {
+
+        $r = $this->recaptcha_v3->htmlScriptTagJsApiV3(['callback_catch' => 'functionCallbackCatch']);
+        $this->assertRegexp('/functionCallbackCatch\(err\)/', $r);
+    }
+
+    /**
+     * @test
+     */
+    public function testCustomValidationFunction() {
+
+        $r = $this->recaptcha_v3->htmlScriptTagJsApiV3(['custom_validation' => 'functionCustomValidation']);
+        $this->assertRegexp('/functionCustomValidation\(token\)/', $r);
+    }
+
+    /**
+     * @test
+     */
+    public function testValidateController() {
+
+        $controller = App::make(ReCaptchaController::class);
+        $return = $controller->validateV3();
+
+        $this->assertArrayHasKey("success", $return);
+        $this->assertArrayHasKey("error-codes", $return);
+    }
+
+    /**
+     * @test
+     */
+    public function testCurlTimeoutIsSet() {
+        $this->assertEquals($this->recaptcha_v3->getCurlTimeout(), 3);
+    }
+
+    /**
+     * Define environment setup.
+     *
+     * @param  \Illuminate\Foundation\Application $app
+     *
+     * @return void
+     */
+    protected function getEnvironmentSetUp($app) {
+
+        $app['config']->set('recaptcha.version', 'v3');
+        $app['config']->set('recaptcha.curl_timeout', 3);
+    }
+
+    /**
+     * Setup the test environment.
+     */
+    protected function setUp(): void {
+
+        parent::setUp(); // TODO: Change the autogenerated stub
+
+        $this->recaptcha_v3 = new ReCaptchaBuilderV3('api_site_key', 'api_secret_key');
+
+    }
 }
\ No newline at end of file