joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-25 23:02:55 +00:00
Code Packages Releases Activity

[4.0] Namespace JHtml (#28581)

Browse Source 
This namespaces the JHtml helpers as agreed by Production. Fixes #28249
This commit is contained in:
George Wilson 2020-04-11 10:12:48 +01:00 committed by GitHub
parent 975d6a00cc
commit 5c1b0bc990
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
42 changed files with 323 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.php_cs.dist
View File

@ -8,8 +8,7 @@ $topFilesFinder = PhpCsFixer\Finder::create()
$mainFinder = PhpCsFixer\Finder::create()
->in(
array(
__DIR__ . '/libraries/cms',
__DIR__ . '/libraries/joomla',
__DIR__ . '/libraries/src',
)
)
->append($topFilesFinder);

11
administrator/templates/atum/error_login.php
View File

@ -14,7 +14,7 @@ use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Uri\Uri;
/** @var JDocumentHtml $this */
/** @var \Joomla\CMS\Document\HtmlDocument $this */
$app = Factory::getApplication();
$lang = $app->getLanguage();
@ -61,7 +61,14 @@ $this->getWebAssetManager()
$monochrome = (bool) $this->params->get('monochrome');
HTMLHelper::getServiceRegistry()->register('atum', 'JHtmlAtum');
$htmlHelperRegistry = HTMLHelper::getServiceRegistry();
// We may have registered this trying to load the main login page - so check before registering again
if (!$htmlHelperRegistry->hasService('atum'))
{
$htmlHelperRegistry->register('atum', 'JHtmlAtum');
}
HTMLHelper::_('atum.rootcolors', $this->params);
?>
<!DOCTYPE html>

4
build.xml
View File

@ -2,7 +2,7 @@
<project name="joomla" default="build" basedir=".">
<property name="source" value="." />
<property name="joomlasource" value="administrator,cli,components,includes,installation,language/en-GB,libraries/cms,modules,plugins,templates" />
<property name="joomlasource" value="administrator,cli,components,includes,installation,language/en-GB,libraries/src,modules,plugins,templates" />
<target name="clean" description="Clean up and create artifact directories">
<delete dir="${basedir}/build/api" />
@ -77,7 +77,7 @@
<arg value="-i" />
<arg path="${basedir}/libraries/vendor/joomla/*/Tests/,${basedir}/libraries/vendor/joomla/string/src/phputf8/,${basedir}/libraries/vendor/composer/,${basedir}/libraries/vendor/joomla/event/vendor/,${basedir}/libraries/vendor/joomla/session/Joomla/Session/_Tests/,${basedir}/libraries/vendor/joomla/session/Joomla/Session/Tests/,${basedir}/libraries/idna_convert/" />
<arg value="-d" />
<arg path="${basedir}/libraries/cms/,${basedir}/libraries/joomla/,${basedir}/libraries/legacy/,${basedir}/libraries/src/,${basedir}/libraries/vendor/joomla/" />
<arg path="${basedir}/libraries/src/,${basedir}/libraries/vendor/joomla/" />
<arg value="-f" />
<arg path="${basedir}/libraries/loader.php" />
<arg value="-t" />

3
libraries/bootstrap.php
View File

@ -33,9 +33,6 @@ if (!class_exists('JLoader'))
// Setup the autoloaders.
JLoader::setup();
// Register the library base path for CMS libraries.
JLoader::registerPrefix('J', JPATH_PLATFORM . '/cms', false, true);
// Create the Composer autoloader
/** @var \Composer\Autoload\ClassLoader $loader */
$loader = require JPATH_LIBRARIES . '/vendor/autoload.php';

32
libraries/classmap.php
View File

@ -502,3 +502,35 @@ JLoader::registerAlias('JFormFilterInt_Array', '\\Joomla\\CMS\\Form\\Filter\\Int
JLoader::registerAlias('JAdapter', '\\Joomla\\CMS\\Adapter\\Adapter', '5.0');
JLoader::registerAlias('JAdapterInstance', '\\Joomla\\CMS\\Adapter\\AdapterInstance', '5.0');
JLoader::registerAlias('JHtmlAccess', '\\Joomla\\CMS\\HTML\\Helpers\\Access', '5.0');
JLoader::registerAlias('JHtmlActionsDropdown', '\\Joomla\\CMS\\HTML\\Helpers\\ActionsDropdown', '5.0');
JLoader::registerAlias('JHtmlAdminLanguage', '\\Joomla\\CMS\\HTML\\Helpers\\AdminLanguage', '5.0');
JLoader::registerAlias('JHtmlBehavior', '\\Joomla\\CMS\\HTML\\Helpers\\Behavior', '5.0');
JLoader::registerAlias('JHtmlBootstrap', '\\Joomla\\CMS\\HTML\\Helpers\\Bootstrap', '5.0');
JLoader::registerAlias('JHtmlCategory', '\\Joomla\\CMS\\HTML\\Helpers\\Category', '5.0');
JLoader::registerAlias('JHtmlContent', '\\Joomla\\CMS\\HTML\\Helpers\\Content', '5.0');
JLoader::registerAlias('JHtmlContentlanguage', '\\Joomla\\CMS\\HTML\\Helpers\\ContentLanguage', '5.0');
JLoader::registerAlias('JHtmlDate', '\\Joomla\\CMS\\HTML\\Helpers\\Date', '5.0');
JLoader::registerAlias('JHtmlDebug', '\\Joomla\\CMS\\HTML\\Helpers\\Debug', '5.0');
JLoader::registerAlias('JHtmlDraggablelist', '\\Joomla\\CMS\\HTML\\Helpers\\DraggableList', '5.0');
JLoader::registerAlias('JHtmlDropdown', '\\Joomla\\CMS\\HTML\\Helpers\\Dropdown', '5.0');
JLoader::registerAlias('JHtmlEmail', '\\Joomla\\CMS\\HTML\\Helpers\\Email', '5.0');
JLoader::registerAlias('JHtmlForm', '\\Joomla\\CMS\\HTML\\Helpers\\Form', '5.0');
JLoader::registerAlias('JHtmlFormbehavior', '\\Joomla\\CMS\\HTML\\Helpers\\FormBehavior', '5.0');
JLoader::registerAlias('JHtmlGrid', '\\Joomla\\CMS\\HTML\\Helpers\\Grid', '5.0');
JLoader::registerAlias('JHtmlIcons', '\\Joomla\\CMS\\HTML\\Helpers\\Icons', '5.0');
JLoader::registerAlias('JHtmlJGrid', '\\Joomla\\CMS\\HTML\\Helpers\\JGrid', '5.0');
JLoader::registerAlias('JHtmlJquery', '\\Joomla\\CMS\\HTML\\Helpers\\Jquery', '5.0');
JLoader::registerAlias('JHtmlLinks', '\\Joomla\\CMS\\HTML\\Helpers\\Links', '5.0');
JLoader::registerAlias('JHtmlList', '\\Joomla\\CMS\\HTML\\Helpers\\ListHelper', '5.0');
JLoader::registerAlias('JHtmlMenu', '\\Joomla\\CMS\\HTML\\Helpers\\Menu', '5.0');
JLoader::registerAlias('JHtmlNumber', '\\Joomla\\CMS\\HTML\\Helpers\\Number', '5.0');
JLoader::registerAlias('JHtmlSearchtools', '\\Joomla\\CMS\\HTML\\Helpers\\SearchTools', '5.0');
JLoader::registerAlias('JHtmlSelect', '\\Joomla\\CMS\\HTML\\Helpers\\Select', '5.0');
JLoader::registerAlias('JHtmlSidebar', '\\Joomla\\CMS\\HTML\\Helpers\\Sidebar', '5.0');
JLoader::registerAlias('JHtmlSortableList', '\\Joomla\\CMS\\HTML\\Helpers\\SortableList', '5.0');
JLoader::registerAlias('JHtmlString', '\\Joomla\\CMS\\HTML\\Helpers\\StringHelper', '5.0');
JLoader::registerAlias('JHtmlTag', '\\Joomla\\CMS\\HTML\\Helpers\\Tag', '5.0');
JLoader::registerAlias('JHtmlTel', '\\Joomla\\CMS\\HTML\\Helpers\\Telephone', '5.0');
JLoader::registerAlias('JHtmlUser', '\\Joomla\\CMS\\HTML\\Helpers\\User', '5.0');

3
libraries/cms.php
View File

@ -35,9 +35,6 @@ if (!class_exists('JLoader'))
throw new RuntimeException('Joomla Platform not loaded.');
}
// Register the library base path for CMS libraries
JLoader::registerPrefix('J', JPATH_PLATFORM . '/cms', false, true);
// Create the Composer autoloader
$loader = require JPATH_LIBRARIES . '/vendor/autoload.php';

19
libraries/cms/html/access.php → libraries/src/HTML/Helpers/Access.php
View File

@ -1,15 +1,16 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Access\Access;
use Joomla\CMS\Access\Access as AccessCheck;
use Joomla\CMS\Factory;
use Joomla\CMS\Helper\UserGroupsHelper;
use Joomla\CMS\HTML\HTMLHelper;
@ -21,7 +22,7 @@ use Joomla\CMS\Layout\LayoutHelper;
*
* @since 1.6
*/
abstract class JHtmlAccess
abstract class Access
{
/**
* A cached array of the asset groups
@ -159,7 +160,7 @@ abstract class JHtmlAccess
$item = &$groups[$i];
// If checkSuperAdmin is true, only add item if the user is superadmin or the group is not super admin
if ((!$checkSuperAdmin) || $isSuperAdmin || (!Access::checkGroup($item->id, 'core.admin')))
if ((!$checkSuperAdmin) || $isSuperAdmin || (!AccessCheck::checkGroup($item->id, 'core.admin')))
{
// Setup the variable attributes.
$eid = $count . 'group_' . $item->id;
@ -200,7 +201,7 @@ abstract class JHtmlAccess
*
* @return string
*
* @see JAccess
* @see AccessCheck
* @since 1.6
*/
public static function actions($name, $selected, $component, $section = 'global')
@ -209,7 +210,7 @@ abstract class JHtmlAccess
$count++;
$actions = Access::getActionsFromFile(
$actions = AccessCheck::getActionsFromFile(
JPATH_ADMINISTRATOR . '/components/' . $component . '/access.xml',
"/access/section[@name='" . $section . "']/"
);

11
libraries/cms/html/actionsdropdown.php → libraries/src/HTML/Helpers/ActionsDropdown.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Language\Text;
@ -16,7 +17,7 @@ use Joomla\CMS\Language\Text;
*
* @since 3.2
*/
abstract class JHtmlActionsDropdown
abstract class ActionsDropdown
{
/**
* @var string HTML markup for the dropdown list

13
libraries/cms/html/adminlanguage.php → libraries/src/HTML/Helpers/AdminLanguage.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Language\LanguageHelper;
@ -18,7 +19,7 @@ use Joomla\CMS\Object\CMSObject;
*
* @since 3.8.0
*/
abstract class JHtmlAdminLanguage
abstract class AdminLanguage
{
/**
* Cached array of the administrator language items.
@ -34,7 +35,7 @@ abstract class JHtmlAdminLanguage
* @param boolean $all True to include All (*)
* @param boolean $translate True to translate All
*
* @return string
* @return array
*
* @since 3.8.0
*/

11
libraries/cms/html/behavior.php → libraries/src/HTML/Helpers/Behavior.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Factory;
@ -18,7 +19,7 @@ use Joomla\CMS\Language\Text;
*
* @since 1.5
*/
abstract class JHtmlBehavior
abstract class Behavior
{
/**
* Array containing information for loaded files

19
libraries/cms/html/bootstrap.php → libraries/src/HTML/Helpers/Bootstrap.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Factory;
@ -19,7 +20,7 @@ use Joomla\CMS\Layout\LayoutHelper;
*
* @since 3.0
*/
abstract class JHtmlBootstrap
abstract class Bootstrap
{
/**
* @var array Array containing information for loaded files
@ -150,7 +151,7 @@ abstract class JHtmlBootstrap
*/
public static function framework($debug = null)
{
/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
/** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
if ($wa->assetExists('script', 'bootstrap.init.legacy') && $wa->isAssetActive('script', 'bootstrap.init.legacy'))
@ -198,7 +199,7 @@ abstract class JHtmlBootstrap
// Only load once
if (!empty(static::$loaded[__METHOD__][$selector]))
{
return;
return '';
}
// Include Bootstrap framework
@ -394,7 +395,7 @@ abstract class JHtmlBootstrap
// Only load once
if (isset(static::$loaded[__METHOD__][$selector]))
{
return;
return '';
}
// Include Bootstrap framework
@ -533,7 +534,7 @@ abstract class JHtmlBootstrap
$tabScriptLayout = $tabScriptLayout === null ? new FileLayout('libraries.cms.html.bootstrap.addtabscript') : $tabScriptLayout;
$tabLayout = $tabLayout === null ? new FileLayout('libraries.cms.html.bootstrap.addtab') : $tabLayout;
$active = (static::$loaded['JHtmlBootstrap::startTabSet'][$selector]['active'] == $id) ? ' active' : '';
$active = (static::$loaded[__CLASS__ . '::startTabSet'][$selector]['active'] == $id) ? ' active' : '';
// Inject tab into UL
Factory::getDocument()

11
libraries/cms/html/category.php → libraries/src/HTML/Helpers/Category.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Factory;
@ -20,7 +21,7 @@ use Joomla\Utilities\ArrayHelper;
*
* @since 1.5
*/
abstract class JHtmlCategory
abstract class Category
{
/**
* Cached array of the category items.

18
libraries/cms/html/content.php → libraries/src/HTML/Helpers/Content.php
View File

@ -1,27 +1,28 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Date\Date;
use Joomla\CMS\Factory;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\MVC\Model\BaseDatabaseModel;
use Joomla\CMS\Object\CMSObject;
use Joomla\CMS\Plugin\PluginHelper;
use Joomla\Registry\Registry;
/**
* Utility class to fire onContentPrepare for non-article based content.
*
* @since 1.5
*/
abstract class JHtmlContent
abstract class Content
{
/**
* Fire onContentPrepare for content that isn't part of an article.
@ -41,7 +42,7 @@ abstract class JHtmlContent
$params = new CMSObject;
}
$article = new stdClass;
$article = new \stdClass;
$article->text = $text;
PluginHelper::importPlugin('content');
Factory::getApplication()->triggerEvent('onContentPrepare', array($context, &$article, &$params, 0));
@ -63,8 +64,9 @@ abstract class JHtmlContent
/** @var \Joomla\Component\Content\Administrator\Extension\ContentComponent $contentComponent */
$contentComponent = Factory::getApplication()->bootComponent('com_content');
/** @var \Joomla\Component\Content\Site\Model\ArticlesModel $model */
$model = $contentComponent->getMVCFactory()
->createModel('Articles', '', ['ignore_request' => true]);
->createModel('Articles', 'Site', ['ignore_request' => true]);
foreach ($state as $key => $value)
{

13
libraries/cms/html/contentlanguage.php → libraries/src/HTML/Helpers/ContentLanguage.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Factory;
@ -18,7 +19,7 @@ use Joomla\CMS\Object\CMSObject;
*
* @since 1.6
*/
abstract class JHtmlContentLanguage
abstract class ContentLanguage
{
/**
* Cached array of the content language items.
@ -34,7 +35,7 @@ abstract class JHtmlContentLanguage
* @param boolean $all True to include All (*)
* @param boolean $translate True to translate All
*
* @return string
* @return array
*
* @see \Joomla\CMS\Form\Field\ContentlanguageField
* @since 1.6

15
libraries/cms/html/date.php → libraries/src/HTML/Helpers/Date.php
View File

@ -1,15 +1,16 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Date\Date;
use Joomla\CMS\Date\Date as DateHelper;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;
@ -18,7 +19,7 @@ use Joomla\CMS\Language\Text;
*
* @since 2.5
*/
abstract class JHtmlDate
abstract class Date
{
/**
* Function to convert a static time into a relative measurement
@ -38,7 +39,7 @@ abstract class JHtmlDate
if ($time === null)
{
// Get now
$time = new Date('now');
$time = new DateHelper('now');
}
// Get the difference in seconds between now and the time

11
libraries/cms/html/debug.php → libraries/src/HTML/Helpers/Debug.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Filesystem\Path;
@ -17,7 +18,7 @@ use Joomla\CMS\HTML\HTMLHelper;
*
* @since 3.7.0
*/
abstract class JHtmlDebug
abstract class Debug
{
/**
* xdebug.file_link_format from the php.ini.

13
libraries/cms/html/draggablelist.php → libraries/src/HTML/Helpers/DraggableList.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Factory;
@ -17,7 +18,7 @@ use Joomla\CMS\Session\Session;
*
* @since 4.0.0
*/
abstract class JHtmlDraggablelist
abstract class DraggableList
{
/**
* Array containing information for loaded files
@ -40,8 +41,6 @@ abstract class JHtmlDraggablelist
* @return void
*
* @since 4.0.0
*
* @throws InvalidArgumentException
*/
public static function draggable(string $tableId = '', string $formId = '', string $sortDir = 'asc', string $saveOrderingUrl = '',
$redundant = null, bool $nestedList = false

13
libraries/cms/html/dropdown.php → libraries/src/HTML/Helpers/Dropdown.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Factory;
@ -19,7 +20,7 @@ use Joomla\CMS\Router\Route;
*
* @since 3.0
*/
abstract class JHtmlDropdown
abstract class Dropdown
{
/**
* @var array Array containing information for loaded files
@ -119,7 +120,7 @@ abstract class JHtmlDropdown
$dropDownList .= '</ul></div>';
static::$dropDownList = null;
static::$loaded['JHtmlDropdown::start'] = false;
static::$loaded[__CLASS__ . '::start'] = false;
return $dropDownList;
}

11
libraries/cms/html/email.php → libraries/src/HTML/Helpers/Email.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\String\PunycodeHelper;
@ -19,7 +20,7 @@ defined('JPATH_PLATFORM') or die;
*
* @since 1.5
*/
abstract class JHtmlEmail
abstract class Email
{
/**
* Simple JavaScript email cloaker

11
libraries/cms/html/form.php → libraries/src/HTML/Helpers/Form.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Document\HtmlDocument;
@ -19,7 +20,7 @@ use Joomla\Utilities\ArrayHelper;
*
* @since 1.5
*/
abstract class JHtmlForm
abstract class Form
{
/**
* Array containing information for loaded files.

13
libraries/cms/html/formbehavior.php → libraries/src/HTML/Helpers/FormBehavior.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Factory;
@ -21,7 +22,7 @@ use Joomla\Registry\Registry;
*
* @deprecated 5.0 Without replacement
*/
abstract class JHtmlFormbehavior
abstract class FormBehavior
{
/**
* @var array Array containing information for loaded files
@ -92,7 +93,7 @@ abstract class JHtmlFormbehavior
// Add chosen.js assets
/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
/** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
$wa->usePreset('chosen')
->registerAndUseScript('joomla-chosen', 'legacy/joomla-chosen.min.js', [], [], ['chosen'])

15
libraries/cms/html/grid.php → libraries/src/HTML/Helpers/Grid.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Factory;
@ -19,7 +20,7 @@ use Joomla\CMS\Table\Table;
*
* @since 1.5
*/
abstract class JHtmlGrid
abstract class Grid
{
/**
* Method to sort a column in a grid
@ -134,7 +135,7 @@ abstract class JHtmlGrid
/**
* Displays a checked out icon.
*
* @param object &$row A data object (must contain checkedout as a property).
* @param object $row A data object (must contain checked out as a property).
* @param integer $i The index of the row.
* @param string $identifier The property name of the primary key or index of the row.
*
@ -263,7 +264,7 @@ abstract class JHtmlGrid
/**
* Method to create a checked out icon with optional overlib in a grid.
*
* @param object &$row The row object
* @param object $row The row object
* @param boolean $overlib True if an overlib with checkout information should be created.
*
* @return string HTMl for the icon and overlib

13
libraries/cms/html/icons.php → libraries/src/HTML/Helpers/Icons.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Factory;
@ -18,7 +19,7 @@ use Joomla\CMS\Layout\FileLayout;
*
* @since 2.5
*/
abstract class JHtmlIcons
abstract class Icons
{
/**
* Method to generate html code for a list of buttons
@ -33,7 +34,7 @@ abstract class JHtmlIcons
{
if (empty($buttons))
{
return;
return '';
}
$html = array();

11
libraries/cms/html/jgrid.php → libraries/src/HTML/Helpers/JGrid.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Factory;
@ -19,7 +20,7 @@ use Joomla\Utilities\ArrayHelper;
*
* @since 1.6
*/
abstract class JHtmlJGrid
abstract class JGrid
{
/**
* Returns an action on a grid

11
libraries/cms/html/jquery.php → libraries/src/HTML/Helpers/Jquery.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Factory;
@ -17,7 +18,7 @@ use Joomla\CMS\HTML\HTMLHelper;
*
* @since 3.0
*/
abstract class JHtmlJquery
abstract class Jquery
{
/**
* Array containing information for loaded files

11
libraries/cms/html/links.php → libraries/src/HTML/Helpers/Links.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Factory;
@ -18,7 +19,7 @@ use Joomla\CMS\Layout\FileLayout;
*
* @since 3.2
*/
abstract class JHtmlLinks
abstract class Links
{
/**
* Method to generate html code for groups of lists of links

13
libraries/cms/html/list.php → libraries/src/HTML/Helpers/ListHelper.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Factory;
@ -20,7 +21,7 @@ use Joomla\Database\DatabaseQuery;
*
* @since 1.5
*/
abstract class JHtmlList
abstract class ListHelper
{
/**
* Build the select list to choose an image
@ -49,7 +50,7 @@ abstract class JHtmlList
. ".options[selectedIndex].value} else {document.imagelib.src='media/system/images/blank.png'}\"";
}
$imageFiles = new DirectoryIterator(JPATH_SITE . '/' . $directory);
$imageFiles = new \DirectoryIterator(JPATH_SITE . '/' . $directory);
$images = array(HTMLHelper::_('select.option', '', Text::_('JOPTION_SELECT_IMAGE')));
foreach ($imageFiles as $file)

19
libraries/cms/html/menu.php → libraries/src/HTML/Helpers/Menu.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Factory;
@ -19,7 +20,7 @@ use Joomla\Database\ParameterType;
*
* @since 1.5
*/
abstract class JHtmlMenu
abstract class Menu
{
/**
* Cached array of the menus.
@ -183,7 +184,7 @@ abstract class JHtmlMenu
}
// Start group:
$optGroup = new stdClass;
$optGroup = new \stdClass;
$optGroup->value = '<OPTGROUP>';
$optGroup->text = $menu->text;
static::$items[$key][] = $optGroup;
@ -201,7 +202,7 @@ abstract class JHtmlMenu
}
// Finish group:
$closeOptGroup = new stdClass;
$closeOptGroup = new \stdClass;
$closeOptGroup->value = '</OPTGROUP>';
$closeOptGroup->text = $menu->text;
@ -244,7 +245,7 @@ abstract class JHtmlMenu
/**
* Build the select list for Menu Ordering
*
* @param object &$row The row object
* @param object $row The row object
* @param integer $id The id for the row. Must exist to enable menu ordering
*
* @return string
@ -409,7 +410,7 @@ abstract class JHtmlMenu
* @param integer $id Id of the menu item
* @param string $indent The indentation string
* @param array $list The list to process
* @param array &$children The children of the current item
* @param array $children The children of the current item
* @param integer $maxlevel The maximum number of levels in the tree
* @param integer $level The starting level
* @param int $type Set the type of spacer to use. Use 1 for |_ or 0 for -

11
libraries/cms/html/number.php → libraries/src/HTML/Helpers/Number.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Language\Text;
@ -16,7 +17,7 @@ use Joomla\CMS\Language\Text;
*
* @since 1.6
*/
abstract class JHtmlNumber
abstract class Number
{
/**
* Converts bytes to more distinguishable formats such as:

13
libraries/cms/html/searchtools.php → libraries/src/HTML/Helpers/SearchTools.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Factory;
@ -18,7 +19,7 @@ use Joomla\Registry\Registry;
*
* @since 3.2
*/
abstract class JHtmlSearchtools
abstract class SearchTools
{
/**
* @var array Array containing information for loaded files
@ -116,7 +117,7 @@ abstract class JHtmlSearchtools
}
// Create an object to pass it to the layouts
$data = new stdClass;
$data = new \stdClass;
$data->order = $order;
$data->direction = $direction;
$data->selected = $selected;

19
libraries/cms/html/select.php → libraries/src/HTML/Helpers/Select.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\HTML\HTMLHelper;
@ -18,7 +19,7 @@ use Joomla\Utilities\ArrayHelper;
*
* @since 1.5
*/
abstract class JHtmlSelect
abstract class Select
{
/**
* Default values for options. Organized by option group.
@ -178,7 +179,7 @@ abstract class JHtmlSelect
* @return string HTML for the select list
*
* @since 1.5
* @throws RuntimeException If a group has contents that cannot be processed.
* @throws \RuntimeException If a group has contents that cannot be processed.
*/
public static function groupedlist($data, $name, $options = array())
{
@ -272,7 +273,7 @@ abstract class JHtmlSelect
}
else
{
throw new RuntimeException('Invalid group contents.', 1);
throw new \RuntimeException('Invalid group contents.', 1);
}
if ($noGroup)
@ -374,7 +375,7 @@ abstract class JHtmlSelect
* parameter is ignored if an options array is passed.
* @param boolean $disable Not used.
*
* @return stdClass
* @return \stdClass
*
* @since 1.5
*/
@ -403,7 +404,7 @@ abstract class JHtmlSelect
$options['disable'] = $disable;
}
$obj = new stdClass;
$obj = new \stdClass;
$obj->{$options['option.key']} = $value;
$obj->{$options['option.text']} = trim($text) ? $text : $value;

11
libraries/cms/html/sidebar.php → libraries/src/HTML/Helpers/Sidebar.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Factory;
@ -17,7 +18,7 @@ use Joomla\CMS\Layout\FileLayout;
*
* @since 3.0
*/
abstract class JHtmlSidebar
abstract class Sidebar
{
/**
* Menu entries

13
libraries/cms/html/sortablelist.php → libraries/src/HTML/Helpers/SortableList.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\HTML\HTMLHelper;
@ -16,7 +17,7 @@ use Joomla\CMS\HTML\HTMLHelper;
*
* @since 3.0
*/
abstract class JHtmlSortablelist
abstract class SortableList
{
/**
* Method to load the Sortable script and make table sortable
@ -31,8 +32,6 @@ abstract class JHtmlSortablelist
* @return void
*
* @since 3.0
*
* @throws InvalidArgumentException
*/
public static function sortable($tableId, $formId, $sortDir = 'asc', $saveOrderingUrl = null, $proceedSaveOrderButton = true, $nestedList = false)
{

41
libraries/cms/html/string.php → libraries/src/HTML/Helpers/StringHelper.php
View File

@ -1,23 +1,24 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\String\StringHelper;
use Joomla\String\StringHelper as FrameworkStringHelper;
/**
* HTML helper class for rendering manipulated strings.
*
* @since 1.6
*/
abstract class JHtmlString
abstract class StringHelper
{
/**
* Truncates text blocks over the specified character limit and closes
@ -48,7 +49,7 @@ abstract class JHtmlString
// Deal with spacing issues in the input.
$text = str_replace('>', '> ', $text);
$text = str_replace(array('&nbsp;', '&#160;'), ' ', $text);
$text = StringHelper::trim(preg_replace('#\s+#mui', ' ', $text));
$text = FrameworkStringHelper::trim(preg_replace('#\s+#mui', ' ', $text));
// Strip the tags from the input and decode entities.
$text = strip_tags($text);
@ -56,13 +57,13 @@ abstract class JHtmlString
// Remove remaining extra spaces.
$text = str_replace('&nbsp;', ' ', $text);
$text = StringHelper::trim(preg_replace('#\s+#mui', ' ', $text));
$text = FrameworkStringHelper::trim(preg_replace('#\s+#mui', ' ', $text));
}
// Whether or not allowing HTML, truncate the item text if it is too long.
if ($length > 0 && StringHelper::strlen($text) > $length)
if ($length > 0 && FrameworkStringHelper::strlen($text) > $length)
{
$tmp = trim(StringHelper::substr($text, 0, $length));
$tmp = trim(FrameworkStringHelper::substr($text, 0, $length));
if ($tmp[0] === '<' && strpos($tmp, '>') === false)
{
@ -73,8 +74,8 @@ abstract class JHtmlString
if ($noSplit)
{
// Find the position of the last space within the allowed length.
$offset = StringHelper::strrpos($tmp, ' ');
$tmp = StringHelper::substr($tmp, 0, $offset + 1);
$offset = FrameworkStringHelper::strrpos($tmp, ' ');
$tmp = FrameworkStringHelper::substr($tmp, 0, $offset + 1);
// If there are no spaces and the string is longer than the maximum
// we need to just use the ellipsis. In that case we are done.
@ -83,9 +84,9 @@ abstract class JHtmlString
return '...';
}
if (StringHelper::strlen($tmp) > $length - 3)
if (FrameworkStringHelper::strlen($tmp) > $length - 3)
{
$tmp = trim(StringHelper::substr($tmp, 0, StringHelper::strrpos($tmp, ' ')));
$tmp = trim(FrameworkStringHelper::substr($tmp, 0, FrameworkStringHelper::strrpos($tmp, ' ')));
}
}
@ -126,10 +127,10 @@ abstract class JHtmlString
}
// Check if we are within a tag
if (StringHelper::strrpos($tmp, '<') > StringHelper::strrpos($tmp, '>'))
if (FrameworkStringHelper::strrpos($tmp, '<') > FrameworkStringHelper::strrpos($tmp, '>'))
{
$offset = StringHelper::strrpos($tmp, '<');
$tmp = StringHelper::trim(StringHelper::substr($tmp, 0, $offset));
$offset = FrameworkStringHelper::strrpos($tmp, '<');
$tmp = FrameworkStringHelper::trim(FrameworkStringHelper::substr($tmp, 0, $offset));
}
}
@ -284,14 +285,14 @@ abstract class JHtmlString
public static function abridge($text, $length = 50, $intro = 30)
{
// Abridge the item text if it is too long.
if (StringHelper::strlen($text) > $length)
if (FrameworkStringHelper::strlen($text) > $length)
{
// Determine the remaining text length.
$remainder = $length - ($intro + 3);
// Extract the beginning and ending text sections.
$beg = StringHelper::substr($text, 0, $intro);
$end = StringHelper::substr($text, StringHelper::strlen($text) - $remainder);
$beg = FrameworkStringHelper::substr($text, 0, $intro);
$end = FrameworkStringHelper::substr($text, FrameworkStringHelper::strlen($text) - $remainder);
// Build the resulting string.
$text = $beg . '...' . $end;

11
libraries/cms/html/tag.php → libraries/src/HTML/Helpers/Tag.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Component\ComponentHelper;
@ -22,7 +23,7 @@ use Joomla\Utilities\ArrayHelper;
*
* @since 3.1
*/
abstract class JHtmlTag
abstract class Tag
{
/**
* Cached array of the tag items.

11
libraries/cms/html/tel.php → libraries/src/HTML/Helpers/Telephone.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
/**
@ -14,7 +15,7 @@ defined('JPATH_PLATFORM') or die;
*
* @since 1.6
*/
abstract class JHtmlTel
abstract class Telephone
{
/**
* Converts strings of integers into more readable telephone format

11
libraries/cms/html/uitab.php → libraries/src/HTML/Helpers/UiTab.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Factory;
@ -16,7 +17,7 @@ use Joomla\CMS\Factory;
*
* @since 4.0.0
*/
abstract class JHtmlUiTab
abstract class UiTab
{
/**
* @var array Array containing information for loaded files

11
libraries/cms/html/user.php → libraries/src/HTML/Helpers/User.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Access\Access;
@ -19,7 +20,7 @@ use Joomla\CMS\HTML\HTMLHelper;
*
* @since 2.5
*/
abstract class JHtmlUser
abstract class User
{
/**
* Displays a list of user groups.

11
libraries/cms/html/workflowstage.php → libraries/src/HTML/Helpers/WorkflowStage.php
View File

@ -1,12 +1,13 @@
<?php
/**
* @package Joomla.Libraries
* @subpackage HTML
* Joomla! Content Management System
*
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @copyright Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
namespace Joomla\CMS\HTML\Helpers;
defined('JPATH_PLATFORM') or die;
use Joomla\CMS\Factory;
@ -18,7 +19,7 @@ use Joomla\CMS\Language\Text;
*
* @since 4.0.0
*/
abstract class JHtmlWorkflowstage
abstract class WorkflowStage
{
/**

78
libraries/src/HTML/Registry.php
View File

@ -20,55 +20,45 @@ final class Registry
/**
* Mapping array of the core CMS JHtml helpers
*
* As of 5.0, the $serviceMap will be prepopulated with the contents of this array
*
* @var array
* @since 4.0.0
*/
private $coreServiceMap = [
'access' => \JHtmlAccess::class,
'actionsdropdown' => \JHtmlActionsDropdown::class,
'adminlanguage' => \JHtmlAdminLanguage::class,
'behavior' => \JHtmlBehavior::class,
'bootstrap' => \JHtmlBootstrap::class,
'category' => \JHtmlCategory::class,
'content' => \JHtmlContent::class,
'contentlanguage' => \JHtmlContentlanguage::class,
'date' => \JHtmlDate::class,
'debug' => \JHtmlDebug::class,
'draggablelist' => \JHtmlDraggablelist::class,
'dropdown' => \JHtmlDropdown::class,
'email' => \JHtmlEmail::class,
'form' => \JHtmlForm::class,
'formbehavior' => \JHtmlFormbehavior::class,
'grid' => \JHtmlGrid::class,
'icons' => \JHtmlIcons::class,
'jgrid' => \JHtmlJGrid::class,
'jquery' => \JHtmlJquery::class,
'links' => \JHtmlLinks::class,
'list' => \JHtmlList::class,
'menu' => \JHtmlMenu::class,
'number' => \JHtmlNumber::class,
'searchtools' => \JHtmlSearchtools::class,
'select' => \JHtmlSelect::class,
'sidebar' => \JHtmlSidebar::class,
'sortablelist' => \JHtmlSortablelist::class,
'string' => \JHtmlString::class,
'tag' => \JHtmlTag::class,
'tel' => \JHtmlTel::class,
'uitab' => \JHtmlUiTab::class,
'user' => \JHtmlUser::class,
'workflowstage' => \JHtmlWorkflowstage::class,
private $serviceMap = [
'access' => Helpers\Access::class,
'actionsdropdown' => Helpers\ActionsDropdown::class,
'adminlanguage' => Helpers\AdminLanguage::class,
'behavior' => Helpers\Behavior::class,
'bootstrap' => Helpers\Bootstrap::class,
'category' => Helpers\Category::class,
'content' => Helpers\Content::class,
'contentlanguage' => Helpers\ContentLanguage::class,
'date' => Helpers\Date::class,
'debug' => Helpers\Debug::class,
'draggablelist' => Helpers\DraggableList::class,
'dropdown' => Helpers\Dropdown::class,
'email' => Helpers\Email::class,
'form' => Helpers\Form::class,
'formbehavior' => Helpers\FormBehavior::class,
'grid' => Helpers\Grid::class,
'icons' => Helpers\Icons::class,
'jgrid' => Helpers\JGrid::class,
'jquery' => Helpers\Jquery::class,
'links' => Helpers\Links::class,
'list' => Helpers\ListHelper::class,
'menu' => Helpers\Menu::class,
'number' => Helpers\Number::class,
'searchtools' => Helpers\SearchTools::class,
'select' => Helpers\Select::class,
'sidebar' => Helpers\Sidebar::class,
'sortablelist' => Helpers\SortableList::class,
'string' => Helpers\StringHelper::class,
'tag' => Helpers\Tag::class,
'tel' => Helpers\Telephone::class,
'uitab' => Helpers\UiTab::class,
'user' => Helpers\User::class,
'workflowstage' => Helpers\WorkflowStage::class,
];
/**
* Array holding the registered services
*
* @var array
* @since 4.0.0
*/
private $serviceMap = [];
/**
* Get the service for a given key
*

4
plugins/system/debug/debug.php
View File

@ -610,9 +610,7 @@ class PlgSystemDebug extends CMSPlugin
$category = $entry->category;
$relative = str_replace(JPATH_ROOT, '', $file);
if (0 === strpos($relative, '/libraries/joomla')
|| 0 === strpos($relative, '/libraries/cms')
|| 0 === strpos($relative, '/libraries/src'))
if (0 === strpos($relative, '/libraries/src'))
{
if (!$logDeprecatedCore)
{

3
tests/Unit/bootstrap.php
View File

@ -105,9 +105,6 @@ if (!class_exists('JLoader'))
// Setup the autoloaders.
JLoader::setup();
// Register the library base path for CMS libraries.
JLoader::registerPrefix('J', JPATH_PLATFORM . '/cms', false, true);
// Create the Composer autoloader
/** @var \Composer\Autoload\ClassLoader $loader */
$loader = require JPATH_LIBRARIES . '/vendor/autoload.php';