Merge pull request #16160 from owncloud/issue-15924-php-notice-empty-path-pathinfo

Do not run method when the path is empty

2 files changed, 15 insertions, 1 deletions

diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/storage.php
index 4a5b47d2c2b..f98b134cff2 100644
--- a/apps/files_versions/lib/storage.php
+++ b/apps/files_versions/lib/storage.php
@@ -326,6 +326,9 @@ class Storage {
 	 */
 	public static function getVersions($uid, $filename, $userFullPath = '') {
 		$versions = array();
+		if ($filename === '') {
+			return $versions;
+		}
 		// fetch for old versions
 		$view = new \OC\Files\View('/' . $uid . '/');
 
diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php
index 5ea6d9ee5b9..febde951411 100644
--- a/apps/files_versions/tests/versions.php
+++ b/apps/files_versions/tests/versions.php
@@ -411,7 +411,7 @@ class Test_Files_Versioning extends \Test\TestCase {
 		// execute copy hook of versions app
 		$versions = \OCA\Files_Versions\Storage::getVersions(self::TEST_VERSIONS_USER, '/subfolder/test.txt');
 
-		$this->assertSame(2, count($versions));
+		$this->assertCount(2, $versions);
 
 		foreach ($versions as $version) {
 			$this->assertSame('/subfolder/test.txt', $version['path']);
@@ -422,6 +422,17 @@ class Test_Files_Versioning extends \Test\TestCase {
 		$this->rootView->deleteAll(self::USERS_VERSIONS_ROOT . '/subfolder');
 	}
 
+	/**
+	 * test if we find all versions and if the versions array contain
+	 * the correct 'path' and 'name'
+	 */
+	public function testGetVersionsEmptyFile() {
+		// execute copy hook of versions app
+		$versions = \OCA\Files_Versions\Storage::getVersions(self::TEST_VERSIONS_USER, '');
+
+		$this->assertCount(0, $versions);
+	}
+
 	public function testRestoreSameStorage() {
 		\OC\Files\Filesystem::mkdir('sub');
 		$this->doTestRestore();