biscolab / laravel-recaptcha

tests/TestCase.php

Indentation +24 added lines, -24 removed lines

@@ -21,31 +21,31 @@
 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/Controllers/ReCaptchaController.php

Indentation +8 added lines, -8 removed lines

@@ -19,14 +19,14 @@
 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'), '');
+        $token = request()->input(config('recaptcha.default_token_parameter_name', 'token'), '');
 
-		return recaptcha()->validate($token);
-	}
+        return recaptcha()->validate($token);
+    }
 }
\ No newline at end of file

tests/ReCaptchaTest.php

Indentation +151 added lines, -151 removed lines

@@ -23,173 +23,173 @@
 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-callback="biscolabLaravelReCaptcha" data-sitekey="api_site_key">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-callback="biscolabLaravelReCaptcha" data-sitekey="api_site_key">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" data-theme="light" data-size="normal" id="recaptcha-element"></div>', $html_snippet);
-	}
-
-	/**
-	 * @test
-	 * @expectedException     \Error
-	 */
-	public function testReCaptchaInvisibleHtmlFormSnippetShouldThrowError()
-	{
-
-		$this->recaptcha_invisible->htmlFormSnippet();
-	}
-
-	/**
-	 * @test
-	 */
-	public function testSkipByIpAndReturnArrayReturnsDefaultArray()
-	{
-
-		$mock = $this->getMockBuilder(ReCaptchaBuilder::class)
-			->setConstructorArgs([
-				"api_site_key",
-				"api_secret_key"
-			])
-			->setMethods([
-				'returnArray'
-			])
-			->getMock();
-
-		$mock->method('returnArray')
-			->willReturn(true);
-
-		$this->setSkipByIp($this->recaptcha_v3, true);
-
-		$validate = $this->recaptcha_v3->validate("");
-
-		$this->assertEquals([
-			"skip_by_ip" => true,
-			"score"      => 0.9,
-			"success"    => true
-		], $validate);
-	}
-
-	/**
-	 * @test
-	 */
-	public function testSlipByIpReturnsValidResponse()
-	{
-
-		$this->setSkipByIp($this->recaptcha_invisible, true);
-		$validate = $this->recaptcha_invisible->validate("");
-
-		$this->assertTrue($validate);
-	}
-
-	/**
-	 * @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();
-	}
+    /**
+     * @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 testRecaptchaFieldNameHelperReturnsReCaptchaBuilderDefaultFieldName() {
+    public function testReCaptchaInvisibleHtmlFormButtonDefault()
+    {
+
+        $recaptcha = $this->recaptcha_invisible;
+        $html_button = $recaptcha->htmlFormButton();
+        $this->assertEquals('<button class="g-recaptcha" data-callback="biscolabLaravelReCaptcha" data-sitekey="api_site_key">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-callback="biscolabLaravelReCaptcha" data-sitekey="api_site_key">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" data-theme="light" data-size="normal" id="recaptcha-element"></div>', $html_snippet);
+    }
+
+    /**
+     * @test
+     * @expectedException     \Error
+     */
+    public function testReCaptchaInvisibleHtmlFormSnippetShouldThrowError()
+    {
+
+        $this->recaptcha_invisible->htmlFormSnippet();
+    }
+
+    /**
+     * @test
+     */
+    public function testSkipByIpAndReturnArrayReturnsDefaultArray()
+    {
+
+        $mock = $this->getMockBuilder(ReCaptchaBuilder::class)
+            ->setConstructorArgs([
+                "api_site_key",
+                "api_secret_key"
+            ])
+            ->setMethods([
+                'returnArray'
+            ])
+            ->getMock();
+
+        $mock->method('returnArray')
+            ->willReturn(true);
+
+        $this->setSkipByIp($this->recaptcha_v3, true);
+
+        $validate = $this->recaptcha_v3->validate("");
+
+        $this->assertEquals([
+            "skip_by_ip" => true,
+            "score"      => 0.9,
+            "success"    => true
+        ], $validate);
+    }
+
+    /**
+     * @test
+     */
+    public function testSlipByIpReturnsValidResponse()
+    {
+
+        $this->setSkipByIp($this->recaptcha_invisible, true);
+        $validate = $this->recaptcha_invisible->validate("");
+
+        $this->assertTrue($validate);
+    }
+
+    /**
+     * @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();
+    }
+
+    /**
+     * @test
+     */
+    public function testRecaptchaFieldNameHelperReturnsReCaptchaBuilderDefaultFieldName() {
         $this->assertEquals(ReCaptchaBuilder::DEFAULT_RECAPTCHA_FIELD_NAME, recaptchaFieldName());
     }
 
     /**
      * @test
      */
-	public function testRecaptchaRuleNameHelperReturnsReCaptchaBuilderDefaultRuleName() {
+    public function testRecaptchaRuleNameHelperReturnsReCaptchaBuilderDefaultRuleName() {
         $this->assertEquals(ReCaptchaBuilder::DEFAULT_RECAPTCHA_RULE_NAME, recaptchaRuleName());
     }
 
-	protected function setSkipByIp(ReCaptchaBuilder $builder, bool $value)
-	{
+    protected function setSkipByIp(ReCaptchaBuilder $builder, bool $value)
+    {
 
-		$reflection = new \ReflectionClass($builder);
-		$reflection_property = $reflection->getProperty('skip_by_ip');
-		$reflection_property->setAccessible(true);
-		$reflection_property->setValue($builder, $value);
-	}
+        $reflection = new \ReflectionClass($builder);
+        $reflection_property = $reflection->getProperty('skip_by_ip');
+        $reflection_property->setAccessible(true);
+        $reflection_property->setValue($builder, $value);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	protected function setUp(): void
-	{
+    /**
+     * @inheritdoc
+     */
+    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');
-		$this->recaptcha_v2 = new ReCaptchaBuilderV2('api_site_key', 'api_secret_key');
-		$this->recaptcha_v3 = new ReCaptchaBuilderV3('api_site_key', 'api_secret_key');
+        $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/ReCaptchaConfigurationTest.php

Indentation +68 added lines, -68 removed lines

@@ -20,72 +20,72 @@
 class ReCaptchaConfigurationTest extends TestCase
 {
 
-	/**
-	 * @var ReCaptchaBuilder
-	 */
-	protected $recaptcha;
-
-	/**
-	 * @test
-	 */
-	public function testGetApiSiteKey() {
-		$this->assertEquals("api_site_key", $this->recaptcha->getApiSiteKey());
-	}
-
-	/**
-	 * @test
-	 */
-	public function testGetApiSecretKey() {
-		$this->assertEquals("api_secret_key", $this->recaptcha->getApiSecretKey());
-	}
-
-	/**
-	 * @test
-	 */
-	public function testSkipIpWhiteListIsArray()
-	{
-
-		$ip_whitelist = $this->recaptcha->getIpWhitelist();
-		$this->assertTrue(is_array($ip_whitelist));
-		$this->assertCount(2, $ip_whitelist);
-
-		$this->assertEquals('10.0.0.1', $ip_whitelist[0]);
-		$this->assertEquals('10.0.0.2', $ip_whitelist[1]);
-	}
-
-	/**
-	 * @test
-	 */
-	public function testCurlTimeoutIsSet()
-	{
-
-		$this->assertEquals(3, $this->recaptcha->getCurlTimeout());
-	}
-
-	/**
-	 * Define environment setup.
-	 *
-	 * @param  \Illuminate\Foundation\Application $app
-	 *
-	 * @return void
-	 */
-	protected function getEnvironmentSetUp($app)
-	{
-
-		$app['config']->set('recaptcha.api_site_key', 'api_site_key');
-		$app['config']->set('recaptcha.api_secret_key', 'api_secret_key');
-		$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
-	{
-
-		parent::setUp(); // TODO: Change the autogenerated stub
-
-		$this->recaptcha = recaptcha();
-	}
+    /**
+     * @var ReCaptchaBuilder
+     */
+    protected $recaptcha;
+
+    /**
+     * @test
+     */
+    public function testGetApiSiteKey() {
+        $this->assertEquals("api_site_key", $this->recaptcha->getApiSiteKey());
+    }
+
+    /**
+     * @test
+     */
+    public function testGetApiSecretKey() {
+        $this->assertEquals("api_secret_key", $this->recaptcha->getApiSecretKey());
+    }
+
+    /**
+     * @test
+     */
+    public function testSkipIpWhiteListIsArray()
+    {
+
+        $ip_whitelist = $this->recaptcha->getIpWhitelist();
+        $this->assertTrue(is_array($ip_whitelist));
+        $this->assertCount(2, $ip_whitelist);
+
+        $this->assertEquals('10.0.0.1', $ip_whitelist[0]);
+        $this->assertEquals('10.0.0.2', $ip_whitelist[1]);
+    }
+
+    /**
+     * @test
+     */
+    public function testCurlTimeoutIsSet()
+    {
+
+        $this->assertEquals(3, $this->recaptcha->getCurlTimeout());
+    }
+
+    /**
+     * Define environment setup.
+     *
+     * @param  \Illuminate\Foundation\Application $app
+     *
+     * @return void
+     */
+    protected function getEnvironmentSetUp($app)
+    {
+
+        $app['config']->set('recaptcha.api_site_key', 'api_site_key');
+        $app['config']->set('recaptcha.api_secret_key', 'api_secret_key');
+        $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
+    {
+
+        parent::setUp(); // TODO: Change the autogenerated stub
+
+        $this->recaptcha = recaptcha();
+    }
 }
\ No newline at end of file

src/ReCaptchaBuilder.php

Spacing +4 added lines, -4 removed lines

@@ -177,7 +177,7 @@ 
             $whitelist = explode(',', $whitelist);
         }
 
-        $whitelist = array_map(function ($item) {
+        $whitelist = array_map(function($item) {
 
             return trim($item);
         }, $whitelist);
@@ -231,8 +231,8 @@ 
         }
 
         // Create query string
-        $query = ($query) ? '?' . http_build_query($query) : "";
-        $html .= "<script src=\"https://www.google.com/recaptcha/api.js" . $query . "\" async defer></script>";
+        $query = ($query) ? '?'.http_build_query($query) : "";
+        $html .= "<script src=\"https://www.google.com/recaptcha/api.js".$query."\" async defer></script>";
 
         return $html;
     }
@@ -266,7 +266,7 @@ 
             'response' => $response,
         ]);
 
-        $url = $this->api_url . '?' . $params;
+        $url = $this->api_url.'?'.$params;
 
         if (function_exists('curl_version')) {
 

src/ReCaptchaBuilderV2.php

Spacing +6 added lines, -6 removed lines

@@ -45,11 +45,11 @@ 
 
         foreach ($config_data_attributes as $k => $v) {
             if ($v) {
-                $data_attributes[] = 'data-' . $k . '="' . $v . '"';
+                $data_attributes[] = 'data-'.$k.'="'.$v.'"';
             }
         }
 
-        $html = '<div class="g-recaptcha" ' . implode(" ", $data_attributes) . ' id="recaptcha-element"></div>';
+        $html = '<div class="g-recaptcha" '.implode(" ", $data_attributes).' id="recaptcha-element"></div>';
 
         return $html;
     }
@@ -68,15 +68,15 @@ 
         $tag_attributes = array_merge($tag_attributes, config('recaptcha.tag_attributes', []));
 
         if (Arr::get($tag_attributes, 'callback') === ReCaptchaBuilder::DEFAULT_ONLOAD_JS_FUNCTION) {
-            throw new InvalidConfigurationException('Property "callback" ("data-callback") must be different from "' . ReCaptchaBuilder::DEFAULT_ONLOAD_JS_FUNCTION . '"');
+            throw new InvalidConfigurationException('Property "callback" ("data-callback") must be different from "'.ReCaptchaBuilder::DEFAULT_ONLOAD_JS_FUNCTION.'"');
         }
 
         if (Arr::get($tag_attributes, 'expired-callback') === ReCaptchaBuilder::DEFAULT_ONLOAD_JS_FUNCTION) {
-            throw new InvalidConfigurationException('Property "expired-callback" ("data-expired-callback") must be different from "' . ReCaptchaBuilder::DEFAULT_ONLOAD_JS_FUNCTION . '"');
+            throw new InvalidConfigurationException('Property "expired-callback" ("data-expired-callback") must be different from "'.ReCaptchaBuilder::DEFAULT_ONLOAD_JS_FUNCTION.'"');
         }
 
         if (Arr::get($tag_attributes, 'error-callback') === ReCaptchaBuilder::DEFAULT_ONLOAD_JS_FUNCTION) {
-            throw new InvalidConfigurationException('Property "error-callback" ("data-error-callback") must be different from "' . ReCaptchaBuilder::DEFAULT_ONLOAD_JS_FUNCTION . '"');
+            throw new InvalidConfigurationException('Property "error-callback" ("data-error-callback") must be different from "'.ReCaptchaBuilder::DEFAULT_ONLOAD_JS_FUNCTION.'"');
         }
 
         return $tag_attributes;
@@ -90,7 +90,7 @@ 
 
         $attributes = $this->getTagAttributes();
 
-        return "<script>var biscolabOnloadCallback = function() {grecaptcha.render('recaptcha-element', " . json_encode($attributes) . ");};</script>";
+        return "<script>var biscolabOnloadCallback = function() {grecaptcha.render('recaptcha-element', ".json_encode($attributes).");};</script>";
     }
 
 }
\ No newline at end of file

src/ReCaptchaServiceProvider.php

Indentation +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
         Validator::extendImplicit(recaptchaRuleName(), function ($attribute, $value) {
 
             return app('recaptcha')->validate($value);
-		}, trans('validation.recaptcha'));
+        }, trans('validation.recaptcha'));
     }
 
     /**

Spacing +4 added lines, -4 removed lines

@@ -37,7 +37,7 @@ 
         $this->addValidationRule();
         $this->registerRoutes();
         $this->publishes([
-            __DIR__ . '/../config/recaptcha.php' => config_path('recaptcha.php'),
+            __DIR__.'/../config/recaptcha.php' => config_path('recaptcha.php'),
         ], 'config');
 
     }
@@ -48,7 +48,7 @@ 
     public function addValidationRule()
     {
 
-        Validator::extendImplicit(recaptchaRuleName(), function ($attribute, $value) {
+        Validator::extendImplicit(recaptchaRuleName(), function($attribute, $value) {
 
             return app('recaptcha')->validate($value);
 		}, trans('validation.recaptcha'));
@@ -63,7 +63,7 @@ 
     {
 
         $this->mergeConfigFrom(
-            __DIR__ . '/../config/recaptcha.php', 'recaptcha'
+            __DIR__.'/../config/recaptcha.php', 'recaptcha'
         );
 
         $this->registerReCaptchaBuilder();
@@ -104,7 +104,7 @@ 
     protected function registerReCaptchaBuilder()
     {
 
-        $this->app->singleton('recaptcha', function ($app) {
+        $this->app->singleton('recaptcha', function($app) {
 
             $recaptcha_class = '';
 

src/ReCaptchaBuilderInvisible.php

Spacing +3 added lines, -3 removed lines

@@ -69,13 +69,13 @@ 
 //                    http_build_query($properties, null, '" ', PHP_QUERY_RFC3986)) . '"';
             $temp_properties = [];
             foreach ($properties as $k => $v) {
-                $temp_properties[] = $k . '="' . $v . '"';
+                $temp_properties[] = $k.'="'.$v.'"';
             }
 
             $tag_properties = implode(" ", $temp_properties);
         }
 
-        return ($this->version == 'invisible') ? '<button ' . $tag_properties . '>' . $button_label . '</button>' : '';
+        return ($this->version == 'invisible') ? '<button '.$tag_properties.'>'.$button_label.'</button>' : '';
     }
 
     /**
@@ -100,7 +100,7 @@ 
         }
         $html .= '<script>
 		       function biscolabLaravelReCaptcha(token) {
-		         document.getElementById("' . $form_id . '").submit();
+		         document.getElementById("' . $form_id.'").submit();
 		       }
 		     </script>';
 

src/ReCaptchaBuilderV3.php

Spacing +2 added lines, -2 removed lines

@@ -66,8 +66,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