biscolab / laravel-recaptcha

src/ReCaptchaBuilderV2.php

Spacing +7 added lines, -7 removed lines

@@ -57,11 +57,11 @@ 
         ksort($config_data_attributes);
         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;
     }
@@ -80,15 +80,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;
@@ -102,7 +102,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>";
     }
 
     /**
@@ -113,7 +113,7 @@ 
      */
     public static function cleanAttributes(?array $attributes = []): array
     {
-        return array_filter($attributes, function ($k) {
+        return array_filter($attributes, function($k) {
             return in_array($k, self::$allowed_data_attribute);
         }, ARRAY_FILTER_USE_KEY);
     }

tests/ReCaptchaTest.php

Indentation +184 added lines, -184 removed lines

@@ -24,188 +24,188 @@
 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-size="normal" data-theme="light" 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()
-	{
-		$this->assertEquals(ReCaptchaBuilder::DEFAULT_RECAPTCHA_RULE_NAME, recaptchaRuleName());
-	}
-
-	/**
-	 * @test
-	 */
-	public function testDefaultRecaptchaApiDomainIsGoogleDotCom()
-	{
-		$this->assertEquals("www.google.com", $this->recaptcha_v2->getApiDomain());
-		$this->assertEquals("www.google.com", $this->recaptcha_invisible->getApiDomain());
-		$this->assertEquals("www.google.com", $this->recaptcha_v3->getApiDomain());
-	}
-
-	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);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	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-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-size="normal" data-theme="light" 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()
+    {
+        $this->assertEquals(ReCaptchaBuilder::DEFAULT_RECAPTCHA_RULE_NAME, recaptchaRuleName());
+    }
+
+    /**
+     * @test
+     */
+    public function testDefaultRecaptchaApiDomainIsGoogleDotCom()
+    {
+        $this->assertEquals("www.google.com", $this->recaptcha_v2->getApiDomain());
+        $this->assertEquals("www.google.com", $this->recaptcha_invisible->getApiDomain());
+        $this->assertEquals("www.google.com", $this->recaptcha_v3->getApiDomain());
+    }
+
+    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);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    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');
+    }
 }