francis94c / ci-gmail

phpunit/GMailAPITest.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
    * @covers JWT::__construct
    */
   public static function setUpBeforeClass(): void {
-    self::$ci =& get_instance();
+    self::$ci = & get_instance();
   }
   /**
    * [testLoadPackage description]

helpers/base64_helper.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
    *
    * @return string|bool          Decoded String.
    */
-  function base64url_decode(string $data, bool $strict=false) {
+  function base64url_decode(string $data, bool $strict = false) {
     $b64 = strtr($data, '-_', '+/');
     return base64_decode($b64, $strict);
   }

libraries/GMailCURL.php

Spacing +3 added lines, -3 removed lines

@@ -10,12 +10,12 @@ 
   private $method;
   private $userAgent;
 
-  function __construct(string $method, string $userAgent='CodeIgniter GMail API') {
+  function __construct(string $method, string $userAgent = 'CodeIgniter GMail API') {
     $this->method = $method;
     $this->userAgent = $userAgent;
   }
 
-  function __invoke(string $url, array $header=[], array $body=null):array {
+  function __invoke(string $url, array $header = [], array $body = null):array {
     if ($body != null) $body = json_encode($body);
 
     $ch = curl_init($url);
@@ -28,7 +28,7 @@ 
     }
     // Header.
     $header[] = 'Content-Type: application/json';
-    if ($body != null)  {
+    if ($body != null) {
       $header[] = 'Content-Length: '.strlen($body);
     } else {
       $header[] = 'Content-Length: 0';

Braces +3 added lines, -1 removed lines

@@ -16,7 +16,9 @@
   }
 
   function __invoke(string $url, array $header=[], array $body=null):array {
-    if ($body != null) $body = json_encode($body);
+    if ($body != null) {
+      $body = json_encode($body);
+    }
 
     $ch = curl_init($url);
 

libraries/MessagePart.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
    * @param  string      $key [description]
    * @return string|null      [description]
    */
-  public function header(string $key):?string
+  public function header(string $key): ?string
   {
     foreach ($this->part->headers as $header) {
       if ($header->name == $key) {
@@ -59,7 +59,7 @@ 
    * @param  integer    $partId [description]
    * @return [type]             [description]
    */
-  public function body(int $partId=0)
+  public function body(int $partId = 0)
   {
     return base64url_decode($this->part->body->data);
   }

libraries/Message.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
    * @param  string      $key [description]
    * @return string|null      [description]
    */
-  public function header(string $key):?string
+  public function header(string $key): ?string
   {
     foreach ($this->message->payload->headers as $header) {
       if ($header->name == $key) {
@@ -62,7 +62,7 @@ 
    * @param  integer    $partId [description]
    * @return [type]             [description]
    */
-  public function body(int $partId=0)
+  public function body(int $partId = 0)
   {
     if ($this->isMultiPart()) {
       // Set Parent ID.

helpers/curl_helper.php

Spacing +2 added lines, -2 removed lines

@@ -9,10 +9,10 @@
    * @param  boolean $urlEncode [description]
    * @return string             [description]
    */
-  function build_url_query(array $params, bool $urlEncode=true):?string {
+  function build_url_query(array $params, bool $urlEncode = true): ?string {
     if ($params == null) return null;
     $queryString = '?';
-    foreach($params as $key => $val) {
+    foreach ($params as $key => $val) {
       if (is_array($val)) {
         foreach ($val as $value) {
           $queryString .= $key."=".($urlEncode ? rawurlencode($value) : $value)."&";

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
    * @return string             [description]
    */
   function build_url_query(array $params, bool $urlEncode=true):?string {
-    if ($params == null) return null;
+    if ($params == null) {
+      return null;
+    }
     $queryString = '?';
     foreach($params as $key => $val) {
       if (is_array($val)) {

libraries/GMail.php

Spacing +24 added lines, -24 removed lines

@@ -15,7 +15,7 @@ 
   private $token;
   private $userAgent = 'CodeIgniter GMail API';
 
-  function __construct($params=null)
+  function __construct($params = null)
   {
     get_instance()->load->splint('francis94c/ci-gmail', '%curl');
     get_instance()->load->splint('francis94c/ci-gmail', '%base64');
@@ -50,7 +50,7 @@ 
    * [getClientId Get Client ID.]
    * @return null|string Client ID.
    */
-  public function getClientId():?string {
+  public function getClientId(): ?string {
     return $this->clientId;
   }
   /**
@@ -63,7 +63,7 @@ 
    * @param  bool   $prompt       Add the prompt=consent query to the URL.
    * @return string               Authorize URL
    */
-  public function getAuthorizeUrl(string $scope, string $redirectUri=null, string $responseType='code', string $accessType='offline', bool $prompt=false):string
+  public function getAuthorizeUrl(string $scope, string $redirectUri = null, string $responseType = 'code', string $accessType = 'offline', bool $prompt = false):string
   {
     $redirectUri = $redirectUri ?? $this->redirectUri;
     if ($scope == null) throw new Exception("GMail scope cannot be null");
@@ -75,14 +75,14 @@ 
       'access_type'   => $accessType
     ];
     if ($prompt) $params['prompt'] = 'consent';
-    return self::AUTH_URL . build_url_query($params, false);
+    return self::AUTH_URL.build_url_query($params, false);
   }
   /**
    * [getToken description]
    * @param  string $code [description]
    * @return [type]       [description]
    */
-  public function getToken(string $code, string $redirectUri=null):?array
+  public function getToken(string $code, string $redirectUri = null): ?array
   {
     $redirectUri = $redirectUri ?? $this->redirectUri;
     $ch = curl_init(self::TOKEN_URL);
@@ -100,7 +100,7 @@ 
     ]);
     $header = [
       'Content-Type: application/x-www-form-urlencoded',
-      'Content-Length: ' . strlen($body)
+      'Content-Length: '.strlen($body)
     ];
     curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
     curl_setopt($ch, CURLOPT_USERAGENT, $this->userAgent);
@@ -118,7 +118,7 @@ 
    * @param  string $refreshToken [description]
    * @return [type]               [description]
    */
-  public function refreshAccessToken(string $refreshToken):?array {
+  public function refreshAccessToken(string $refreshToken): ?array {
     $ch = curl_init(self::TOKEN_URL);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
     curl_setopt($ch, CURLINFO_HEADER_OUT, true);
@@ -133,7 +133,7 @@ 
     ]);
     $header = [
       'Content-Type: application/x-www-form-urlencoded',
-      'Content-Length: ' . strlen($body)
+      'Content-Length: '.strlen($body)
     ];
     curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
     curl_setopt($ch, CURLOPT_USERAGENT, $this->userAgent);
@@ -153,9 +153,9 @@ 
    * @param  string $user [description]
    * @return [type]       [description]
    */
-  public function getProfile(string $user='me'):?array {
+  public function getProfile(string $user = 'me'): ?array {
     list($code, $response) = (new GMailCURL(GMailCURL::GET))(
-      self::API . "$user/profile",
+      self::API."$user/profile",
       ["Authorization: Bearer $this->token"]
     );
     if ($response !== false) return $this->process_response($code, $response);
@@ -174,7 +174,7 @@ 
    * @param  string $labelFilterAction [description]
    * @return [type]                    [description]
    */
-  public function watch(string $topic, $labelIds=null, string $userId='me', string $labelFilterAction='include'):?array {
+  public function watch(string $topic, $labelIds = null, string $userId = 'me', string $labelFilterAction = 'include'): ?array {
     $body = [
       'topicName'         => $topic,
       'labelFilterAction' => $labelFilterAction
@@ -189,7 +189,7 @@ 
     }
 
     list($code, $response) = (new GMailCURL(GMailCURL::POST))(
-      self::API . "$userId/watch",
+      self::API."$userId/watch",
       ["Authorization: Bearer $this->token"],
       $body
     );
@@ -203,10 +203,10 @@ 
    * @param  string     $userId ID or Email Address of the user.
    * @return bool               [description]
    */
-  public function endWatch(string $userId='me'):bool
+  public function endWatch(string $userId = 'me'):bool
   {
     list($code, $response) = (new GMailCURL(GMailCURL::POST))(
-      self::API . "$userId/stop",
+      self::API."$userId/stop",
       ["Authorization: Bearer $this->token"]
     );
     if ($response !== false) return $code == 204;
@@ -219,10 +219,10 @@ 
    * @param  string     $userID [description]
    * @return null|array         [description]
    */
-  public function getLabels(string $userId='me'):?array
+  public function getLabels(string $userId = 'me'): ?array
   {
     list($code, $response) = (new GMailCURL(GMailCURL::GET))(
-      self::API . "$userId/labels",
+      self::API."$userId/labels",
       ["Authorization: Bearer $this->token"]
     );
     if ($response !== false) {
@@ -242,9 +242,9 @@ 
    * @param  [type]     $truncateAfter    [description]
    * @return [type]                       [description]
    */
-  public function getMessages(string $userId='me', array $labelIds=null,
-  string $q=null, int $maxMessages=null, string $pageToken=null, bool $includeSpamTrash=false,
-  $truncateAfter=null):?object
+  public function getMessages(string $userId = 'me', array $labelIds = null,
+  string $q = null, int $maxMessages = null, string $pageToken = null, bool $includeSpamTrash = false,
+  $truncateAfter = null): ?object
   {
     $query = [];
 
@@ -255,14 +255,14 @@ 
     if ($maxMessages != null) $query['maxResults'] = $maxMessages;
 
     list($code, $response) = (new GMailCURL(GMailCURL::GET))(
-      self::API . "$userId/messages" . build_url_query($query),
+      self::API."$userId/messages".build_url_query($query),
       ["Authorization: Bearer $this->token"]
     );
 
     if ($response !== false) {
       if ($truncateAfter != null && $code == 200) {
         $response = json_decode($response);
-        $response->messages = array_filter($response->messages, function ($e) use ($truncateAfter) {
+        $response->messages = array_filter($response->messages, function($e) use ($truncateAfter) {
           return strcmp($truncateAfter, $e->id) < 0;
         });
         $response->{self::HTTP_CODE} = $code;
@@ -283,8 +283,8 @@ 
    * @param  [type]       $metadataHeaders [description]
    * @return Message|null                  [description]
    */
-  public function getMessage(string $userId='me', string $messageId,
-  string $format='full', array $metadataHeaders=null):?Message
+  public function getMessage(string $userId = 'me', string $messageId,
+  string $format = 'full', array $metadataHeaders = null): ?Message
   {
     $query = [];
 
@@ -292,7 +292,7 @@ 
     if ($metadataHeaders != null) $query['metadataHeaders'] = $metadataHeaders;
 
     list($code, $response) = (new GMailCURL(GMailCURL::GET))(
-      self::API . "$userId/messages/$messageId?" . http_build_query($query),
+      self::API."$userId/messages/$messageId?".http_build_query($query),
       ["Authorization: Bearer $this->token"]
     );
 

Braces +48 added lines, -16 removed lines

@@ -20,7 +20,9 @@ 
     get_instance()->load->splint('francis94c/ci-gmail', '%curl');
     get_instance()->load->splint('francis94c/ci-gmail', '%base64');
 
-    if ($params != null) $this->init($params);
+    if ($params != null) {
+      $this->init($params);
+    }
 
     spl_autoload_register(function($name) {
       if (file_exists(APPPATH.'splints/'.self::PACKAGE."/libraries/$name.php")) {
@@ -66,7 +68,9 @@ 
   public function getAuthorizeUrl(string $scope, string $redirectUri=null, string $responseType='code', string $accessType='offline', bool $prompt=false):string
   {
     $redirectUri = $redirectUri ?? $this->redirectUri;
-    if ($scope == null) throw new Exception("GMail scope cannot be null");
+    if ($scope == null) {
+      throw new Exception("GMail scope cannot be null");
+    }
     $params = [
       'client_id'     => $this->clientId,
       'redirect_uri'  => $redirectUri,
@@ -74,7 +78,9 @@ 
       'response_type' => $responseType,
       'access_type'   => $accessType
     ];
-    if ($prompt) $params['prompt'] = 'consent';
+    if ($prompt) {
+      $params['prompt'] = 'consent';
+    }
     return self::AUTH_URL . build_url_query($params, false);
   }
   /**
@@ -110,7 +116,9 @@ 
     $response = curl_exec($ch);
     $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
     curl_close($ch);
-    if ($response !== false) return $this->process_response($code, $response);
+    if ($response !== false) {
+      return $this->process_response($code, $response);
+    }
     return null;
   }
   /**
@@ -144,7 +152,9 @@ 
     $response = curl_exec($ch);
     $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
     curl_close($ch);
-    if ($response !== false) return $this->process_response($code, $response);
+    if ($response !== false) {
+      return $this->process_response($code, $response);
+    }
     return null;
   }
   /**
@@ -158,7 +168,9 @@ 
       self::API . "$user/profile",
       ["Authorization: Bearer $this->token"]
     );
-    if ($response !== false) return $this->process_response($code, $response);
+    if ($response !== false) {
+      return $this->process_response($code, $response);
+    }
     return null;
   }
 
@@ -193,7 +205,9 @@ 
       ["Authorization: Bearer $this->token"],
       $body
     );
-    if ($response !== false) return $this->process_response($code, $response);
+    if ($response !== false) {
+      return $this->process_response($code, $response);
+    }
     return null;
   }
 
@@ -209,7 +223,9 @@ 
       self::API . "$userId/stop",
       ["Authorization: Bearer $this->token"]
     );
-    if ($response !== false) return $code == 204;
+    if ($response !== false) {
+      return $code == 204;
+    }
     return false;
   }
 
@@ -248,11 +264,21 @@ 
   {
     $query = [];
 
-    if ($labelIds != null) $query['labelIds'] = $labelIds;
-    if ($includeSpamTrash) $query['includeSpamTrash'] = $includeSpamTrash;
-    if ($q != null) $query['q'] = $q;
-    if ($pageToken != null) $query['pageToken'] = $pageToken;
-    if ($maxMessages != null) $query['maxResults'] = $maxMessages;
+    if ($labelIds != null) {
+      $query['labelIds'] = $labelIds;
+    }
+    if ($includeSpamTrash) {
+      $query['includeSpamTrash'] = $includeSpamTrash;
+    }
+    if ($q != null) {
+      $query['q'] = $q;
+    }
+    if ($pageToken != null) {
+      $query['pageToken'] = $pageToken;
+    }
+    if ($maxMessages != null) {
+      $query['maxResults'] = $maxMessages;
+    }
 
     list($code, $response) = (new GMailCURL(GMailCURL::GET))(
       self::API . "$userId/messages" . build_url_query($query),
@@ -288,15 +314,21 @@ 
   {
     $query = [];
 
-    if ($format != 'full' && $format != null) $query['format'] = $format;
-    if ($metadataHeaders != null) $query['metadataHeaders'] = $metadataHeaders;
+    if ($format != 'full' && $format != null) {
+      $query['format'] = $format;
+    }
+    if ($metadataHeaders != null) {
+      $query['metadataHeaders'] = $metadataHeaders;
+    }
 
     list($code, $response) = (new GMailCURL(GMailCURL::GET))(
       self::API . "$userId/messages/$messageId?" . http_build_query($query),
       ["Authorization: Bearer $this->token"]
     );
 
-    if ($response !== false) return new Message($response);
+    if ($response !== false) {
+      return new Message($response);
+    }
 
     return null;
   }