Add media count for feed

pgrimaud · Mar 1, 2019 · 86ed7e5 · 86ed7e5
1 parent c244939
commit 86ed7e5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -21,6 +21,7 @@
     }
   },
   "require": {
+    "ext-json": "*",
     "guzzlehttp/guzzle": "^6.3"
   },
   "require-dev": {

diff --git a/src/Instagram/Api.php b/src/Instagram/Api.php
@@ -61,11 +61,12 @@ public function setAccessToken($token)
     }
 
     /**
+     * @param null $mediaCount
      * @return Hydrator\Feed
      * @throws InstagramException
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function getFeed()
+    public function getFeed($mediaCount = null)
     {
         if (!$this->userId) {
             throw new InstagramException('Missing userId');
@@ -81,7 +82,7 @@ public function getFeed()
         $userDataFetched = $feed->fetchUserData($this->userId);
         $hydrator->setUserData($userDataFetched);
 
-        $mediaDataFetched = $feed->fetchMediaData($this->userId, $this->maxId);
+        $mediaDataFetched = $feed->fetchMediaData($this->userId, $this->maxId, $mediaCount);
         $hydrator->setMediaData($mediaDataFetched);
 
         return $hydrator->getHydratedData();

diff --git a/src/Instagram/Transport/JsonFeed.php b/src/Instagram/Transport/JsonFeed.php
@@ -62,21 +62,21 @@ public function fetchUserData($userId)
     /**
      * @param $userId
      * @param null $maxId
-     * @param int|null $count
+     * @param int|null $mediaCount
      * @return mixed
      * @throws InstagramException
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    public function fetchMediaData($userId, $maxId = null, $count = null)
+    public function fetchMediaData($userId, $maxId = null, $mediaCount = null)
     {
         $endpoint = self::INSTAGRAM_ENDPOINT . $userId . '/media/recent/?access_token=' . $this->accessToken;
 
         if ($maxId) {
             $endpoint .= '&max_id=' . $maxId;
         }
 
-        if ($count) {
-            $endpoint .= '&count=' . (int)$count;
+        if ($mediaCount) {
+            $endpoint .= '&count=' . (int)$mediaCount;
         }
 
         $res = $this->clientMedia->request('GET', $endpoint);

diff --git a/tests/ApiTest.php b/tests/ApiTest.php
@@ -99,7 +99,7 @@ public function testValidFeedReturn()
         $api->setUserId(1234);
         $api->setAccessToken('123.123.1233');
 
-        $feed = $api->getFeed();
+        $feed = $api->getFeed(12);
 
         $this->assertInstanceOf(Feed::class, $feed);
     }