Merge pull request #24601 from owncloud/template_psr4

Template to PSR-4
2016-05-13 10:56:04 +02:00 · 2016-05-13 10:56:04 +02:00 · 0b64a0c369
parent 9cba75ea8a 05cc0dd478
commit 0b64a0c369
9 changed files with 2 additions and 2 deletions
--- 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/legacy/template/functions.php
+++ b/lib/private/legacy/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();