From eb79b8383107c71f8def60d195de09a1152af263 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Thu, 12 May 2016 13:32:02 +0200 Subject: [PATCH 1/2] Move functions.php to legacy This file should really be properly namespaced etc! --- lib/private/legacy/template.php | 2 +- lib/private/{ => legacy}/template/functions.php | 0 tests/lib/testcase.php | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename lib/private/{ => legacy}/template/functions.php (100%) diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php index 84b963e4ab..7372552970 100644 --- 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. diff --git a/lib/private/template/functions.php b/lib/private/legacy/template/functions.php similarity index 100% rename from lib/private/template/functions.php rename to lib/private/legacy/template/functions.php diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php index d7573337f8..7ed121d355 100644 --- 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(); From 05cc0dd47881816ef9c91c8883dafc0716cd6d6c Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Thu, 12 May 2016 14:01:14 +0200 Subject: [PATCH 2/2] Move \OC\Template to PSR-4 --- lib/private/{template/base.php => Template/Base.php} | 0 .../cssresourcelocator.php => Template/CSSResourceLocator.php} | 0 .../jsresourcelocator.php => Template/JSResourceLocator.php} | 0 .../resourcelocator.php => Template/ResourceLocator.php} | 0 .../ResourceNotFoundException.php} | 0 .../templatefilelocator.php => Template/TemplateFileLocator.php} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename lib/private/{template/base.php => Template/Base.php} (100%) rename lib/private/{template/cssresourcelocator.php => Template/CSSResourceLocator.php} (100%) rename lib/private/{template/jsresourcelocator.php => Template/JSResourceLocator.php} (100%) rename lib/private/{template/resourcelocator.php => Template/ResourceLocator.php} (100%) rename lib/private/{template/resourcenotfoundexception.php => Template/ResourceNotFoundException.php} (100%) rename lib/private/{template/templatefilelocator.php => Template/TemplateFileLocator.php} (100%) diff --git a/lib/private/template/base.php b/lib/private/Template/Base.php similarity index 100% rename from lib/private/template/base.php rename to lib/private/Template/Base.php diff --git a/lib/private/template/cssresourcelocator.php b/lib/private/Template/CSSResourceLocator.php similarity index 100% rename from lib/private/template/cssresourcelocator.php rename to lib/private/Template/CSSResourceLocator.php diff --git a/lib/private/template/jsresourcelocator.php b/lib/private/Template/JSResourceLocator.php similarity index 100% rename from lib/private/template/jsresourcelocator.php rename to lib/private/Template/JSResourceLocator.php diff --git a/lib/private/template/resourcelocator.php b/lib/private/Template/ResourceLocator.php similarity index 100% rename from lib/private/template/resourcelocator.php rename to lib/private/Template/ResourceLocator.php diff --git a/lib/private/template/resourcenotfoundexception.php b/lib/private/Template/ResourceNotFoundException.php similarity index 100% rename from lib/private/template/resourcenotfoundexception.php rename to lib/private/Template/ResourceNotFoundException.php diff --git a/lib/private/template/templatefilelocator.php b/lib/private/Template/TemplateFileLocator.php similarity index 100% rename from lib/private/template/templatefilelocator.php rename to lib/private/Template/TemplateFileLocator.php