Merge branches recette into master

.travis.yml

@@ -4,7 +4,6 @@ php:
   - '5.6'
   - '7.0'
   - '7.1'
-  - hhvm
 
 install:
   - composer install

src/Object/Folder.php

@@ -18,8 +18,6 @@ class Folder extends AbstractExceptionMode
     private $iFolderIndex = 0;
     /** @var array $aFolder: list of object in the current folder */
     private $aFolder = [];
-    /** @var bool $bFolderReading: is a folder is currently reading */
-    private $bFolderReading = false;
 
     public function __construct()
     {
@@ -64,9 +62,12 @@ public function loadFolderCursor($sCursor)
      */
     public function next()
     {
-        # You have to loadFolder before
-        $bLoaded = $this->isFolderLoaded();
-        if ($bLoaded === false) {
+        # throw Exception in strict mode
+        if (!isset($this->aFolder["entries"])) {
+            if ($this->exceptionMode === DropboxHelper::MODE_STRICT) {
+                throw new FolderNotLoadException("Dropbox configuration error. Trying to get cursor without a reading folder. call loadFolder()/loadFolderContinue() before");
+            }
+
             return null;
         }
 
@@ -83,10 +84,6 @@ public function next()
             return $this->getObjectOnCurrentIndex();
         }
 
-        # End of folder
-        $this->bFolderReading = false;
-        unset($this->aFolder);
-
         return null;
     }
 
@@ -96,9 +93,7 @@ public function next()
      */
     public function getCursor()
     {
-        $bLoaded = $this->isFolderLoaded();
-
-        if ($bLoaded === false) {
+        if (!isset($this->aFolder['cursor'])) {
             return null;
         }
 
@@ -122,10 +117,7 @@ private function initLoadingPartOfFolder($sFolder)
             return false;
         }
 
-        # If folder has some entries
-        $this->bFolderReading = (count($this->aFolder["entries"]) != 0);
-
-        return $this->bFolderReading;
+        return true;
     }
 
     /**
@@ -140,29 +132,10 @@ private function getObjectOnCurrentIndex()
         return $object;
     }
 
-    /**
-     * @return bool
-     * @throws FolderNotLoadException
-     */
-    private function isFolderLoaded()
-    {
-        if ($this->bFolderReading === true) {
-            return true;
-        }
-
-        # throw Exception in strict mode
-        if ($this->exceptionMode === DropboxHelper::MODE_STRICT) {
-            throw new FolderNotLoadException("Dropbox configuration error. Trying to get cursor without a reading folder. call loadFolder()/loadFolderContinue() before");
-        }
-
-        return false;
-    }
-
     private function initializeFolder()
     {
         $this->iFolderIndex = 0;
         $this->aFolder = [];
-        $this->bFolderReading = false;
     }
 
 }

tests/DropboxHelperTest.php

@@ -25,7 +25,7 @@ public function setUp()
         if (isset($env['DROPBOX_TOKEN'])) {
             $this->dropboxHelper = new DropboxHelper($env['DROPBOX_TOKEN']);
         } else {
-            echo "\nWARNING: Dropbox token is empty.\n";
+            trigger_error("WARNING: Dropbox token is empty.", E_USER_WARNING);
         }
     }
 
@@ -85,8 +85,6 @@ public function testGetCursor()
         $sCursor = $oFolder->getCursor();
 
         self::assertNotEmpty($sCursor, 'Failed to get cursor on a loaded folder');
-
-        echo "\nLast Cursor of '{$this->sFolderPath}':\n$sCursor\n";
     }
 
     /**
@@ -168,26 +166,20 @@ public function testListFolderFromName()
         }
 
         if (empty($this->sFolderPath)) {
-            echo 'WARNING: Cannot run ' . __FUNCTION__ . ', Dropbox folder path is empty.';
+            trigger_error('WARNING: Cannot run ' . __FUNCTION__ . ', Dropbox folder path is empty.', E_USER_WARNING);
             return;
         }
 
         $oFolder = $this->dropboxHelper->loadFolderPath($this->sFolderPath);
 
-        echo "\nList Folder: {$this->sFolderPath}\n";
         while ($oFolder && ($aMedia = $oFolder->next())) {
             if (DropboxHelper::isFile($aMedia)) {
-                echo 'File:' . $aMedia['name'] . ' ';
             }
             if (DropboxHelper::isFolder($aMedia)) {
-                echo 'Folder:' . DropboxHelper::getPath($aMedia);
             }
             if (DropboxHelper::isDeleted($aMedia)) {
-                echo 'Deleted:' . $aMedia['name'] . ' ';
             }
         }
-
-        echo "\n";
     }
 
     public function testListFolderFromCursor()
@@ -197,17 +189,15 @@ public function testListFolderFromCursor()
         }
 
         if (empty($this->sCursor)) {
-            echo 'WARNING: Cannot run ' . __FUNCTION__ . ', Dropbox folder cursor is empty.';
+            trigger_error('WARNING: Cannot run ' . __FUNCTION__ . ', Dropbox folder cursor is empty.', E_USER_WARNING);
             return;
         }
 
         $oFolder = $this->dropboxHelper->loadFolderCursor($this->sCursor);
 
         self::assertNotNull($oFolder, "Cannot load a folder from cursor: {$this->sCursor}");
 
-        echo "\nList Folder from Cursor:\n";
         while (($aFolder = $oFolder->next())) {
-            echo $aFolder['.tag'] . ':' . $aFolder['name'] . ' ';
         }
     }