Skip to content

Commit

Permalink
Merge branch '3.8-dev' into j3/namespace/router
Browse files Browse the repository at this point in the history
  • Loading branch information
@wilsonge
wilsonge committed May 18, 2017
2 parents c862a61 + 428c313 commit 9dcb1ac
Show file tree
Hide file tree
Showing 32 changed files with 1,372 additions and 1,120 deletions.
165 changes: 165 additions & 0 deletions administrator/components/com_admin/script.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1767,6 +1767,128 @@ public function deleteUnexistingFiles()
// Joomla 3.7.1
'/media/editors/tinymce/langs/uk-UA.js',
'/media/system/js/fields/calendar-locales/zh.js',
// Joomla 3.8.0
'/libraries/cms/application/administrator.php',
'/libraries/cms/application/cms.php',
'/libraries/cms/application/helper.php',
'/libraries/cms/application/site.php',
'/libraries/cms/authentication/helper.php',
'/libraries/cms/captcha/captcha.php',
'/libraries/cms/component/helper.php',
'/libraries/cms/component/record.php',
'/libraries/cms/component/exception/missing.php',
'/libraries/cms/component/router/rules/interface.php',
'/libraries/cms/component/router/rules/menu.php',
'/libraries/cms/component/router/rules/nomenu.php',
'/libraries/cms/component/router/rules/standard.php',
'/libraries/cms/component/router/base.php',
'/libraries/cms/component/router/interface.php',
'/libraries/cms/component/router/legacy.php',
'/libraries/cms/component/router/view.php',
'/libraries/cms/component/router/viewconfiguration.php',
'/libraries/cms/editor/editor.php',
'/libraries/cms/error/page.php',
'/libraries/cms/help/help.php',
'/libraries/cms/helper/content.php',
'/libraries/cms/helper/contenthistory.php',
'/libraries/cms/helper/helper.php',
'/libraries/cms/helper/media.php',
'/libraries/cms/helper/route.php',
'/libraries/cms/helper/tags.php',
'/libraries/cms/helper/usergroups.php',
'/libraries/cms/language/multilang.php',
'/libraries/cms/layout/base.php',
'/libraries/cms/layout/file.php',
'/libraries/cms/layout/helper.php',
'/libraries/cms/layout/layout.php',
'/libraries/cms/library/helper.php',
'/libraries/cms/menu/administrator.php',
'/libraries/cms/menu/item.php',
'/libraries/cms/menu/menu.php',
'/libraries/cms/menu/site.php',
'/libraries/cms/module/helper.php',
'/libraries/cms/pagination/object.php',
'/libraries/cms/pagination/pagination.php',
'/libraries/cms/pathway/pathway.php',
'/libraries/cms/pathway/site.php',
'/libraries/cms/plugin/helper.php',
'/libraries/cms/plugin/plugin.php',
'/libraries/cms/response/json.php',
'/libraries/cms/schema/changeitem.php',
'/libraries/cms/schema/changeitem/mysql.php',
'/libraries/cms/schema/changeitem/postgresql.php',
'/libraries/cms/schema/changeitem/sqlsrv.php',
'/libraries/cms/schema/changeset.php',
'/libraries/cms/search/helper.php',
'/libraries/cms/table/contenthistory.php',
'/libraries/cms/table/contenttype.php',
'/libraries/cms/table/corecontent.php',
'/libraries/cms/table/ucm.php',
'/libraries/cms/toolbar/button.php',
'/libraries/cms/toolbar/button/confirm.php',
'/libraries/cms/toolbar/button/custom.php',
'/libraries/cms/toolbar/button/help.php',
'/libraries/cms/toolbar/button/link.php',
'/libraries/cms/toolbar/button/popup.php',
'/libraries/cms/toolbar/button/separator.php',
'/libraries/cms/toolbar/button/slider.php',
'/libraries/cms/toolbar/button/standard.php',
'/libraries/cms/toolbar/toolbar.php',
'/libraries/cms/ucm/base.php',
'/libraries/cms/ucm/content.php',
'/libraries/cms/ucm/type.php',
'/libraries/cms/version/version.php',
'/libraries/joomla/access/access.php',
'/libraries/joomla/access/exception/notallowed.php',
'/libraries/joomla/access/rule.php',
'/libraries/joomla/access/rules.php',
'/libraries/joomla/access/wrapper/access.php',
'/libraries/joomla/application/base.php',
'/libraries/joomla/application/cli.php',
'/libraries/joomla/application/daemon.php',
'/libraries/joomla/application/web.php',
'/libraries/joomla/association/extension/helper.php',
'/libraries/joomla/association/extension/interface.php',
'/libraries/joomla/authentication/authentication.php',
'/libraries/joomla/authentication/response.php',
'/libraries/joomla/language/helper.php',
'/libraries/joomla/language/language.php',
'/libraries/joomla/language/stemmer.php',
'/libraries/joomla/language/stemmer/porteren.php',
'/libraries/joomla/language/transliterate.php',
'/libraries/joomla/language/wrapper/helper.php',
'/libraries/joomla/language/wrapper/text.php',
'/libraries/joomla/language/wrapper/transliterate.php',
'/libraries/joomla/table/asset.php',
'/libraries/joomla/table/extension.php',
'/libraries/joomla/table/interface.php',
'/libraries/joomla/table/language.php',
'/libraries/joomla/table/nested.php',
'/libraries/joomla/table/observer.php',
'/libraries/joomla/table/observer/contenthistory.php',
'/libraries/joomla/table/observer/tags.php',
'/libraries/joomla/table/table.php',
'/libraries/joomla/table/update.php',
'/libraries/joomla/table/updatesite.php',
'/libraries/joomla/table/user.php',
'/libraries/joomla/table/usergroup.php',
'/libraries/joomla/table/viewlevel.php',
'/libraries/legacy/access/rule.php',
'/libraries/legacy/access/rules.php',
'/libraries/legacy/application/cli.php',
'/libraries/legacy/application/daemon.php',
'/libraries/legacy/controller/admin.php',
'/libraries/legacy/controller/form.php',
'/libraries/legacy/controller/legacy.php',
'/libraries/legacy/model/admin.php',
'/libraries/legacy/model/form.php',
'/libraries/legacy/model/item.php',
'/libraries/legacy/model/legacy.php',
'/libraries/legacy/model/list.php',
'/libraries/legacy/view/categories.php',
'/libraries/legacy/view/category.php',
'/libraries/legacy/view/categoryfeed.php',
'/libraries/legacy/view/legacy.php',
);

// TODO There is an issue while deleting folders using the ftp mode
Expand Down Expand Up @@ -1896,6 +2018,49 @@ public function deleteUnexistingFiles()
'/administrator/templates/hathor/html/mod_menu',
'/administrator/components/com_messages/layouts/toolbar',
'/administrator/components/com_messages/layouts',
// Joomla! 3.8.0
'/libraries/cms/application',
'/libraries/cms/authentication',
'/libraries/cms/captcha',
'/libraries/cms/component/exception',
'/libraries/cms/component/router/rules',
'/libraries/cms/component/router',
'/libraries/cms/component',
'/libraries/cms/editor',
'/libraries/cms/error',
'/libraries/cms/help',
'/libraries/cms/helper',
'/libraries/cms/language',
'/libraries/cms/layout',
'/libraries/cms/library',
'/libraries/cms/menu',
'/libraries/cms/module',
'/libraries/cms/pagination',
'/libraries/cms/pathway',
'/libraries/cms/plugin',
'/libraries/cms/response',
'/libraries/cms/schema/changeitem',
'/libraries/cms/schema',
'/libraries/cms/search',
'/libraries/cms/table',
'/libraries/cms/toolbar/button',
'/libraries/cms/toolbar',
'/libraries/cms/ucm',
'/libraries/cms/version',
'/libraries/joomla/access/exception',
'/libraries/joomla/access/wrapper',
'/libraries/joomla/access',
'/libraries/joomla/association/extension',
'/libraries/joomla/association',
'/libraries/joomla/authentication',
'/libraries/joomla/language/stemmer',
'/libraries/joomla/language/wrapper',
'/libraries/joomla/table',
'/libraries/legacy/access',
'/libraries/legacy/application',
'/libraries/legacy/controller',
'/libraries/legacy/model',
'/libraries/legacy/view',
);

jimport('joomla.filesystem.file');
Expand Down
40 changes: 40 additions & 0 deletions libraries/classmap.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,20 @@
JLoader::registerAlias('JUcmContent', '\\Joomla\\CMS\\Ucm\\UcmContent', '4.0');
JLoader::registerAlias('JUcmType', '\\Joomla\\CMS\\Ucm\\UcmType', '4.0');

JLoader::registerAlias('JToolbar', '\\Joomla\\CMS\\Toolbar\\Toolbar', '4.0');
JLoader::registerAlias('JToolBar', '\\Joomla\\CMS\\Toolbar\\Toolbar', '4.0');
JLoader::registerAlias('JToolbarButton', '\\Joomla\\CMS\\Toolbar\\ToolbarButton', '4.0');
JLoader::registerAlias('JToolbarButtonConfirm', '\\Joomla\\CMS\\Toolbar\\Button\\ConfirmButton', '4.0');
JLoader::registerAlias('JToolbarButtonCustom', '\\Joomla\\CMS\\Toolbar\\Button\\CustomButton', '4.0');
JLoader::registerAlias('JToolbarButtonHelp', '\\Joomla\\CMS\\Toolbar\\Button\\HelpButton', '4.0');
JLoader::registerAlias('JToolbarButtonLink', '\\Joomla\\CMS\\Toolbar\\Button\\LinkButton', '4.0');
JLoader::registerAlias('JToolbarButtonPopup', '\\Joomla\\CMS\\Toolbar\\Button\\PopupButton', '4.0');
JLoader::registerAlias('JToolbarButtonSeparator', '\\Joomla\\CMS\\Toolbar\\Button\\SeparatorButton', '4.0');
JLoader::registerAlias('JToolbarButtonSlider', '\\Joomla\\CMS\\Toolbar\\Button\\SliderButton', '4.0');
JLoader::registerAlias('JToolbarButtonStandard', '\\Joomla\\CMS\\Toolbar\\Button\\StandardButton', '4.0');
JLoader::registerAlias('JToolbarButtonStandard', '\\Joomla\\CMS\\Toolbar\\Button\\StandardButton', '4.0');
JLoader::registerAlias('JButton', '\\Joomla\\CMS\\Toolbar\\ToolbarButton', '4.0');

JLoader::registerAlias('JVersion', '\\Joomla\\CMS\\Version', '4.0');

JLoader::registerAlias('JAuthentication', '\\Joomla\\CMS\\Authentication\\Authentication', '4.0');
Expand All @@ -154,6 +168,32 @@
JLoader::registerAlias('JAssociationExtensionInterface', '\\Joomla\\CMS\\Association\\AssociationExtensionInterface', '4.0');
JLoader::registerAlias('JAssociationExtensionHelper', '\\Joomla\\CMS\\Association\\AssociationExtensionHelper', '4.0');

JLoader::registerAlias('JInstaller', '\\Joomla\\CMS\\Installer\\Installer', '4.0');
JLoader::registerAlias('JInstallerAdapter', '\\Joomla\\CMS\\Installer\\InstallerAdapter', '4.0');
JLoader::registerAlias('JInstallerExtension', '\\Joomla\\CMS\\Installer\\InstallerExtension', '4.0');
JLoader::registerAlias('JExtension', '\\Joomla\\CMS\\Installer\\InstallerExtension', '4.0');
JLoader::registerAlias('JInstallerHelper', '\\Joomla\\CMS\\Installer\\InstallerHelper', '4.0');
JLoader::registerAlias('JInstallerScript', '\\Joomla\\CMS\\Installer\\InstallerScript', '4.0');
JLoader::registerAlias('JInstallerManifest', '\\Joomla\\CMS\\Installer\\Manifest', '4.0');
JLoader::registerAlias('JInstallerAdapterComponent', '\\Joomla\\CMS\\Installer\\Adapter\\ComponentAdapter', '4.0');
JLoader::registerAlias('JInstallerComponent', '\\Joomla\\CMS\\Installer\\Adapter\\ComponentAdapter', '4.0');
JLoader::registerAlias('JInstallerAdapterFile', '\\Joomla\\CMS\\Installer\\Adapter\\FileAdapter', '4.0');
JLoader::registerAlias('JInstallerFile', '\\Joomla\\CMS\\Installer\\Adapter\\FileAdapter', '4.0');
JLoader::registerAlias('JInstallerAdapterLanguage', '\\Joomla\\CMS\\Installer\\Adapter\\LanguageAdapter', '4.0');
JLoader::registerAlias('JInstallerLanguage', '\\Joomla\\CMS\\Installer\\Adapter\\LanguageAdapter', '4.0');
JLoader::registerAlias('JInstallerAdapterLibrary', '\\Joomla\\CMS\\Installer\\Adapter\\LibraryAdapter', '4.0');
JLoader::registerAlias('JInstallerLibrary', '\\Joomla\\CMS\\Installer\\Adapter\\LibraryAdapter', '4.0');
JLoader::registerAlias('JInstallerAdapterModule', '\\Joomla\\CMS\\Installer\\Adapter\\ModuleAdapter', '4.0');
JLoader::registerAlias('JInstallerModule', '\\Joomla\\CMS\\Installer\\Adapter\\ModuleAdapter', '4.0');
JLoader::registerAlias('JInstallerAdapterPackage', '\\Joomla\\CMS\\Installer\\Adapter\\PackageAdapter', '4.0');
JLoader::registerAlias('JInstallerPackage', '\\Joomla\\CMS\\Installer\\Adapter\\PackageAdapter', '4.0');
JLoader::registerAlias('JInstallerAdapterPlugin', '\\Joomla\\CMS\\Installer\\Adapter\\PluginAdapter', '4.0');
JLoader::registerAlias('JInstallerPlugin', '\\Joomla\\CMS\\Installer\\Adapter\\PluginAdapter', '4.0');
JLoader::registerAlias('JInstallerAdapterTemplate', '\\Joomla\\CMS\\Installer\\Adapter\\TemplateAdapter', '4.0');
JLoader::registerAlias('JInstallerTemplate', '\\Joomla\\CMS\\Installer\\Adapter\\TemplateAdapter', '4.0');
JLoader::registerAlias('JInstallerManifestLibrary', '\\Joomla\\CMS\\Installer\\Manifest\\LibraryManifest', '4.0');
JLoader::registerAlias('JInstallerManifestPackage', '\\Joomla\\CMS\\Installer\\Manifest\\PackageManifest', '4.0');

JLoader::registerAlias('JRouter', '\\Joomla\\CMS\\Router\\Router', '4.0');
JLoader::registerAlias('JRouterAdministrator', '\\Joomla\\CMS\\Router\\AdministratorRouter', '4.0');
JLoader::registerAlias('JRouterSite', '\\Joomla\\CMS\\Router\\SiteRouter', '4.0');
2 changes: 0 additions & 2 deletions libraries/cms.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@

// Register classes where the names have been changed to fit the autoloader rules
// @deprecated 4.0
JLoader::register('JToolBar', JPATH_PLATFORM . '/cms/toolbar/toolbar.php');
JLoader::register('JButton', JPATH_PLATFORM . '/cms/toolbar/button.php');
JLoader::register('JInstallerComponent', JPATH_PLATFORM . '/cms/installer/adapter/component.php');
JLoader::register('JInstallerFile', JPATH_PLATFORM . '/cms/installer/adapter/file.php');
JLoader::register('JInstallerLanguage', JPATH_PLATFORM . '/cms/installer/adapter/language.php');
Expand Down
9 changes: 9 additions & 0 deletions libraries/joomla/base/adapter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,15 @@ public function setAdapter($name, &$adapter = null, $options = array())
return true;
}

$class = rtrim($this->_classprefix, '\\') . '\\' . ucfirst($name);

if (class_exists($class))
{
$this->_adapters[$name] = new $class($this, $this->_db, $options);

return true;
}

$fullpath = $this->_basepath . '/' . $this->_adapterfolder . '/' . strtolower($name) . '.php';

if (!file_exists($fullpath))
Expand Down

0 comments on commit 9dcb1ac

Please sign in to comment.