Merge pull request #1 from congkv/hotfix/fatal_error

Fix fatal error <Undefined index: has_next_page>
postaddictme · Aug 11, 2020 · 03139e0 · 03139e0
2 parents 6bd0ea3 + 4dbb893
commit 03139e0
Showing 1 changed file with 21 additions and 10 deletions.
diff --git a/src/InstagramScraper/Instagram.php b/src/InstagramScraper/Instagram.php
@@ -1315,18 +1315,24 @@ public function getPaginateFollowers($accountId, $count = 20, $pageSize = 20, $d
                 throw new InstagramException('Failed to get followers of account id ' . $accountId . '. The account is private.', static::HTTP_FORBIDDEN);
             }
 
+            $pageInfo = $jsonResponse['data']['user']['edge_followed_by']['page_info'];
+            $lastPagingInfo = $pageInfo;
+            if ($pageInfo['has_next_page']) {
+                $endCursor = $pageInfo['end_cursor'];
+                $hasNextPage = true;
+            } else {
+                $hasNextPage = false;
+            }
+
             foreach ($edgesArray as $edge) {
                 $accounts[] = $edge['node'];
                 $index++;
                 if ($index >= $count) {
                     break 2;
                 }
             }
-            $pageInfo = $jsonResponse['data']['user']['edge_followed_by']['page_info'];
-            $lastPagingInfo = $pageInfo;
-            if ($pageInfo['has_next_page']) {
-                $endCursor = $pageInfo['end_cursor'];
-            } else {
+
+            if (!$hasNextPage) {
                 break;
             }
 
@@ -1407,6 +1413,15 @@ public function getPaginateFollowing($accountId, $count = 20, $pageSize = 20, $d
                 throw new InstagramException('Failed to get followers of account id ' . $accountId . '. The account is private.', static::HTTP_FORBIDDEN);
             }
 
+            $pageInfo = $jsonResponse['data']['user']['edge_follow']['page_info'];
+            $lastPagingInfo = $pageInfo;
+            if ($pageInfo['has_next_page']) {
+                $endCursor = $pageInfo['end_cursor'];
+                $hasNextPage = true;
+            } else {
+                $hasNextPage = false;
+            }
+
             foreach ($edgesArray as $edge) {
                 $accounts[] = $edge['node'];
                 $index++;
@@ -1415,11 +1430,7 @@ public function getPaginateFollowing($accountId, $count = 20, $pageSize = 20, $d
                 }
             }
 
-            $pageInfo = $jsonResponse['data']['user']['edge_follow']['page_info'];
-            $lastPagingInfo = $pageInfo;
-            if ($pageInfo['has_next_page']) {
-                $endCursor = $pageInfo['end_cursor'];
-            } else {
+            if (!$hasNextPage) {
                 break;
             }