biscolab / laravel-recaptcha

tests/TestCase.php

Indentation +22 added lines, -22 removed lines

@@ -20,29 +20,29 @@
  */
 class TestCase extends OrchestraTestCase {
 
-	/**
-	 * Load package alias
-	 *
-	 * @param  \Illuminate\Foundation\Application $app
-	 *
-	 * @return array
-	 */
-	protected function getPackageAliases($app) {
+    /**
+     * Load package alias
+     *
+     * @param  \Illuminate\Foundation\Application $app
+     *
+     * @return array
+     */
+    protected function getPackageAliases($app) {
 
-		return [
-			'ReCaptcha' => ReCaptcha::class,
-		];
-	}
+        return [
+            'ReCaptcha' => ReCaptcha::class,
+        ];
+    }
 
-	/**
-	 * Load package service provider
-	 *
-	 * @param \Illuminate\Foundation\Application $app
-	 *
-	 * @return array
-	 */
-	protected function getPackageProviders($app) {
+    /**
+     * Load package service provider
+     *
+     * @param \Illuminate\Foundation\Application $app
+     *
+     * @return array
+     */
+    protected function getPackageProviders($app) {
 
-		return [ReCaptchaServiceProvider::class];
-	}
+        return [ReCaptchaServiceProvider::class];
+    }
 }

src/Facades/ReCaptcha.php

Indentation +8 added lines, -8 removed lines

@@ -18,13 +18,13 @@
  */
 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/helpers.php

Indentation +36 added lines, -36 removed lines

@@ -11,13 +11,13 @@ 
 use Biscolab\ReCaptcha\Facades\ReCaptcha;
 
 if (!function_exists('recaptcha')) {
-	/**
-	 * @return Biscolab\ReCaptcha\ReCaptchaBuilder
-	 */
-	function recaptcha() {
+    /**
+     * @return Biscolab\ReCaptcha\ReCaptchaBuilder
+     */
+    function recaptcha() {
 
-		return app('recaptcha');
-	}
+        return app('recaptcha');
+    }
 }
 
 /**
@@ -29,15 +29,15 @@ 
  */
 if (!function_exists('htmlScriptTagJsApi')) {
 
-	/**
-	 * @param string $formId
-	 *
-	 * @return string
-	 */
-	function htmlScriptTagJsApi($formId = ''): string {
+    /**
+     * @param string $formId
+     *
+     * @return string
+     */
+    function htmlScriptTagJsApi($formId = ''): string {
 
-		return ReCaptcha::htmlScriptTagJsApi($formId);
-	}
+        return ReCaptcha::htmlScriptTagJsApi($formId);
+    }
 }
 
 /**
@@ -49,15 +49,15 @@ 
  */
 if (!function_exists('htmlScriptTagJsApiV3')) {
 
-	/**
-	 * @param array $config
-	 *
-	 * @return string
-	 */
-	function htmlScriptTagJsApiV3($config = []): string {
+    /**
+     * @param array $config
+     *
+     * @return string
+     */
+    function htmlScriptTagJsApiV3($config = []): string {
 
-		return ReCaptcha::htmlScriptTagJsApiV3($config);
-	}
+        return ReCaptcha::htmlScriptTagJsApiV3($config);
+    }
 }
 
 /**
@@ -71,15 +71,15 @@ 
  */
 if (!function_exists('htmlFormButton')) {
 
-	/**
-	 * @param null|string $buttonInnerHTML
-	 *
-	 * @return string
-	 */
-	function htmlFormButton(?string $buttonInnerHTML = 'Submit'): string {
+    /**
+     * @param null|string $buttonInnerHTML
+     *
+     * @return string
+     */
+    function htmlFormButton(?string $buttonInnerHTML = 'Submit'): string {
 
-		return ReCaptcha::htmlFormButton($buttonInnerHTML);
-	}
+        return ReCaptcha::htmlFormButton($buttonInnerHTML);
+    }
 }
 
 /**
@@ -91,12 +91,12 @@ 
  */
 if (!function_exists('htmlFormSnippet')) {
 
-	/**
-	 * @return string
-	 */
-	function htmlFormSnippet(): string {
+    /**
+     * @return string
+     */
+    function htmlFormSnippet(): string {
 
-		return ReCaptcha::htmlFormSnippet();
-	}
+        return ReCaptcha::htmlFormSnippet();
+    }
 }
 

src/Controllers/ReCaptchaController.php

Indentation +7 added lines, -7 removed lines

@@ -18,12 +18,12 @@
  */
 class ReCaptchaController extends Controller {
 
-	/**
-	 * @return array
-	 */
-	public function validateV3(): array {
+    /**
+     * @return array
+     */
+    public function validateV3(): array {
 
-		$token = request()->input(config('recaptcha.default_token_parameter_name', 'token'), '');
-		return recaptcha()->validate($token);
-	}
+        $token = request()->input(config('recaptcha.default_token_parameter_name', 'token'), '');
+        return recaptcha()->validate($token);
+    }
 }
\ No newline at end of file

tests/ReCaptchaConfigurationTest.php

Indentation +35 added lines, -35 removed lines

@@ -22,47 +22,47 @@
  */
 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($this->recaptcha->getCurlTimeout(), 3);
-	}
+    /**
+     * @test
+     */
+    public function testCurlTimeoutIsSet() {
+        $this->assertEquals($this->recaptcha->getCurlTimeout(), 3);
+    }
 
-	/**
-	 * 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.skip_ip', '10.0.0.1,10.0.0.2');
+    }
 
-	/**
-	 * 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', 3);
-	}
+        $this->recaptcha = new ReCaptchaBuilderV2('api_site_key', 'api_secret_key', 3);
+    }
 }
\ No newline at end of file

tests/ReCaptchaTest.php

Indentation +52 added lines, -52 removed lines

@@ -20,73 +20,73 @@
  */
 class ReCaptchaTest extends TestCase {
 
-	protected $recaptcha_invisible = null;
+    protected $recaptcha_invisible = null;
 
-	protected $recaptcha_v2        = null;
+    protected $recaptcha_v2        = null;
 
-	/**
-	 * @tests
-	 */
-	public function testHtmlScriptTagJsApiGetHtmlScriptTag() {
+    /**
+     * @tests
+     */
+    public function testHtmlScriptTagJsApiGetHtmlScriptTag() {
 
-		$r = ReCaptcha::htmlScriptTagJsApi();
-		$this->assertEquals('<script src="https://www.google.com/recaptcha/api.js" async defer></script>', $r);
-	}
+        $r = ReCaptcha::htmlScriptTagJsApi();
+        $this->assertEquals('<script src="https://www.google.com/recaptcha/api.js" async defer></script>', $r);
+    }
 
-	/**
-	 * @test
-	 */
-	public function testReCaptchaInvisibleHtmlFormButtonDefault() {
+    /**
+     * @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);
-	}
+        $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() {
+    /**
+     * @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);
-	}
+        $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() {
+    /**
+     * @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);
-	}
+        $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() {
+    /**
+     * @test
+     * @expectedException     \Error
+     */
+    public function testReCaptchaInvisibleHtmlFormSnippetShouldThrowError() {
 
-		$this->recaptcha_invisible->htmlFormSnippet();
-	}
+        $this->recaptcha_invisible->htmlFormSnippet();
+    }
 
-	/**
-	 * @test
-	 * @expectedException     \Error
-	 */
-	public function testReCaptchaV2htmlFormButtonShouldThrowError() {
+    /**
+     * @test
+     * @expectedException     \Error
+     */
+    public function testReCaptchaV2htmlFormButtonShouldThrowError() {
 
-		$this->recaptcha_v2->htmlFormButton();
-	}
+        $this->recaptcha_v2->htmlFormButton();
+    }
 
-	protected function setUp(): void {
+    protected function setUp(): void {
 
-		parent::setUp(); // TODO: Change the autogenerated stub
+        parent::setUp(); // TODO: Change the autogenerated stub
 
-		$this->recaptcha_invisible = new ReCaptchaBuilderInvisible('api_site_key', 'api_secret_key', 3);
-		$this->recaptcha_v2 = new ReCaptchaBuilderV2('api_site_key', 'api_secret_key', 3);
+        $this->recaptcha_invisible = new ReCaptchaBuilderInvisible('api_site_key', 'api_secret_key', 3);
+        $this->recaptcha_v2 = new ReCaptchaBuilderV2('api_site_key', 'api_secret_key', 3);
 
-	}
+    }
 }
\ No newline at end of file

tests/ReCaptchaV3Test.php

Indentation +89 added lines, -89 removed lines

@@ -20,93 +20,93 @@
  */
 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);
-	}
-
-	/**
-	 * Define environment setup.
-	 *
-	 * @param  \Illuminate\Foundation\Application $app
-	 *
-	 * @return void
-	 */
-	protected function getEnvironmentSetUp($app) {
-
-		$app['config']->set('recaptcha.version', 'v3');
-	}
-
-	/**
-	 * 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', 3);
-
-	}
+    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);
+    }
+
+    /**
+     * Define environment setup.
+     *
+     * @param  \Illuminate\Foundation\Application $app
+     *
+     * @return void
+     */
+    protected function getEnvironmentSetUp($app) {
+
+        $app['config']->set('recaptcha.version', 'v3');
+    }
+
+    /**
+     * 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', 3);
+
+    }
 }
\ 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 $curl_timeout
-	 */
-	public function __construct(string $api_site_key, string $api_secret_key, int $curl_timeout) {
+    /**
+     * ReCaptchaBuilderV3 constructor.
+     *
+     * @param string $api_site_key
+     * @param string $api_secret_key
+     * @param int $curl_timeout
+     */
+    public function __construct(string $api_site_key, string $api_secret_key, int $curl_timeout) {
 
-		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/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'));
+
+        });
+    }
 
 }