francis94c / ci-gmail

libraries/GMail.php

Spacing +27 added lines, -27 removed lines

@@ -17,7 +17,7 @@ 
   private $lastResponse;
   private $lastResponseCode;
 
-  function __construct($params=null)
+  function __construct($params = null)
   {
     get_instance()->load->splint('francis94c/ci-gmail', '%curl');
     get_instance()->load->splint('francis94c/ci-gmail', '%base64');
@@ -52,7 +52,7 @@ 
    * [getClientId Get Client ID.]
    * @return null|string Client ID.
    */
-  public function getClientId():?string {
+  public function getClientId(): ?string {
     return $this->clientId;
   }
   /**
@@ -65,8 +65,8 @@ 
    * @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");
@@ -78,14 +78,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):?object
+  public function getToken(string $code, string $redirectUri = null): ?object
   {
     $redirectUri = $redirectUri ?? $this->redirectUri;
     $ch = curl_init(self::TOKEN_URL);
@@ -103,7 +103,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);
@@ -123,7 +123,7 @@ 
    * @param  string $refreshToken [description]
    * @return [type]               [description]
    */
-  public function refreshAccessToken(string $refreshToken):?object
+  public function refreshAccessToken(string $refreshToken): ?object
   {
     $ch = curl_init(self::TOKEN_URL);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -139,7 +139,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);
@@ -161,10 +161,10 @@ 
    * @param  string $user [description]
    * @return [type]       [description]
    */
-  public function getProfile(string $user='me'):?object
+  public function getProfile(string $user = 'me'): ?object
   {
     list($code, $response) = (new GMailCURL(GMailCURL::GET))(
-      self::API . "$user/profile",
+      self::API."$user/profile",
       ["Authorization: Bearer $this->token"]
     );
     $this->lastResponse = $response;
@@ -185,8 +185,8 @@ 
    * @param  string $labelFilterAction [description]
    * @return [type]                    [description]
    */
-  public function watch(string $topic, $labelIds=null, string $userId='me',
-  string $labelFilterAction='include'):?object
+  public function watch(string $topic, $labelIds = null, string $userId = 'me',
+  string $labelFilterAction = 'include'): ?object
   {
     $body = [
       'topicName'         => $topic,
@@ -202,7 +202,7 @@ 
     }
 
     list($code, $response) = (new GMailCURL(GMailCURL::POST))(
-      self::API . "$userId/watch",
+      self::API."$userId/watch",
       ["Authorization: Bearer $this->token"],
       $body
     );
@@ -218,10 +218,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"]
     );
     $this->lastResponse = $response;
@@ -236,10 +236,10 @@ 
    * @param  string     $userID [description]
    * @return null|array         [description]
    */
-  public function getLabels(string $userId='me'):?object
+  public function getLabels(string $userId = 'me'): ?object
   {
     list($code, $response) = (new GMailCURL(GMailCURL::GET))(
-      self::API . "$userId/labels",
+      self::API."$userId/labels",
       ["Authorization: Bearer $this->token"]
     );
     $this->lastResponse = $response;
@@ -261,9 +261,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 = [];
 
@@ -274,7 +274,7 @@ 
     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"]
     );
 
@@ -284,7 +284,7 @@ 
     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;
@@ -305,8 +305,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 = [];
 
@@ -314,7 +314,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"]
     );
 
@@ -352,7 +352,7 @@ 
    * @param  string $response [description]
    * @return [type]           [description]
    */
-  private function process_response(int $code, string $response):?object {
+  private function process_response(int $code, string $response): ?object {
     $response = json_decode($response);
     $response->{self::HTTP_CODE} = $code;
     return $response;

Braces +48 added lines, -16 removed lines

@@ -22,7 +22,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")) {
@@ -69,7 +71,9 @@ 
   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,
@@ -77,7 +81,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);
   }
   /**
@@ -115,7 +121,9 @@ 
     curl_close($ch);
     $this->lastResponse = $response;
     $this->lastResponseCode = $code;
-    if ($response !== false) return $this->process_response($code, $response);
+    if ($response !== false) {
+      return $this->process_response($code, $response);
+    }
     return null;
   }
   /**
@@ -152,7 +160,9 @@ 
     curl_close($ch);
     $this->lastResponse = $response;
     $this->lastResponseCode = $code;
-    if ($response !== false) return $this->process_response($code, $response);
+    if ($response !== false) {
+      return $this->process_response($code, $response);
+    }
     return null;
   }
   /**
@@ -169,7 +179,9 @@ 
     );
     $this->lastResponse = $response;
     $this->lastResponseCode = $code;
-    if ($response !== false) return $this->process_response($code, $response);
+    if ($response !== false) {
+      return $this->process_response($code, $response);
+    }
     return null;
   }
 
@@ -208,7 +220,9 @@ 
     );
     $this->lastResponse = $response;
     $this->lastResponseCode = $code;
-    if ($response !== false) return $this->process_response($code, $response);
+    if ($response !== false) {
+      return $this->process_response($code, $response);
+    }
     return null;
   }
 
@@ -226,7 +240,9 @@ 
     );
     $this->lastResponse = $response;
     $this->lastResponseCode = $code;
-    if ($response !== false) return $code == 204;
+    if ($response !== false) {
+      return $code == 204;
+    }
     return false;
   }
 
@@ -267,11 +283,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),
@@ -310,8 +336,12 @@ 
   {
     $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),
@@ -321,7 +351,9 @@ 
     $this->lastResponse = $response;
     $this->lastResponseCode = $code;
 
-    if ($response !== false) return new Message($response);
+    if ($response !== false) {
+      return new Message($response);
+    }
 
     return null;
   }