Merge pull request #1 from bear8421/v2.x

V2.x

Author: nguyenanhung

.github/workflows/php.yml

@@ -6,7 +6,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ ubuntu-latest, windows-latest, macos-latest ]
-                php-versions: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0' ]
+                php-versions: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0' ]
         runs-on: ${{ matrix.operating-system }}
         steps:
             -   name: Checkout

.gitignore

@@ -120,6 +120,7 @@ GitHub.sublime-settings
 ## Composer
 /vendor/
 /tests/*
+composer.lock
 
 cache/*
 !cache/.htaccess

composer.json

@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=5.4",
+        "php": ">=7.0",
         "ext-curl": "*",
         "ext-json": "*"
     },

composer.lock

@@ -141,4 +141,4 @@ $.ajax({
 });
 ```
 
-### Nguồn: https://viblo.asia/p/huong-dan-tao-api-ghi-du-lieu-len-google-sheet-1Je5EPRYlnL
+Nguồn: https://viblo.asia/p/huong-dan-tao-api-ghi-du-lieu-len-google-sheet-1Je5EPRYlnL

docs/PUSH.md

@@ -44,7 +44,7 @@ class GoogleSpreadsheets
      * @copyright: 713uk13m <dev@nguyenanhung.com>
      * @time     : 09/06/2021 49:14
      */
-    public function setBackgroundRequest($backgroundRequest = true)
+    public function setBackgroundRequest(bool $backgroundRequest = true): GoogleSpreadsheets
     {
         $this->backgroundRequest = $backgroundRequest;
 
@@ -61,7 +61,7 @@ public function setBackgroundRequest($backgroundRequest = true)
      * @copyright: 713uk13m <dev@nguyenanhung.com>
      * @time     : 09/04/2021 25:02
      */
-    public function setScriptId($scriptId = '')
+    public function setScriptId(string $scriptId = ''): GoogleSpreadsheets
     {
         $this->scriptId = $scriptId;
 
@@ -78,7 +78,7 @@ public function setScriptId($scriptId = '')
      * @copyright: 713uk13m <dev@nguyenanhung.com>
      * @time     : 09/04/2021 32:26
      */
-    public function setContentData($contentData = [])
+    public function setContentData(array $contentData = array()): GoogleSpreadsheets
     {
         $this->contentData = $contentData;
 
@@ -106,7 +106,7 @@ public function getResponse()
      * @copyright: 713uk13m <dev@nguyenanhung.com>
      * @time     : 09/04/2021 38:44
      */
-    public function push()
+    public function push(): GoogleSpreadsheets
     {
         if (empty($this->scriptId) || empty($this->contentData)) {
             $this->response = null;

src/GoogleSpreadsheets.php

@@ -48,7 +48,7 @@ class Helper
      * @copyright: 713uk13m <dev@nguyenanhung.com>
      * @time     : 09/04/2021 30:36
      */
-    public static function sendToSpreadsheets($url = '', $params = [])
+    public static function sendToSpreadsheets(string $url = '', array $params = array()): array
     {
         if (empty($url)) {
             return [
@@ -90,7 +90,7 @@ public static function sendToSpreadsheets($url = '', $params = [])
                 'code'    => self::EXIT_SUCCESS,
                 'status'  => 'success',
                 'message' => 'Success',
-                'rowId'   => isset($res->row) ? $res->row : null
+                'rowId'   => $res->row ?? null
             ];
         }
 
@@ -112,13 +112,13 @@ public static function sendToSpreadsheets($url = '', $params = [])
      * @copyright: 713uk13m <dev@nguyenanhung.com>
      * @time     : 10/16/18 17:15
      */
-    public static function backgroundHttpGet($url)
+    public static function backgroundHttpGet(string $url): array
     {
         $parts = parse_url($url);
         if (strtolower($parts['scheme']) === 'https') {
-            $fp = fsockopen('ssl://' . $parts['host'], isset($parts['port']) ? $parts['port'] : self::PORT_SSL, $errno, $errStr, self::REQUEST_TIMEOUT);
+            $fp = fsockopen('ssl://' . $parts['host'], $parts['port'] ?? self::PORT_SSL, $errno, $errStr, self::REQUEST_TIMEOUT);
         } else {
-            $fp = fsockopen($parts['host'], isset($parts['port']) ? $parts['port'] : self::PORT_HTTP, $errno, $errStr, self::REQUEST_TIMEOUT);
+            $fp = fsockopen($parts['host'], $parts['port'] ?? self::PORT_HTTP, $errno, $errStr, self::REQUEST_TIMEOUT);
         }
         if (!$fp) {
             if (function_exists('log_message')) {