Merge pull request #14574 from owncloud/fix-irequest-for-older-php-versions

Read from IRequest instead of reading twice

1 files changed, 0 insertions, 72 deletions

diff --git a/tests/lib/templatelayout.php b/tests/lib/templatelayout.php
deleted file mode 100644
index c23aaa9b762..00000000000
--- a/tests/lib/templatelayout.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Copyright (c) 2014 Lukas Reschke <lukas@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-namespace OC\Test;
-
-/**
- * @package OC\Test
- */
-class OC_TemplateLayout extends \Test\TestCase {
-
-	private $oldServerURI;
-	private $oldScriptName;
-
-	protected function setUp() {
-		parent::setUp();
-
-		$this->oldServerURI = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : null;
-		$this->oldScriptName = $_SERVER['SCRIPT_NAME'];
-	}
-
-	protected function tearDown() {
-		if ($this->oldServerURI === null) {
-			unset($_SERVER['REQUEST_URI']);
-		} else {
-			$_SERVER['REQUEST_URI'] = $this->oldServerURI;
-		}
-		$_SERVER['SCRIPT_NAME'] = $this->oldScriptName;
-
-		parent::tearDown();
-	}
-
-	/**
-	 * Contains valid file paths in the scheme array($absolutePath, $expectedPath)
-	 * @return array
-	 */
-	public function validFilePathProvider() {
-		return array(
-			array(\OC::$SERVERROOT . '/apps/files/js/fancyJS.js', '/apps/files/js/fancyJS.js'),
-			array(\OC::$SERVERROOT. '/test.js', '/test.js'),
-			array(\OC::$SERVERROOT . '/core/test.js', '/core/test.js'),
-			array(\OC::$SERVERROOT, ''),
-		);
-	}
-
-	/**
-	 * @dataProvider validFilePathProvider
-	 */
-	public function testConvertToRelativePath($absolutePath, $expected) {
-		$_SERVER['REQUEST_URI'] = $expected;
-		$_SERVER['SCRIPT_NAME'] = $expected;
-
-		$relativePath = \Test_Helper::invokePrivate(new \OC_TemplateLayout('user'), 'convertToRelativePath', array($absolutePath));
-		$this->assertEquals($expected, $relativePath);
-	}
-
-	/**
-	 * @expectedException \Exception
-	 * @expectedExceptionMessage $filePath is not under the \OC::$SERVERROOT
-	 */
-	public function testInvalidConvertToRelativePath() {
-		$invalidFile = '/this/file/is/invalid';
-		$_SERVER['REQUEST_URI'] = $invalidFile;
-		$_SERVER['SCRIPT_NAME'] = '/';
-
-		\Test_Helper::invokePrivate(new \OC_TemplateLayout('user'), 'convertToRelativePath', array($invalidFile));
-	}
-}