fixes

Author: pulkitjalan

src/Client.php

@@ -3,6 +3,7 @@
 namespace PulkitJalan\Google;
 
 use Google_Client;
+use Illuminate\Support\Arr;
 use PulkitJalan\Google\Exceptions\UnknownServiceException;
 
 class Client
@@ -26,24 +27,24 @@ public function __construct(array $config, $userEmail = '')
         $this->config = $config;
 
         // create an instance of the google client for OAuth2
-        $this->client = new Google_Client(array_get($config, 'config', []));
+        $this->client = new Google_Client(Arr::get($config, 'config', []));
 
         // set application name
-        $this->client->setApplicationName(array_get($config, 'application_name', ''));
+        $this->client->setApplicationName(Arr::get($config, 'application_name', ''));
 
         // set oauth2 configs
-        $this->client->setClientId(array_get($config, 'client_id', ''));
-        $this->client->setClientSecret(array_get($config, 'client_secret', ''));
-        $this->client->setRedirectUri(array_get($config, 'redirect_uri', ''));
-        $this->client->setScopes(array_get($config, 'scopes', []));
-        $this->client->setAccessType(array_get($config, 'access_type', 'online'));
-        $this->client->setApprovalPrompt(array_get($config, 'approval_prompt', 'auto'));
+        $this->client->setClientId(Arr::get($config, 'client_id', ''));
+        $this->client->setClientSecret(Arr::get($config, 'client_secret', ''));
+        $this->client->setRedirectUri(Arr::get($config, 'redirect_uri', ''));
+        $this->client->setScopes(Arr::get($config, 'scopes', []));
+        $this->client->setAccessType(Arr::get($config, 'access_type', 'online'));
+        $this->client->setApprovalPrompt(Arr::get($config, 'approval_prompt', 'auto'));
 
         // set developer key
-        $this->client->setDeveloperKey(array_get($config, 'developer_key', ''));
+        $this->client->setDeveloperKey(Arr::get($config, 'developer_key', ''));
 
         // auth for service account
-        if (array_get($config, 'service.enable', false)) {
+        if (Arr::get($config, 'service.enable', false)) {
             $this->auth($userEmail);
         }
     }
@@ -57,7 +58,7 @@ public function getClient()
     {
         return $this->client;
     }
-    
+
     /**
      * Setter for the google client.
      *
@@ -68,7 +69,7 @@ public function getClient()
     public function setClient(Google_Client $client)
     {
         $this->client = $client;
-        
+
         return $this;
     }
 
@@ -118,14 +119,14 @@ protected function auth($userEmail = '')
      */
     protected function useAssertCredentials($userEmail = '')
     {
-        $serviceJsonUrl = array_get($this->config, 'service.file', '');
+        $serviceJsonUrl = Arr::get($this->config, 'service.file', '');
 
         if (empty($serviceJsonUrl)) {
             return false;
         }
 
         $this->client->setAuthConfig($serviceJsonUrl);
-        
+
         if (! empty($userEmail)) {
             $this->client->setSubject($userEmail);
         }

src/config/config.php

@@ -17,11 +17,11 @@
     | https://developers.google.com/console
     |
     */
-    'client_id'       => env('GOOGLE_CLIENT_ID', ''),
-    'client_secret'   => env('GOOGLE_CLIENT_SECRET', ''),
-    'redirect_uri'    => env('GOOGLE_REDIRECT', ''),
-    'scopes'          => [],
-    'access_type'     => 'online',
+    'client_id' => env('GOOGLE_CLIENT_ID', ''),
+    'client_secret' => env('GOOGLE_CLIENT_SECRET', ''),
+    'redirect_uri' => env('GOOGLE_REDIRECT', ''),
+    'scopes' => [],
+    'access_type' => 'online',
     'approval_prompt' => 'auto',
 
     /*
@@ -53,7 +53,7 @@
         /*
         | Path to service account json file
         */
-        'file' => env('GOOGLE_SERVICE_ACCOUNT_JSON_LOCATION', '')
+        'file' => env('GOOGLE_SERVICE_ACCOUNT_JSON_LOCATION', ''),
     ],
 
     /*
@@ -62,9 +62,9 @@
     |----------------------------------------------------------------------------
     |
     | Set any additional config variables supported by the Google Client
-    | Details can be found here: 
+    | Details can be found here:
     | https://github.com/google/google-api-php-client/blob/master/src/Google/Client.php
-    | 
+    |
     | NOTE: If client id is specified here, it will get over written by the one above.
     |
     */

tests/ClientTest.php

@@ -3,11 +3,11 @@
 namespace PulkitJalan\Google\tests;
 
 use Mockery;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class ClientTest extends PHPUnit_Framework_TestCase
+class ClientTest extends TestCase
 {
-    public function tearDown()
+    public function tearDown(): void
     {
         Mockery::close();
     }
@@ -41,7 +41,7 @@ public function testServiceMakeException()
     {
         $client = Mockery::mock('PulkitJalan\Google\Client', [[]])->makePartial();
 
-        $this->setExpectedException('PulkitJalan\Google\Exceptions\UnknownServiceException');
+        $this->expectException('PulkitJalan\Google\Exceptions\UnknownServiceException');
 
         $client->make('storag');
     }
@@ -50,7 +50,7 @@ public function testMagicMethodException()
     {
         $client = new \PulkitJalan\Google\Client([]);
 
-        $this->setExpectedException('BadMethodCallException');
+        $this->expectException('BadMethodCallException');
 
         $client->getAuthTest();
     }
@@ -67,7 +67,7 @@ public function testDefaultCredentials()
         $client = new \PulkitJalan\Google\Client([
             'service' => [
                 'enable' => true,
-                'file'   => __DIR__.'/data/test.json',
+                'file' => __DIR__.'/data/test.json',
             ],
         ]);