Merge remote-tracking branch 'origin/master'

Author: RyanDaDeng

src/Configurations/ReCaptchaConfigV2.php

@@ -2,7 +2,6 @@
 
 namespace TimeHunter\LaravelGoogleReCaptchaV2\Configurations;
 
-
 use TimeHunter\LaravelGoogleReCaptchaV2\Interfaces\ReCaptchaConfigV2Interface;
 
 class ReCaptchaConfigV2 implements ReCaptchaConfigV2Interface

src/GoogleReCaptchaV2.php

@@ -8,10 +8,9 @@
 
 namespace TimeHunter\LaravelGoogleReCaptchaV2;
 
-
 use TimeHunter\LaravelGoogleReCaptchaV2\Core\GoogleReCaptchaV2Response;
-use TimeHunter\LaravelGoogleReCaptchaV2\Interfaces\ReCaptchaConfigV2Interface;
 use TimeHunter\LaravelGoogleReCaptchaV2\Services\GoogleReCaptchaV2Service;
+use TimeHunter\LaravelGoogleReCaptchaV2\Interfaces\ReCaptchaConfigV2Interface;
 
 class GoogleReCaptchaV2
 {
@@ -35,15 +34,14 @@ public function __construct(GoogleReCaptchaV2Service $service)
      */
     public function prepareViewData(...$ids)
     {
-
         $data = [
             'publicKey' => $this->getConfig()->getSiteKey(),
             'ids' => $ids,
             'inline' => $this->getConfig()->isInline(),
             'language' => $this->getConfig()->getLanguage(),
             'theme' => $this->getConfig()->getTheme(),
             'badge' => $this->getConfig()->getBadge(),
-            'size' => $this->getConfig()->getSize()
+            'size' => $this->getConfig()->getSize(),
         ];
 
         return $data;
@@ -55,15 +53,14 @@ public function prepareViewData(...$ids)
      */
     public function render(...$ids)
     {
-        if (!$this->getConfig()->isServiceEnabled()) {
-            return null;
+        if (! $this->getConfig()->isServiceEnabled()) {
+            return;
         }
         $data = $this->prepareViewData($ids);
 
         return app('view')->make($this->getConfig()->getTemplate(), $data);
     }
 
-
     /**
      * @param $response
      * @param null $ip

src/Interfaces/ReCaptchaConfigV2Interface.php

@@ -35,7 +35,6 @@ public function getSiteKey();
      */
     public function getOptions();
 
-
     /**
      * @return string
      */

src/Providers/GoogleReCaptchaV2ServiceProvider.php

@@ -8,8 +8,8 @@
 use TimeHunter\LaravelGoogleReCaptchaV2\Core\GuzzleRequestClient;
 use TimeHunter\LaravelGoogleReCaptchaV2\Configurations\ReCaptchaConfigV2;
 use TimeHunter\LaravelGoogleReCaptchaV2\Interfaces\RequestClientInterface;
-use TimeHunter\LaravelGoogleReCaptchaV2\Interfaces\ReCaptchaConfigV2Interface;
 use TimeHunter\LaravelGoogleReCaptchaV2\Services\GoogleReCaptchaV2Service;
+use TimeHunter\LaravelGoogleReCaptchaV2\Interfaces\ReCaptchaConfigV2Interface;
 
 class GoogleReCaptchaV2ServiceProvider extends ServiceProvider
 {
@@ -73,6 +73,7 @@ public function register()
         }
         $this->app->bind('GoogleReCaptchaV2', function () {
             $service = new GoogleReCaptchaV2Service(app(ReCaptchaConfigV2Interface::class), app(RequestClientInterface::class));
+
             return new GoogleReCaptchaV2($service);
         });
     }
@@ -89,10 +90,9 @@ protected function bootForConsole()
             __DIR__.'/../../config/googlerecaptchav2.php' => config_path('googlerecaptchav2.php'),
         ], 'googlerecaptchav2.config');
 
-
         // Publishing the views.
         $this->publishes([
-            __DIR__ . '/../../resources/views' => base_path('resources/views'),
+            __DIR__.'/../../resources/views' => base_path('resources/views'),
         ], 'googlerecaptchav2.views');
     }
 

src/Services/GoogleReCaptchaV2Service.php

@@ -3,7 +3,7 @@
  * Created by PhpStorm.
  * User: dadeng
  * Date: 2018/12/28
- * Time: 5:37 PM
+ * Time: 5:37 PM.
  */
 
 namespace TimeHunter\LaravelGoogleReCaptchaV2\Services;
@@ -14,7 +14,6 @@
 
 class GoogleReCaptchaV2Service
 {
-
     public $config;
     public $requestClient;
 
@@ -36,7 +35,7 @@ public function __construct(ReCaptchaConfigV2Interface $config, RequestClientInt
      */
     public function verifyResponse($response, $ip = null)
     {
-        if (!$this->config->isServiceEnabled()) {
+        if (! $this->config->isServiceEnabled()) {
             $res = new GoogleReCaptchaV2Response([], $ip);
             $res->setSuccess(true);
 
@@ -71,14 +70,13 @@ public function verifyResponse($response, $ip = null)
             return $rawResponse;
         }
 
-        if (!empty($this->config->getHostName()) && strcasecmp($this->config->getHostName(), $rawResponse->getHostname()) !== 0) {
+        if (! empty($this->config->getHostName()) && strcasecmp($this->config->getHostName(), $rawResponse->getHostname()) !== 0) {
             $rawResponse->setMessage(GoogleReCaptchaV2Response::ERROR_HOSTNAME);
             $rawResponse->setSuccess(false);
 
             return $rawResponse;
         }
 
-
         $rawResponse->setSuccess(true);
         $rawResponse->setMessage('Successfully passed.');
 
@@ -100,4 +98,4 @@ public function getRequestClient(): RequestClientInterface
     {
         return $this->requestClient;
     }
-}
+}

tests/ConfigTest.php

@@ -3,9 +3,9 @@
 namespace TimeHunter\Tests\GoogleReCaptchaV2;
 
 use PHPUnit\Framework\TestCase;
-use TimeHunter\LaravelGoogleReCaptchaV2\Core\GoogleReCaptchaV2Response;
 use TimeHunter\LaravelGoogleReCaptchaV2\GoogleReCaptchaV2;
 use TimeHunter\LaravelGoogleReCaptchaV2\Core\GuzzleRequestClient;
+use TimeHunter\LaravelGoogleReCaptchaV2\Core\GoogleReCaptchaV2Response;
 use TimeHunter\LaravelGoogleReCaptchaV2\Configurations\ReCaptchaConfigV2;
 use TimeHunter\LaravelGoogleReCaptchaV2\Services\GoogleReCaptchaV2Service;
 
@@ -43,7 +43,6 @@ public function testMissingInput()
         $clientStub->method('post')
             ->willReturn(false);
 
-
         $_service = new GoogleReCaptchaV2Service($configStub, $clientStub);
         $service = new GoogleReCaptchaV2($_service);
 
@@ -70,7 +69,6 @@ public function testEmptyResponse()
         $clientStub->method('post')
             ->willReturn($testJson);
 
-
         $_service = new GoogleReCaptchaV2Service($configStub, $clientStub);
         $service = new GoogleReCaptchaV2($_service);
 
@@ -93,7 +91,6 @@ public function testFalseResponse()
         $clientStub->method('post')
             ->willReturn($testJson);
 
-
         $_service = new GoogleReCaptchaV2Service($configStub, $clientStub);
         $service = new GoogleReCaptchaV2($_service);
 
@@ -119,7 +116,6 @@ public function testHostName1()
         $clientStub->method('post')
             ->willReturn($testJson);
 
-
         $_service = new GoogleReCaptchaV2Service($configStub, $clientStub);
         $service = new GoogleReCaptchaV2($_service);
 
@@ -147,13 +143,11 @@ public function testHostName2()
         $clientStub->method('post')
             ->willReturn($testJson);
 
-
         $_service = new GoogleReCaptchaV2Service($configStub, $clientStub);
         $service = new GoogleReCaptchaV2($_service);
 
         $response = $service->verifyResponse('test response');
 
         $this->assertEquals(true, $response->isSuccess());
     }
-
 }

tests/ViewTest.php

@@ -21,7 +21,6 @@ public function testView()
 
         $clientStub = $this->createMock(GuzzleRequestClient::class);
 
-
         $_service = new GoogleReCaptchaV2Service($configStub, $clientStub);
         $service = new GoogleReCaptchaV2($_service);
 
@@ -49,7 +48,6 @@ public function testView2()
 
         $clientStub = $this->createMock(GuzzleRequestClient::class);
 
-
         $_service = new GoogleReCaptchaV2Service($configStub, $clientStub);
         $service = new GoogleReCaptchaV2($_service);
 
@@ -61,8 +59,6 @@ public function testView2()
         $this->assertEquals('en', $data['language']);
     }
 
-
-
     public function testView3()
     {
         // Create a stub for the SomeClass class.
@@ -83,11 +79,10 @@ public function testView3()
 
         $clientStub = $this->createMock(GuzzleRequestClient::class);
 
-
         $_service = new GoogleReCaptchaV2Service($configStub, $clientStub);
         $service = new GoogleReCaptchaV2($_service);
 
-        $data = $service->prepareViewData('contact_us_id','contact_us_id2');
+        $data = $service->prepareViewData('contact_us_id', 'contact_us_id2');
 
         $this->assertEquals('test1', $data['publicKey']);
         $this->assertEquals('contact_us_id', $data['ids'][0]);