From 802be173dae6d77dea2bb94cde0aadb27d350857 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Thu, 19 May 2016 15:31:32 +0200 Subject: \OCP is handled by composer autoloader --- lib/autoloader.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/autoloader.php b/lib/autoloader.php index 73783603438..89b66a426a7 100644 --- a/lib/autoloader.php +++ b/lib/autoloader.php @@ -102,8 +102,6 @@ class Autoloader { } } elseif (strpos($class, 'OC_') === 0) { $paths[] = \OC::$SERVERROOT . '/lib/private/legacy/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php'); - } elseif (strpos($class, 'OCP\\') === 0) { - $paths[] = \OC::$SERVERROOT . '/lib/public/' . strtolower(str_replace('\\', '/', substr($class, 4)) . '.php'); } elseif (strpos($class, 'OCA\\') === 0) { list(, $app, $rest) = explode('\\', $class, 3); $app = strtolower($app); -- cgit v1.2.3 From c9ad60defc7961a83e14c1a5518db5e26caeff1f Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Thu, 19 May 2016 15:32:20 +0200 Subject: Only allow loading of legacy (lib/private/legacy) by default --- lib/base.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/base.php b/lib/base.php index eddcec97b1f..391bcf865a0 100644 --- a/lib/base.php +++ b/lib/base.php @@ -481,11 +481,7 @@ class OC { $loaderStart = microtime(true); require_once __DIR__ . '/autoloader.php'; self::$loader = new \OC\Autoloader([ - OC::$SERVERROOT . '/lib', - OC::$SERVERROOT . '/core', - OC::$SERVERROOT . '/settings', - OC::$SERVERROOT . '/ocs', - OC::$SERVERROOT . '/ocs-provider', + OC::$SERVERROOT . '/lib/private/legacy', ]); if (defined('PHPUNIT_RUN')) { self::$loader->addValidRoot(OC::$SERVERROOT . '/tests'); -- cgit v1.2.3 From 54b637e83c87086e30226050f4d167e8cec57218 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Thu, 19 May 2016 16:04:09 +0200 Subject: Fix unit tests --- tests/lib/AutoLoaderTest.php | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/tests/lib/AutoLoaderTest.php b/tests/lib/AutoLoaderTest.php index a97ba3f768e..38ba29bc085 100644 --- a/tests/lib/AutoLoaderTest.php +++ b/tests/lib/AutoLoaderTest.php @@ -19,18 +19,6 @@ class AutoLoaderTest extends TestCase { $this->loader = new \OC\AutoLoader([]); } - public function testLeadingSlashOnClassName() { - $this->assertEquals([ - \OC::$SERVERROOT . '/lib/public/files/storage/local.php', - ], $this->loader->findClass('\OCP\Files\Storage\Local')); - } - - public function testNoLeadingSlashOnClassName() { - $this->assertEquals([ - \OC::$SERVERROOT . '/lib/public/files/storage/local.php', - ], $this->loader->findClass('OCP\Files\Storage\Local')); - } - public function testLegacyPath() { $this->assertEquals([ \OC::$SERVERROOT . '/lib/private/legacy/files.php', @@ -50,9 +38,7 @@ class AutoLoaderTest extends TestCase { } public function testLoadPublicNamespace() { - $this->assertEquals([ - \OC::$SERVERROOT . '/lib/public/foo/bar.php', - ], $this->loader->findClass('OCP\Foo\Bar')); + $this->assertEquals([], $this->loader->findClass('OCP\Foo\Bar')); } public function testLoadAppNamespace() { -- cgit v1.2.3 From edb512bf4dc79d09ec4eef926740abd258c821c1 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Thu, 19 May 2016 16:49:07 +0200 Subject: Move Template to PSR-4 --- lib/public/Template.php | 230 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/public/template.php | 230 ------------------------------------------------ 2 files changed, 230 insertions(+), 230 deletions(-) create mode 100644 lib/public/Template.php delete mode 100644 lib/public/template.php diff --git a/lib/public/Template.php b/lib/public/Template.php new file mode 100644 index 00000000000..7e46745c9d8 --- /dev/null +++ b/lib/public/Template.php @@ -0,0 +1,230 @@ + + * @author Frank Karlitschek + * @author Georg Ehrke + * @author Jan-Christoph Borchardt + * @author Joas Schilling + * @author Jörn Friedrich Dreyer + * @author Morris Jobke + * @author Robin McCorkell + * @author Thomas Müller + * @author Vincent Petry + * + * @copyright Copyright (c) 2016, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see + * + */ + +/** + * Public interface of ownCloud for apps to use. + * Template Class + * + */ + +// use OCP namespace for all classes that are considered public. +// This means that they should be used by apps instead of the internal ownCloud classes +namespace OCP; + + +/** + * Make OC_Helper::imagePath available as a simple function + * @param string $app + * @param string $image + * @return string to the image + * + * @see \OCP\IURLGenerator::imagePath + * @deprecated 8.0.0 Use \OCP\Template::image_path() instead + */ +function image_path( $app, $image ) { + return(\image_path( $app, $image )); +} + + +/** + * Make OC_Helper::mimetypeIcon available as a simple function + * @param string $mimetype + * @return string to the image of this file type. + * @deprecated 8.0.0 Use \OCP\Template::mimetype_icon() instead + */ +function mimetype_icon( $mimetype ) { + return(\mimetype_icon( $mimetype )); +} + +/** + * Make preview_icon available as a simple function + * @param string $path path to file + * @return string to the preview of the image + * @deprecated 8.0.0 Use \OCP\Template::preview_icon() instead + */ +function preview_icon( $path ) { + return(\preview_icon( $path )); +} + +/** + * Make publicpreview_icon available as a simple function + * Returns the path to the preview of the image. + * @param string $path of file + * @param string $token + * @return string link to the preview + * @deprecated 8.0.0 Use \OCP\Template::publicPreview_icon() instead + */ +function publicPreview_icon ( $path, $token ) { + return(\publicPreview_icon( $path, $token )); +} + +/** + * Make OC_Helper::humanFileSize available as a simple function + * Example: 2048 to 2 kB. + * @param int $bytes in bytes + * @return string size as string + * @deprecated 8.0.0 Use \OCP\Template::human_file_size() instead + */ +function human_file_size( $bytes ) { + return(\human_file_size( $bytes )); +} + + +/** + * Return the relative date in relation to today. Returns something like "last hour" or "two month ago" + * @param int $timestamp unix timestamp + * @param boolean $dateOnly + * @return \OC_L10N_String human readable interpretation of the timestamp + * + * @deprecated 8.0.0 Use \OCP\Template::relative_modified_date() instead + */ +function relative_modified_date( $timestamp, $dateOnly = false ) { + return(\relative_modified_date($timestamp, null, $dateOnly)); +} + + +/** + * Return a human readable outout for a file size. + * @param integer $bytes size of a file in byte + * @return string human readable interpretation of a file size + * @deprecated 8.0.0 Use \OCP\Template::human_file_size() instead + */ +function simple_file_size($bytes) { + return(\human_file_size($bytes)); +} + + +/** + * Generate html code for an options block. + * @param array $options the options + * @param mixed $selected which one is selected? + * @param array $params the parameters + * @return string html options + * @deprecated 8.0.0 Use \OCP\Template::html_select_options() instead + */ +function html_select_options($options, $selected, $params=array()) { + return(\html_select_options($options, $selected, $params)); +} + + +/** + * This class provides the template system for owncloud. You can use it to load + * specific templates, add data and generate the html code + * + * @since 8.0.0 + */ +class Template extends \OC_Template { + /** + * Make OC_Helper::imagePath available as a simple function + * + * @see \OCP\IURLGenerator::imagePath + * + * @param string $app + * @param string $image + * @return string to the image + * @since 8.0.0 + */ + public static function image_path($app, $image) { + return \image_path($app, $image); + } + + + /** + * Make OC_Helper::mimetypeIcon available as a simple function + * + * @param string $mimetype + * @return string to the image of this file type. + * @since 8.0.0 + */ + public static function mimetype_icon($mimetype) { + return \mimetype_icon($mimetype); + } + + /** + * Make preview_icon available as a simple function + * + * @param string $path path to file + * @return string to the preview of the image + * @since 8.0.0 + */ + public static function preview_icon($path) { + return \preview_icon($path); + } + + /** + * Make publicpreview_icon available as a simple function + * Returns the path to the preview of the image. + * + * @param string $path of file + * @param string $token + * @return string link to the preview + * @since 8.0.0 + */ + public static function publicPreview_icon($path, $token) { + return \publicPreview_icon($path, $token); + } + + /** + * Make OC_Helper::humanFileSize available as a simple function + * Example: 2048 to 2 kB. + * + * @param int $bytes in bytes + * @return string size as string + * @since 8.0.0 + */ + public static function human_file_size($bytes) { + return \human_file_size($bytes); + } + + /** + * Return the relative date in relation to today. Returns something like "last hour" or "two month ago" + * + * @param int $timestamp unix timestamp + * @param boolean $dateOnly + * @return string human readable interpretation of the timestamp + * @since 8.0.0 + */ + public static function relative_modified_date($timestamp, $dateOnly = false) { + return \relative_modified_date($timestamp, null, $dateOnly); + } + + /** + * Generate html code for an options block. + * + * @param array $options the options + * @param mixed $selected which one is selected? + * @param array $params the parameters + * @return string html options + * @since 8.0.0 + */ + public static function html_select_options($options, $selected, $params=array()) { + return \html_select_options($options, $selected, $params); + } +} diff --git a/lib/public/template.php b/lib/public/template.php deleted file mode 100644 index 7e46745c9d8..00000000000 --- a/lib/public/template.php +++ /dev/null @@ -1,230 +0,0 @@ - - * @author Frank Karlitschek - * @author Georg Ehrke - * @author Jan-Christoph Borchardt - * @author Joas Schilling - * @author Jörn Friedrich Dreyer - * @author Morris Jobke - * @author Robin McCorkell - * @author Thomas Müller - * @author Vincent Petry - * - * @copyright Copyright (c) 2016, ownCloud, Inc. - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see - * - */ - -/** - * Public interface of ownCloud for apps to use. - * Template Class - * - */ - -// use OCP namespace for all classes that are considered public. -// This means that they should be used by apps instead of the internal ownCloud classes -namespace OCP; - - -/** - * Make OC_Helper::imagePath available as a simple function - * @param string $app - * @param string $image - * @return string to the image - * - * @see \OCP\IURLGenerator::imagePath - * @deprecated 8.0.0 Use \OCP\Template::image_path() instead - */ -function image_path( $app, $image ) { - return(\image_path( $app, $image )); -} - - -/** - * Make OC_Helper::mimetypeIcon available as a simple function - * @param string $mimetype - * @return string to the image of this file type. - * @deprecated 8.0.0 Use \OCP\Template::mimetype_icon() instead - */ -function mimetype_icon( $mimetype ) { - return(\mimetype_icon( $mimetype )); -} - -/** - * Make preview_icon available as a simple function - * @param string $path path to file - * @return string to the preview of the image - * @deprecated 8.0.0 Use \OCP\Template::preview_icon() instead - */ -function preview_icon( $path ) { - return(\preview_icon( $path )); -} - -/** - * Make publicpreview_icon available as a simple function - * Returns the path to the preview of the image. - * @param string $path of file - * @param string $token - * @return string link to the preview - * @deprecated 8.0.0 Use \OCP\Template::publicPreview_icon() instead - */ -function publicPreview_icon ( $path, $token ) { - return(\publicPreview_icon( $path, $token )); -} - -/** - * Make OC_Helper::humanFileSize available as a simple function - * Example: 2048 to 2 kB. - * @param int $bytes in bytes - * @return string size as string - * @deprecated 8.0.0 Use \OCP\Template::human_file_size() instead - */ -function human_file_size( $bytes ) { - return(\human_file_size( $bytes )); -} - - -/** - * Return the relative date in relation to today. Returns something like "last hour" or "two month ago" - * @param int $timestamp unix timestamp - * @param boolean $dateOnly - * @return \OC_L10N_String human readable interpretation of the timestamp - * - * @deprecated 8.0.0 Use \OCP\Template::relative_modified_date() instead - */ -function relative_modified_date( $timestamp, $dateOnly = false ) { - return(\relative_modified_date($timestamp, null, $dateOnly)); -} - - -/** - * Return a human readable outout for a file size. - * @param integer $bytes size of a file in byte - * @return string human readable interpretation of a file size - * @deprecated 8.0.0 Use \OCP\Template::human_file_size() instead - */ -function simple_file_size($bytes) { - return(\human_file_size($bytes)); -} - - -/** - * Generate html code for an options block. - * @param array $options the options - * @param mixed $selected which one is selected? - * @param array $params the parameters - * @return string html options - * @deprecated 8.0.0 Use \OCP\Template::html_select_options() instead - */ -function html_select_options($options, $selected, $params=array()) { - return(\html_select_options($options, $selected, $params)); -} - - -/** - * This class provides the template system for owncloud. You can use it to load - * specific templates, add data and generate the html code - * - * @since 8.0.0 - */ -class Template extends \OC_Template { - /** - * Make OC_Helper::imagePath available as a simple function - * - * @see \OCP\IURLGenerator::imagePath - * - * @param string $app - * @param string $image - * @return string to the image - * @since 8.0.0 - */ - public static function image_path($app, $image) { - return \image_path($app, $image); - } - - - /** - * Make OC_Helper::mimetypeIcon available as a simple function - * - * @param string $mimetype - * @return string to the image of this file type. - * @since 8.0.0 - */ - public static function mimetype_icon($mimetype) { - return \mimetype_icon($mimetype); - } - - /** - * Make preview_icon available as a simple function - * - * @param string $path path to file - * @return string to the preview of the image - * @since 8.0.0 - */ - public static function preview_icon($path) { - return \preview_icon($path); - } - - /** - * Make publicpreview_icon available as a simple function - * Returns the path to the preview of the image. - * - * @param string $path of file - * @param string $token - * @return string link to the preview - * @since 8.0.0 - */ - public static function publicPreview_icon($path, $token) { - return \publicPreview_icon($path, $token); - } - - /** - * Make OC_Helper::humanFileSize available as a simple function - * Example: 2048 to 2 kB. - * - * @param int $bytes in bytes - * @return string size as string - * @since 8.0.0 - */ - public static function human_file_size($bytes) { - return \human_file_size($bytes); - } - - /** - * Return the relative date in relation to today. Returns something like "last hour" or "two month ago" - * - * @param int $timestamp unix timestamp - * @param boolean $dateOnly - * @return string human readable interpretation of the timestamp - * @since 8.0.0 - */ - public static function relative_modified_date($timestamp, $dateOnly = false) { - return \relative_modified_date($timestamp, null, $dateOnly); - } - - /** - * Generate html code for an options block. - * - * @param array $options the options - * @param mixed $selected which one is selected? - * @param array $params the parameters - * @return string html options - * @since 8.0.0 - */ - public static function html_select_options($options, $selected, $params=array()) { - return \html_select_options($options, $selected, $params); - } -} -- cgit v1.2.3