Merge branch 'release/1.2.0'

gwsn · Oct 5, 2023 · 4191ec1 · 4191ec1
2 parents 2c9e528 + e88a27e
commit 4191ec1
Showing 1 changed file with 28 additions and 27 deletions.
diff --git a/src/Drive/FolderService.php b/src/Drive/FolderService.php
@@ -117,33 +117,6 @@ public function requestFolderItems(?string $folder = '/', ?string $itemId = null
         return $this->requestAllItems($url);
     }
 
-    /**
-     * Get all items from a url
-     *
-     * @param string $url
-     * @return array
-     * @throws Exception
-     */
-    public function requestAllItems(string $url): ?array
-    {
-        $response = $this->apiConnector->request('GET', $url);
-
-        if ( ! isset($response['value'])) {
-            throw new \Exception('Microsoft SP Drive Request: Cannot parse the body of the sharepoint drive request. ' . __FUNCTION__, 2321);
-        }
-
-        $results = $response['value'];
-
-        if (isset($response['@odata.nextLink'])) {
-            $results = [
-                ...$response['value'],
-                ...$this->requestAllItems($response['@odata.nextLink'])
-            ];
-        }
-
-        return $results;
-    }
-
     /**
      * Read the folder metadata and so check if it exists
      *
@@ -283,4 +256,32 @@ public function deleteFolder(?string $folder = null, ?string $itemId = null): bo
             return false;
         }
     }
+
+    /**
+     * Get all items from a url
+     *
+     * @param string $url
+     * @return array
+     * @throws Exception
+     */
+    private function requestAllItems(string $url): ?array
+    {
+        $response = $this->apiConnector->request('GET', $url);
+
+        if ( ! isset($response['value'])) {
+            throw new \Exception('Microsoft SP Drive Request: Cannot parse the body of the sharepoint drive request. ' . __FUNCTION__, 2321);
+        }
+
+        $results = $response['value'];
+
+        if (isset($response['@odata.nextLink'])) {
+            $results = [
+                ...$response['value'],
+                ...$this->requestAllItems($response['@odata.nextLink'])
+            ];
+        }
+
+        return $results;
+    }
+
 }