Update CHANGELOG for #1001 and fixed review

Author: phaizullin

CHANGELOG.md

@@ -10,6 +10,7 @@ Version 5 of the Facebook PHP SDK is a complete refactor of version 4. It comes
   - Add `joined` to list of fields to be cast to `\DateTime` (#950)
   - Add `GraphPage::getFanCount()` to get the number of people who like the page (#815)
   - Fixed HTTP/2 support (#1079)
+  - Fixed resumable upload error (#1001)
 - 5.6.3 (2018-07-01)
   - Add fix for countable error in PHP 7.2 (originally #969 by @andreybolonin)
 - 5.6.2 (2018-02-15)

src/Facebook/Exceptions/FacebookResponseException.php

@@ -97,12 +97,10 @@ public static function create(FacebookResponse $response)
                 case 1363037:
                     $previousException = new FacebookResumableUploadException($message, $code);
 
-                    $startOffset = isset($data['error']['error_data']['start_offset']) ?
-                        $data['error']['error_data']['start_offset'] : null;
+                    $startOffset = isset($data['error']['error_data']['start_offset']) ? (int) $data['error']['error_data']['start_offset'] : null;
                     $previousException->setStartOffset($startOffset);
 
-                    $endOffset = isset($data['error']['error_data']['end_offset']) ?
-                        $data['error']['error_data']['end_offset'] : null;
+                    $endOffset = isset($data['error']['error_data']['end_offset']) ? (int) $data['error']['error_data']['end_offset'] : null;
                     $previousException->setEndOffset($endOffset);
 
                     return new static($response, $previousException);

src/Facebook/Exceptions/FacebookResumableUploadException.php

@@ -35,31 +35,31 @@ class FacebookResumableUploadException extends FacebookSDKException
     protected $endOffset;
 
     /**
-     * @return int
+     * @return int|null
      */
     public function getStartOffset()
     {
         return $this->startOffset;
     }
 
     /**
-     * @param int $startOffset
+     * @param int|null $startOffset
      */
     public function setStartOffset($startOffset)
     {
         $this->startOffset = $startOffset;
     }
 
     /**
-     * @return int
+     * @return int|null
      */
     public function getEndOffset()
     {
         return $this->endOffset;
     }
 
     /**
-     * @param int $endOffset
+     * @param int|null $endOffset
      */
     public function setEndOffset($endOffset)
     {

src/Facebook/FileUpload/FacebookResumableUploader.php

@@ -121,7 +121,7 @@ public function transfer($endpoint, FacebookTransferChunk $chunk, $allowToThrow
                 throw $e;
             }
 
-            if (!is_null($preException->getStartOffset()) && !is_null($preException->getEndOffset())) {
+            if (null !== $preException->getStartOffset() && null !== $preException->getEndOffset()) {
                 return new FacebookTransferChunk(
                     $chunk->getFile(),
                     $chunk->getUploadSessionId(),

src/Facebook/FileUpload/FacebookTransferChunk.php

@@ -121,6 +121,14 @@ public function getStartOffset()
         return $this->startOffset;
     }
 
+    /**
+     * @return int
+     */
+    public function getEndOffset()
+    {
+        return $this->endOffset;
+    }
+
     /**
      * Get uploaded video Id
      *

tests/FileUpload/FacebookResumableUploaderTest.php

@@ -106,6 +106,7 @@ public function testFailedResumableTransferWillNotThrowAndReturnNewChunk()
 
         $chunk = new FacebookTransferChunk($this->file, '1', '2', '3', '4');
         $newChunk = $uploader->transfer('/me/videos', $chunk);
-        $this->assertEquals('40', $newChunk->getStartOffset());
+        $this->assertEquals(40, $newChunk->getStartOffset());
+        $this->assertEquals(50, $newChunk->getEndOffset());
     }
 }