Merge pull request #24601 from owncloud/template_psr4

Template to PSR-4

Merge pull request #24601 from owncloud/template_psr4
0b64a0c3 · Vincent Petry · 9cba75ea · 05cc0dd4 · 0b64a0c3 · 0b64a0c3
Commit 0b64a0c3 authored 8 years ago by Vincent Petry
--- a/lib/private/template/base.php
+++ b/lib/private/template/base.php
--- a/lib/private/template/cssresourcelocator.php
+++ b/lib/private/template/cssresourcelocator.php
--- a/lib/private/template/jsresourcelocator.php
+++ b/lib/private/template/jsresourcelocator.php
--- a/lib/private/template/resourcelocator.php
+++ b/lib/private/template/resourcelocator.php
--- a/lib/private/template/resourcenotfoundexception.php
+++ b/lib/private/template/resourcenotfoundexception.php
--- a/lib/private/template/templatefilelocator.php
+++ b/lib/private/template/templatefilelocator.php
--- a/lib/private/legacy/template.php
+++ b/lib/private/legacy/template.php
@@ -36,7 +36,7 @@
 use OC\TemplateLayout;
-require_once __DIR__.'/../template/functions.php';
+require_once __DIR__.'/template/functions.php';
 /**
 * This class provides the templates for ownCloud.

--- a/lib/private/template/functions.php
+++ b/lib/private/template/functions.php
--- a/tests/lib/testcase.php
+++ b/tests/lib/testcase.php
@@ -423,7 +423,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 	 */
 	protected function assertTemplate($expectedHtml, $template, $vars = []) {
-		require_once __DIR__.'/../../lib/private/template/functions.php';
+		require_once __DIR__.'/../../lib/private/legacy/template/functions.php';
 		$requestToken = 12345;
 		$theme = new OC_Defaults();