Merge pull request #20544 from owncloud/move-index-to-appframework

Move index.php from files to AppFramework

2 files changed, 25 insertions, 13 deletions

diff --git a/tests/lib/helper.php b/tests/lib/helper.php
index bd527de160d..ca3e0e46d82 100644
--- a/tests/lib/helper.php
+++ b/tests/lib/helper.php
@@ -353,18 +353,24 @@ class Test_Helper extends \Test\TestCase {
 		$this->assertEquals($expectedResult, $result);
 	}
 
+	/**
+	 * @return array
+	 */
 	public function provideDocRootAppUrlParts() {
 		return array(
-			array('files', 'index.php', array(), '/index.php/apps/files'),
-			array('files', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), '/index.php/apps/files?trut=trat&dut=dat'),
+			array('files', 'ajax/list.php', array(), '/index.php/apps/files/ajax/list.php'),
+			array('files', 'ajax/list.php', array('trut' => 'trat', 'dut' => 'dat'), '/index.php/apps/files/ajax/list.php?trut=trat&dut=dat'),
 			array('', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), '/index.php?trut=trat&dut=dat'),
 		);
 	}
 
+	/**
+	 * @return array
+	 */
 	public function provideSubDirAppUrlParts() {
 		return array(
-			array('files', 'index.php', array(), '/owncloud/index.php/apps/files'),
-			array('files', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), '/owncloud/index.php/apps/files?trut=trat&dut=dat'),
+			array('files', 'ajax/list.php', array(), '/owncloud/index.php/apps/files/ajax/list.php'),
+			array('files', 'ajax/list.php', array('trut' => 'trat', 'dut' => 'dat'), '/owncloud/index.php/apps/files/ajax/list.php?trut=trat&dut=dat'),
 			array('', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), '/owncloud/index.php?trut=trat&dut=dat'),
 		);
 	}
@@ -393,18 +399,24 @@ class Test_Helper extends \Test\TestCase {
 		$this->assertEquals($expectedResult, $result);
 	}
 
+	/**
+	 * @return array
+	 */
 	public function provideDocRootAppAbsoluteUrlParts() {
 		return array(
-			array('files', 'index.php', array(), 'http://localhost/index.php/apps/files'),
-			array('files', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), 'http://localhost/index.php/apps/files?trut=trat&dut=dat'),
+			array('files', 'ajax/list.php', array(), 'http://localhost/index.php/apps/files/ajax/list.php'),
+			array('files', 'ajax/list.php', array('trut' => 'trat', 'dut' => 'dat'), 'http://localhost/index.php/apps/files/ajax/list.php?trut=trat&dut=dat'),
 			array('', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), 'http://localhost/index.php?trut=trat&dut=dat'),
 		);
 	}
 
+	/**
+	 * @return array
+	 */
 	public function provideSubDirAppAbsoluteUrlParts() {
 		return array(
-			array('files', 'index.php', array(), 'http://localhost/owncloud/index.php/apps/files'),
-			array('files', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), 'http://localhost/owncloud/index.php/apps/files?trut=trat&dut=dat'),
+			array('files', 'ajax/list.php', array(), 'http://localhost/owncloud/index.php/apps/files/ajax/list.php'),
+			array('files', 'ajax/list.php', array('trut' => 'trat', 'dut' => 'dat'), 'http://localhost/owncloud/index.php/apps/files/ajax/list.php?trut=trat&dut=dat'),
 			array('', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), 'http://localhost/owncloud/index.php?trut=trat&dut=dat'),
 		);
 	}
diff --git a/tests/lib/urlgenerator.php b/tests/lib/urlgenerator.php
index 60e1a86f16a..a5ab483109f 100644
--- a/tests/lib/urlgenerator.php
+++ b/tests/lib/urlgenerator.php
@@ -53,23 +53,23 @@ class Test_Urlgenerator extends \Test\TestCase {
 
 	public function provideRoutes() {
 		return array(
-			array('files_index', 'http://localhost/owncloud/index.php/apps/files/'),
+			array('files_ajax_list', 'http://localhost/owncloud/index.php/apps/files/ajax/list.php'),
 			array('core_ajax_preview', 'http://localhost/owncloud/index.php/core/preview.png'),
 		);
 	}
 
 	public function provideDocRootAppUrlParts() {
 		return array(
-			array('files', 'index.php', array(), '/index.php/apps/files'),
-			array('files', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), '/index.php/apps/files?trut=trat&dut=dat'),
+			array('files', 'ajax/list.php', array(), '/index.php/apps/files/ajax/list.php'),
+			array('files', 'ajax/list.php', array('trut' => 'trat', 'dut' => 'dat'), '/index.php/apps/files/ajax/list.php?trut=trat&dut=dat'),
 			array('', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), '/index.php?trut=trat&dut=dat'),
 		);
 	}
 
 	public function provideSubDirAppUrlParts() {
 		return array(
-			array('files', 'index.php', array(), '/owncloud/index.php/apps/files'),
-			array('files', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), '/owncloud/index.php/apps/files?trut=trat&dut=dat'),
+			array('files', 'ajax/list.php', array(), '/owncloud/index.php/apps/files/ajax/list.php'),
+			array('files', 'ajax/list.php', array('trut' => 'trat', 'dut' => 'dat'), '/owncloud/index.php/apps/files/ajax/list.php?trut=trat&dut=dat'),
 			array('', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), '/owncloud/index.php?trut=trat&dut=dat'),
 		);
 	}