sort output of getFolderContent by name

lib/files/cache/cache.php

@@ -87,7 +87,7 @@ class Cache {
 		if ($fileId > -1) {
 			$query = \OC_DB::prepare(
 				'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`
-			 	 FROM `*PREFIX*filecache` WHERE parent = ? ORDER BY `fileid` ASC');
+			 	 FROM `*PREFIX*filecache` WHERE parent = ? ORDER BY `name` ASC');
 			$result = $query->execute(array($fileId));
 			return $result->fetchAll();
 		} else {

tests/lib/files/view.php

@@ -55,33 +55,33 @@ class View extends \PHPUnit_Framework_TestCase {
 		$folderData = $rootView->getDirectoryContent('/');
 		/**
 		 * expected entries:
+		 * folder
 		 * foo.png
 		 * foo.txt
-		 * folder
 		 * substorage
 		 */
 		$this->assertEquals(4, count($folderData));
-		$this->assertEquals('foo.png', $folderData[0]['name']);
-		$this->assertEquals('foo.txt', $folderData[1]['name']);
-		$this->assertEquals('folder', $folderData[2]['name']);
+		$this->assertEquals('folder', $folderData[0]['name']);
+		$this->assertEquals('foo.png', $folderData[1]['name']);
+		$this->assertEquals('foo.txt', $folderData[2]['name']);
 		$this->assertEquals('substorage', $folderData[3]['name']);
 
-		$this->assertEquals($imageSize, $folderData[0]['size']);
-		$this->assertEquals($textSize, $folderData[1]['size']);
-		$this->assertEquals($storageSize + $textSize, $folderData[2]['size']);
+		$this->assertEquals($storageSize + $textSize, $folderData[0]['size']);
+		$this->assertEquals($imageSize, $folderData[1]['size']);
+		$this->assertEquals($textSize, $folderData[2]['size']);
 		$this->assertEquals($storageSize, $folderData[3]['size']);
 
 		$folderData = $rootView->getDirectoryContent('/substorage');
 		/**
 		 * expected entries:
+		 * folder
 		 * foo.png
 		 * foo.txt
-		 * folder
 		 */
 		$this->assertEquals(3, count($folderData));
-		$this->assertEquals('foo.png', $folderData[0]['name']);
-		$this->assertEquals('foo.txt', $folderData[1]['name']);
-		$this->assertEquals('folder', $folderData[2]['name']);
+		$this->assertEquals('folder', $folderData[0]['name']);
+		$this->assertEquals('foo.png', $folderData[1]['name']);
+		$this->assertEquals('foo.txt', $folderData[2]['name']);
 
 		$folderView = new \OC\Files\View('/folder');
 		$this->assertEquals($rootView->getFileInfo('/folder'), $folderView->getFileInfo('/'));