Merge branch 'master' into v3

asimlqt · Apr 2, 2016 · 903a538 · 903a538
2 parents 0bc50e9 + 5dd0053
commit 903a538
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
+.idea
 /vendor/
 /coverage/
diff --git a/src/Google/Spreadsheet/DefaultServiceRequest.php b/src/Google/Spreadsheet/DefaultServiceRequest.php
@@ -333,7 +333,7 @@ protected function execute($ch)
                     throw new BadRequestException($ret, $info["http_code"]);
             }
         }
-
+        curl_close($ch);
         return $ret;
     }
 

diff --git a/src/Google/Spreadsheet/ListFeed.php b/src/Google/Spreadsheet/ListFeed.php
@@ -99,7 +99,7 @@ public function insert($row)
     /**
      * Get the entries of this feed
      * 
-     * @return array \Google\Spreadsheet\ListEntry
+     * @return \Google\Spreadsheet\ListEntry[]
      */
     public function getEntries()
     {
@@ -120,4 +120,22 @@ public function getEntries()
         return $rows;
     }
 
+    public function getTotalResults()
+    {
+        $xml = $this->xml->children('openSearch', true);
+        return intval($xml->totalResults);
+    }
+
+    public function getItemsPerPage()
+    {
+        $xml = $this->xml->children('openSearch', true);
+        return intval($xml->itemsPerPage);
+    }
+
+    public function getStartIndex()
+    {
+        $xml = $this->xml->children('openSearch', true);
+        return intval($xml->startIndex);
+    }
+
 }