diff --git a/libraries/cms/application/administrator.php b/libraries/CMS/application/administrator.php similarity index 100% rename from libraries/cms/application/administrator.php rename to libraries/CMS/application/administrator.php diff --git a/libraries/cms/application/cms.php b/libraries/CMS/application/cms.php similarity index 100% rename from libraries/cms/application/cms.php rename to libraries/CMS/application/cms.php diff --git a/libraries/cms/application/helper.php b/libraries/CMS/application/helper.php similarity index 100% rename from libraries/cms/application/helper.php rename to libraries/CMS/application/helper.php diff --git a/libraries/cms/application/site.php b/libraries/CMS/application/site.php similarity index 100% rename from libraries/cms/application/site.php rename to libraries/CMS/application/site.php diff --git a/libraries/cms/class/loader.php b/libraries/CMS/class/loader.php similarity index 100% rename from libraries/cms/class/loader.php rename to libraries/CMS/class/loader.php diff --git a/libraries/cms/form/field/author.php b/libraries/CMS/form/field/author.php similarity index 100% rename from libraries/cms/form/field/author.php rename to libraries/CMS/form/field/author.php diff --git a/libraries/cms/form/field/captcha.php b/libraries/CMS/form/field/captcha.php similarity index 99% rename from libraries/cms/form/field/captcha.php rename to libraries/CMS/form/field/captcha.php index 4d182847b11dd..a7e68525a608a 100644 --- a/libraries/cms/form/field/captcha.php +++ b/libraries/CMS/form/field/captcha.php @@ -9,7 +9,7 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Cms\Captcha\Captcha; +use Joomla\CMS\Captcha\Captcha; /** * Captcha field. diff --git a/libraries/cms/form/field/chromestyle.php b/libraries/CMS/form/field/chromestyle.php similarity index 100% rename from libraries/cms/form/field/chromestyle.php rename to libraries/CMS/form/field/chromestyle.php diff --git a/libraries/cms/form/field/contenthistory.php b/libraries/CMS/form/field/contenthistory.php similarity index 100% rename from libraries/cms/form/field/contenthistory.php rename to libraries/CMS/form/field/contenthistory.php diff --git a/libraries/cms/form/field/contentlanguage.php b/libraries/CMS/form/field/contentlanguage.php similarity index 100% rename from libraries/cms/form/field/contentlanguage.php rename to libraries/CMS/form/field/contentlanguage.php diff --git a/libraries/cms/form/field/contenttype.php b/libraries/CMS/form/field/contenttype.php similarity index 100% rename from libraries/cms/form/field/contenttype.php rename to libraries/CMS/form/field/contenttype.php diff --git a/libraries/cms/form/field/editor.php b/libraries/CMS/form/field/editor.php similarity index 100% rename from libraries/cms/form/field/editor.php rename to libraries/CMS/form/field/editor.php diff --git a/libraries/cms/form/field/frontend_language.php b/libraries/CMS/form/field/frontend_language.php similarity index 100% rename from libraries/cms/form/field/frontend_language.php rename to libraries/CMS/form/field/frontend_language.php diff --git a/libraries/cms/form/field/headertag.php b/libraries/CMS/form/field/headertag.php similarity index 100% rename from libraries/cms/form/field/headertag.php rename to libraries/CMS/form/field/headertag.php diff --git a/libraries/cms/form/field/helpsite.php b/libraries/CMS/form/field/helpsite.php similarity index 100% rename from libraries/cms/form/field/helpsite.php rename to libraries/CMS/form/field/helpsite.php diff --git a/libraries/cms/form/field/lastvisitdaterange.php b/libraries/CMS/form/field/lastvisitdaterange.php similarity index 100% rename from libraries/cms/form/field/lastvisitdaterange.php rename to libraries/CMS/form/field/lastvisitdaterange.php diff --git a/libraries/cms/form/field/limitbox.php b/libraries/CMS/form/field/limitbox.php similarity index 100% rename from libraries/cms/form/field/limitbox.php rename to libraries/CMS/form/field/limitbox.php diff --git a/libraries/cms/form/field/media.php b/libraries/CMS/form/field/media.php similarity index 100% rename from libraries/cms/form/field/media.php rename to libraries/CMS/form/field/media.php diff --git a/libraries/cms/form/field/menu.php b/libraries/CMS/form/field/menu.php similarity index 100% rename from libraries/cms/form/field/menu.php rename to libraries/CMS/form/field/menu.php diff --git a/libraries/cms/form/field/menuitem.php b/libraries/CMS/form/field/menuitem.php similarity index 100% rename from libraries/cms/form/field/menuitem.php rename to libraries/CMS/form/field/menuitem.php diff --git a/libraries/cms/form/field/moduleorder.php b/libraries/CMS/form/field/moduleorder.php similarity index 100% rename from libraries/cms/form/field/moduleorder.php rename to libraries/CMS/form/field/moduleorder.php diff --git a/libraries/cms/form/field/moduleposition.php b/libraries/CMS/form/field/moduleposition.php similarity index 100% rename from libraries/cms/form/field/moduleposition.php rename to libraries/CMS/form/field/moduleposition.php diff --git a/libraries/cms/form/field/moduletag.php b/libraries/CMS/form/field/moduletag.php similarity index 100% rename from libraries/cms/form/field/moduletag.php rename to libraries/CMS/form/field/moduletag.php diff --git a/libraries/cms/form/field/ordering.php b/libraries/CMS/form/field/ordering.php similarity index 100% rename from libraries/cms/form/field/ordering.php rename to libraries/CMS/form/field/ordering.php diff --git a/libraries/cms/form/field/plugin_status.php b/libraries/CMS/form/field/plugin_status.php similarity index 100% rename from libraries/cms/form/field/plugin_status.php rename to libraries/CMS/form/field/plugin_status.php diff --git a/libraries/cms/form/field/registrationdaterange.php b/libraries/CMS/form/field/registrationdaterange.php similarity index 100% rename from libraries/cms/form/field/registrationdaterange.php rename to libraries/CMS/form/field/registrationdaterange.php diff --git a/libraries/cms/form/field/status.php b/libraries/CMS/form/field/status.php similarity index 100% rename from libraries/cms/form/field/status.php rename to libraries/CMS/form/field/status.php diff --git a/libraries/cms/form/field/tag.php b/libraries/CMS/form/field/tag.php similarity index 100% rename from libraries/cms/form/field/tag.php rename to libraries/CMS/form/field/tag.php diff --git a/libraries/cms/form/field/templatestyle.php b/libraries/CMS/form/field/templatestyle.php similarity index 100% rename from libraries/cms/form/field/templatestyle.php rename to libraries/CMS/form/field/templatestyle.php diff --git a/libraries/cms/form/field/user.php b/libraries/CMS/form/field/user.php similarity index 100% rename from libraries/cms/form/field/user.php rename to libraries/CMS/form/field/user.php diff --git a/libraries/cms/form/field/useractive.php b/libraries/CMS/form/field/useractive.php similarity index 100% rename from libraries/cms/form/field/useractive.php rename to libraries/CMS/form/field/useractive.php diff --git a/libraries/cms/form/field/usergrouplist.php b/libraries/CMS/form/field/usergrouplist.php similarity index 100% rename from libraries/cms/form/field/usergrouplist.php rename to libraries/CMS/form/field/usergrouplist.php diff --git a/libraries/cms/form/field/userstate.php b/libraries/CMS/form/field/userstate.php similarity index 100% rename from libraries/cms/form/field/userstate.php rename to libraries/CMS/form/field/userstate.php diff --git a/libraries/cms/form/rule/captcha.php b/libraries/CMS/form/rule/captcha.php similarity index 98% rename from libraries/cms/form/rule/captcha.php rename to libraries/CMS/form/rule/captcha.php index b27667a18f636..a0f05c85dc668 100644 --- a/libraries/cms/form/rule/captcha.php +++ b/libraries/CMS/form/rule/captcha.php @@ -9,7 +9,7 @@ defined('JPATH_PLATFORM') or die; -use Joomla\Cms\Captcha\Captcha; +use Joomla\CMS\Captcha\Captcha; use Joomla\Registry\Registry; /** diff --git a/libraries/cms/form/rule/notequals.php b/libraries/CMS/form/rule/notequals.php similarity index 100% rename from libraries/cms/form/rule/notequals.php rename to libraries/CMS/form/rule/notequals.php diff --git a/libraries/cms/form/rule/password.php b/libraries/CMS/form/rule/password.php similarity index 100% rename from libraries/cms/form/rule/password.php rename to libraries/CMS/form/rule/password.php diff --git a/libraries/cms/helper/content.php b/libraries/CMS/helper/content.php similarity index 100% rename from libraries/cms/helper/content.php rename to libraries/CMS/helper/content.php diff --git a/libraries/cms/helper/contenthistory.php b/libraries/CMS/helper/contenthistory.php similarity index 100% rename from libraries/cms/helper/contenthistory.php rename to libraries/CMS/helper/contenthistory.php diff --git a/libraries/cms/helper/helper.php b/libraries/CMS/helper/helper.php similarity index 100% rename from libraries/cms/helper/helper.php rename to libraries/CMS/helper/helper.php diff --git a/libraries/cms/helper/media.php b/libraries/CMS/helper/media.php similarity index 100% rename from libraries/cms/helper/media.php rename to libraries/CMS/helper/media.php diff --git a/libraries/cms/helper/route.php b/libraries/CMS/helper/route.php similarity index 100% rename from libraries/cms/helper/route.php rename to libraries/CMS/helper/route.php diff --git a/libraries/cms/helper/tags.php b/libraries/CMS/helper/tags.php similarity index 100% rename from libraries/cms/helper/tags.php rename to libraries/CMS/helper/tags.php diff --git a/libraries/cms/helper/usergroups.php b/libraries/CMS/helper/usergroups.php similarity index 100% rename from libraries/cms/helper/usergroups.php rename to libraries/CMS/helper/usergroups.php diff --git a/libraries/cms/html/access.php b/libraries/CMS/html/access.php similarity index 100% rename from libraries/cms/html/access.php rename to libraries/CMS/html/access.php diff --git a/libraries/cms/html/actionsdropdown.php b/libraries/CMS/html/actionsdropdown.php similarity index 100% rename from libraries/cms/html/actionsdropdown.php rename to libraries/CMS/html/actionsdropdown.php diff --git a/libraries/cms/html/batch.php b/libraries/CMS/html/batch.php similarity index 100% rename from libraries/cms/html/batch.php rename to libraries/CMS/html/batch.php diff --git a/libraries/cms/html/behavior.php b/libraries/CMS/html/behavior.php similarity index 100% rename from libraries/cms/html/behavior.php rename to libraries/CMS/html/behavior.php diff --git a/libraries/cms/html/bootstrap.php b/libraries/CMS/html/bootstrap.php similarity index 100% rename from libraries/cms/html/bootstrap.php rename to libraries/CMS/html/bootstrap.php diff --git a/libraries/cms/html/category.php b/libraries/CMS/html/category.php similarity index 100% rename from libraries/cms/html/category.php rename to libraries/CMS/html/category.php diff --git a/libraries/cms/html/content.php b/libraries/CMS/html/content.php similarity index 100% rename from libraries/cms/html/content.php rename to libraries/CMS/html/content.php diff --git a/libraries/cms/html/contentlanguage.php b/libraries/CMS/html/contentlanguage.php similarity index 100% rename from libraries/cms/html/contentlanguage.php rename to libraries/CMS/html/contentlanguage.php diff --git a/libraries/cms/html/date.php b/libraries/CMS/html/date.php similarity index 100% rename from libraries/cms/html/date.php rename to libraries/CMS/html/date.php diff --git a/libraries/cms/html/dropdown.php b/libraries/CMS/html/dropdown.php similarity index 100% rename from libraries/cms/html/dropdown.php rename to libraries/CMS/html/dropdown.php diff --git a/libraries/cms/html/email.php b/libraries/CMS/html/email.php similarity index 100% rename from libraries/cms/html/email.php rename to libraries/CMS/html/email.php diff --git a/libraries/cms/html/form.php b/libraries/CMS/html/form.php similarity index 100% rename from libraries/cms/html/form.php rename to libraries/CMS/html/form.php diff --git a/libraries/cms/html/formbehavior.php b/libraries/CMS/html/formbehavior.php similarity index 100% rename from libraries/cms/html/formbehavior.php rename to libraries/CMS/html/formbehavior.php diff --git a/libraries/cms/html/grid.php b/libraries/CMS/html/grid.php similarity index 100% rename from libraries/cms/html/grid.php rename to libraries/CMS/html/grid.php diff --git a/libraries/cms/html/html.php b/libraries/CMS/html/html.php similarity index 100% rename from libraries/cms/html/html.php rename to libraries/CMS/html/html.php diff --git a/libraries/cms/html/icons.php b/libraries/CMS/html/icons.php similarity index 100% rename from libraries/cms/html/icons.php rename to libraries/CMS/html/icons.php diff --git a/libraries/cms/html/jgrid.php b/libraries/CMS/html/jgrid.php similarity index 100% rename from libraries/cms/html/jgrid.php rename to libraries/CMS/html/jgrid.php diff --git a/libraries/cms/html/jquery.php b/libraries/CMS/html/jquery.php similarity index 100% rename from libraries/cms/html/jquery.php rename to libraries/CMS/html/jquery.php diff --git a/libraries/cms/html/language/en-GB/en-GB.jhtmldate.ini b/libraries/CMS/html/language/en-GB/en-GB.jhtmldate.ini similarity index 100% rename from libraries/cms/html/language/en-GB/en-GB.jhtmldate.ini rename to libraries/CMS/html/language/en-GB/en-GB.jhtmldate.ini diff --git a/libraries/cms/html/links.php b/libraries/CMS/html/links.php similarity index 100% rename from libraries/cms/html/links.php rename to libraries/CMS/html/links.php diff --git a/libraries/cms/html/list.php b/libraries/CMS/html/list.php similarity index 100% rename from libraries/cms/html/list.php rename to libraries/CMS/html/list.php diff --git a/libraries/cms/html/menu.php b/libraries/CMS/html/menu.php similarity index 100% rename from libraries/cms/html/menu.php rename to libraries/CMS/html/menu.php diff --git a/libraries/cms/html/number.php b/libraries/CMS/html/number.php similarity index 100% rename from libraries/cms/html/number.php rename to libraries/CMS/html/number.php diff --git a/libraries/cms/html/rules.php b/libraries/CMS/html/rules.php similarity index 100% rename from libraries/cms/html/rules.php rename to libraries/CMS/html/rules.php diff --git a/libraries/cms/html/searchtools.php b/libraries/CMS/html/searchtools.php similarity index 100% rename from libraries/cms/html/searchtools.php rename to libraries/CMS/html/searchtools.php diff --git a/libraries/cms/html/select.php b/libraries/CMS/html/select.php similarity index 100% rename from libraries/cms/html/select.php rename to libraries/CMS/html/select.php diff --git a/libraries/cms/html/sidebar.php b/libraries/CMS/html/sidebar.php similarity index 100% rename from libraries/cms/html/sidebar.php rename to libraries/CMS/html/sidebar.php diff --git a/libraries/cms/html/sliders.php b/libraries/CMS/html/sliders.php similarity index 100% rename from libraries/cms/html/sliders.php rename to libraries/CMS/html/sliders.php diff --git a/libraries/cms/html/sortablelist.php b/libraries/CMS/html/sortablelist.php similarity index 100% rename from libraries/cms/html/sortablelist.php rename to libraries/CMS/html/sortablelist.php diff --git a/libraries/cms/html/string.php b/libraries/CMS/html/string.php similarity index 100% rename from libraries/cms/html/string.php rename to libraries/CMS/html/string.php diff --git a/libraries/cms/html/tabs.php b/libraries/CMS/html/tabs.php similarity index 100% rename from libraries/cms/html/tabs.php rename to libraries/CMS/html/tabs.php diff --git a/libraries/cms/html/tag.php b/libraries/CMS/html/tag.php similarity index 100% rename from libraries/cms/html/tag.php rename to libraries/CMS/html/tag.php diff --git a/libraries/cms/html/tel.php b/libraries/CMS/html/tel.php similarity index 100% rename from libraries/cms/html/tel.php rename to libraries/CMS/html/tel.php diff --git a/libraries/cms/html/user.php b/libraries/CMS/html/user.php similarity index 100% rename from libraries/cms/html/user.php rename to libraries/CMS/html/user.php diff --git a/libraries/cms/installer/adapter.php b/libraries/CMS/installer/adapter.php similarity index 100% rename from libraries/cms/installer/adapter.php rename to libraries/CMS/installer/adapter.php diff --git a/libraries/cms/installer/adapter/component.php b/libraries/CMS/installer/adapter/component.php similarity index 100% rename from libraries/cms/installer/adapter/component.php rename to libraries/CMS/installer/adapter/component.php diff --git a/libraries/cms/installer/adapter/file.php b/libraries/CMS/installer/adapter/file.php similarity index 100% rename from libraries/cms/installer/adapter/file.php rename to libraries/CMS/installer/adapter/file.php diff --git a/libraries/cms/installer/adapter/language.php b/libraries/CMS/installer/adapter/language.php similarity index 100% rename from libraries/cms/installer/adapter/language.php rename to libraries/CMS/installer/adapter/language.php diff --git a/libraries/cms/installer/adapter/library.php b/libraries/CMS/installer/adapter/library.php similarity index 100% rename from libraries/cms/installer/adapter/library.php rename to libraries/CMS/installer/adapter/library.php diff --git a/libraries/cms/installer/adapter/module.php b/libraries/CMS/installer/adapter/module.php similarity index 100% rename from libraries/cms/installer/adapter/module.php rename to libraries/CMS/installer/adapter/module.php diff --git a/libraries/cms/installer/adapter/package.php b/libraries/CMS/installer/adapter/package.php similarity index 100% rename from libraries/cms/installer/adapter/package.php rename to libraries/CMS/installer/adapter/package.php diff --git a/libraries/cms/installer/adapter/plugin.php b/libraries/CMS/installer/adapter/plugin.php similarity index 100% rename from libraries/cms/installer/adapter/plugin.php rename to libraries/CMS/installer/adapter/plugin.php diff --git a/libraries/cms/installer/adapter/template.php b/libraries/CMS/installer/adapter/template.php similarity index 100% rename from libraries/cms/installer/adapter/template.php rename to libraries/CMS/installer/adapter/template.php diff --git a/libraries/cms/installer/extension.php b/libraries/CMS/installer/extension.php similarity index 100% rename from libraries/cms/installer/extension.php rename to libraries/CMS/installer/extension.php diff --git a/libraries/cms/installer/helper.php b/libraries/CMS/installer/helper.php similarity index 100% rename from libraries/cms/installer/helper.php rename to libraries/CMS/installer/helper.php diff --git a/libraries/cms/installer/installer.php b/libraries/CMS/installer/installer.php similarity index 100% rename from libraries/cms/installer/installer.php rename to libraries/CMS/installer/installer.php diff --git a/libraries/cms/installer/manifest.php b/libraries/CMS/installer/manifest.php similarity index 100% rename from libraries/cms/installer/manifest.php rename to libraries/CMS/installer/manifest.php diff --git a/libraries/cms/installer/manifest/library.php b/libraries/CMS/installer/manifest/library.php similarity index 100% rename from libraries/cms/installer/manifest/library.php rename to libraries/CMS/installer/manifest/library.php diff --git a/libraries/cms/installer/manifest/package.php b/libraries/CMS/installer/manifest/package.php similarity index 100% rename from libraries/cms/installer/manifest/package.php rename to libraries/CMS/installer/manifest/package.php diff --git a/libraries/cms/installer/script.php b/libraries/CMS/installer/script.php similarity index 100% rename from libraries/cms/installer/script.php rename to libraries/CMS/installer/script.php diff --git a/libraries/cms/layout/base.php b/libraries/CMS/layout/base.php similarity index 100% rename from libraries/cms/layout/base.php rename to libraries/CMS/layout/base.php diff --git a/libraries/cms/layout/file.php b/libraries/CMS/layout/file.php similarity index 100% rename from libraries/cms/layout/file.php rename to libraries/CMS/layout/file.php diff --git a/libraries/cms/layout/helper.php b/libraries/CMS/layout/helper.php similarity index 100% rename from libraries/cms/layout/helper.php rename to libraries/CMS/layout/helper.php diff --git a/libraries/cms/layout/layout.php b/libraries/CMS/layout/layout.php similarity index 100% rename from libraries/cms/layout/layout.php rename to libraries/CMS/layout/layout.php diff --git a/libraries/cms/less/formatter/joomla.php b/libraries/CMS/less/formatter/joomla.php similarity index 100% rename from libraries/cms/less/formatter/joomla.php rename to libraries/CMS/less/formatter/joomla.php diff --git a/libraries/cms/less/less.php b/libraries/CMS/less/less.php similarity index 100% rename from libraries/cms/less/less.php rename to libraries/CMS/less/less.php diff --git a/libraries/cms/library/helper.php b/libraries/CMS/library/helper.php similarity index 100% rename from libraries/cms/library/helper.php rename to libraries/CMS/library/helper.php diff --git a/libraries/cms/menu/administrator.php b/libraries/CMS/menu/administrator.php similarity index 100% rename from libraries/cms/menu/administrator.php rename to libraries/CMS/menu/administrator.php diff --git a/libraries/cms/menu/item.php b/libraries/CMS/menu/item.php similarity index 100% rename from libraries/cms/menu/item.php rename to libraries/CMS/menu/item.php diff --git a/libraries/cms/menu/menu.php b/libraries/CMS/menu/menu.php similarity index 100% rename from libraries/cms/menu/menu.php rename to libraries/CMS/menu/menu.php diff --git a/libraries/cms/menu/site.php b/libraries/CMS/menu/site.php similarity index 100% rename from libraries/cms/menu/site.php rename to libraries/CMS/menu/site.php diff --git a/libraries/cms/module/helper.php b/libraries/CMS/module/helper.php similarity index 100% rename from libraries/cms/module/helper.php rename to libraries/CMS/module/helper.php diff --git a/libraries/cms/pagination/object.php b/libraries/CMS/pagination/object.php similarity index 100% rename from libraries/cms/pagination/object.php rename to libraries/CMS/pagination/object.php diff --git a/libraries/cms/pagination/pagination.php b/libraries/CMS/pagination/pagination.php similarity index 100% rename from libraries/cms/pagination/pagination.php rename to libraries/CMS/pagination/pagination.php diff --git a/libraries/cms/pathway/pathway.php b/libraries/CMS/pathway/pathway.php similarity index 100% rename from libraries/cms/pathway/pathway.php rename to libraries/CMS/pathway/pathway.php diff --git a/libraries/cms/pathway/site.php b/libraries/CMS/pathway/site.php similarity index 100% rename from libraries/cms/pathway/site.php rename to libraries/CMS/pathway/site.php diff --git a/libraries/cms/plugin/helper.php b/libraries/CMS/plugin/helper.php similarity index 100% rename from libraries/cms/plugin/helper.php rename to libraries/CMS/plugin/helper.php diff --git a/libraries/cms/plugin/plugin.php b/libraries/CMS/plugin/plugin.php similarity index 100% rename from libraries/cms/plugin/plugin.php rename to libraries/CMS/plugin/plugin.php diff --git a/libraries/cms/response/json.php b/libraries/CMS/response/json.php similarity index 100% rename from libraries/cms/response/json.php rename to libraries/CMS/response/json.php diff --git a/libraries/cms/router/administrator.php b/libraries/CMS/router/administrator.php similarity index 100% rename from libraries/cms/router/administrator.php rename to libraries/CMS/router/administrator.php diff --git a/libraries/cms/router/router.php b/libraries/CMS/router/router.php similarity index 100% rename from libraries/cms/router/router.php rename to libraries/CMS/router/router.php diff --git a/libraries/cms/router/site.php b/libraries/CMS/router/site.php similarity index 99% rename from libraries/cms/router/site.php rename to libraries/CMS/router/site.php index fee972fc65fde..7c24778038322 100644 --- a/libraries/cms/router/site.php +++ b/libraries/CMS/router/site.php @@ -770,7 +770,7 @@ public function getComponentRouter($component) { $reflection = new ReflectionClass($class); - if (in_array('Joomla\\Cms\\Component\\Router\\RouterInterface', $reflection->getInterfaceNames())) + if (in_array('Joomla\\CMS\\Component\\Router\\RouterInterface', $reflection->getInterfaceNames())) { $this->componentRouters[$component] = new $class($this->app, $this->menu); } @@ -799,7 +799,7 @@ public function setComponentRouter($component, $router) { $reflection = new ReflectionClass($router); - if (in_array('Joomla\\Cms\\Component\\Router\\RouterInterface', $reflection->getInterfaceNames())) + if (in_array('Joomla\\CMS\\Component\\Router\\RouterInterface', $reflection->getInterfaceNames())) { $this->componentRouters[$component] = $router; diff --git a/libraries/cms/schema/changeitem.php b/libraries/CMS/schema/changeitem.php similarity index 100% rename from libraries/cms/schema/changeitem.php rename to libraries/CMS/schema/changeitem.php diff --git a/libraries/cms/schema/changeitem/mysql.php b/libraries/CMS/schema/changeitem/mysql.php similarity index 100% rename from libraries/cms/schema/changeitem/mysql.php rename to libraries/CMS/schema/changeitem/mysql.php diff --git a/libraries/cms/schema/changeitem/postgresql.php b/libraries/CMS/schema/changeitem/postgresql.php similarity index 100% rename from libraries/cms/schema/changeitem/postgresql.php rename to libraries/CMS/schema/changeitem/postgresql.php diff --git a/libraries/cms/schema/changeitem/sqlsrv.php b/libraries/CMS/schema/changeitem/sqlsrv.php similarity index 100% rename from libraries/cms/schema/changeitem/sqlsrv.php rename to libraries/CMS/schema/changeitem/sqlsrv.php diff --git a/libraries/cms/schema/changeset.php b/libraries/CMS/schema/changeset.php similarity index 100% rename from libraries/cms/schema/changeset.php rename to libraries/CMS/schema/changeset.php diff --git a/libraries/cms/search/helper.php b/libraries/CMS/search/helper.php similarity index 100% rename from libraries/cms/search/helper.php rename to libraries/CMS/search/helper.php diff --git a/libraries/cms/table/contenthistory.php b/libraries/CMS/table/contenthistory.php similarity index 100% rename from libraries/cms/table/contenthistory.php rename to libraries/CMS/table/contenthistory.php diff --git a/libraries/cms/table/contenttype.php b/libraries/CMS/table/contenttype.php similarity index 100% rename from libraries/cms/table/contenttype.php rename to libraries/CMS/table/contenttype.php diff --git a/libraries/cms/table/corecontent.php b/libraries/CMS/table/corecontent.php similarity index 100% rename from libraries/cms/table/corecontent.php rename to libraries/CMS/table/corecontent.php diff --git a/libraries/cms/table/ucm.php b/libraries/CMS/table/ucm.php similarity index 100% rename from libraries/cms/table/ucm.php rename to libraries/CMS/table/ucm.php diff --git a/libraries/cms/toolbar/button.php b/libraries/CMS/toolbar/button.php similarity index 100% rename from libraries/cms/toolbar/button.php rename to libraries/CMS/toolbar/button.php diff --git a/libraries/cms/toolbar/button/confirm.php b/libraries/CMS/toolbar/button/confirm.php similarity index 100% rename from libraries/cms/toolbar/button/confirm.php rename to libraries/CMS/toolbar/button/confirm.php diff --git a/libraries/cms/toolbar/button/custom.php b/libraries/CMS/toolbar/button/custom.php similarity index 100% rename from libraries/cms/toolbar/button/custom.php rename to libraries/CMS/toolbar/button/custom.php diff --git a/libraries/cms/toolbar/button/help.php b/libraries/CMS/toolbar/button/help.php similarity index 100% rename from libraries/cms/toolbar/button/help.php rename to libraries/CMS/toolbar/button/help.php diff --git a/libraries/cms/toolbar/button/link.php b/libraries/CMS/toolbar/button/link.php similarity index 100% rename from libraries/cms/toolbar/button/link.php rename to libraries/CMS/toolbar/button/link.php diff --git a/libraries/cms/toolbar/button/popup.php b/libraries/CMS/toolbar/button/popup.php similarity index 100% rename from libraries/cms/toolbar/button/popup.php rename to libraries/CMS/toolbar/button/popup.php diff --git a/libraries/cms/toolbar/button/separator.php b/libraries/CMS/toolbar/button/separator.php similarity index 100% rename from libraries/cms/toolbar/button/separator.php rename to libraries/CMS/toolbar/button/separator.php diff --git a/libraries/cms/toolbar/button/slider.php b/libraries/CMS/toolbar/button/slider.php similarity index 100% rename from libraries/cms/toolbar/button/slider.php rename to libraries/CMS/toolbar/button/slider.php diff --git a/libraries/cms/toolbar/button/standard.php b/libraries/CMS/toolbar/button/standard.php similarity index 100% rename from libraries/cms/toolbar/button/standard.php rename to libraries/CMS/toolbar/button/standard.php diff --git a/libraries/cms/toolbar/toolbar.php b/libraries/CMS/toolbar/toolbar.php similarity index 100% rename from libraries/cms/toolbar/toolbar.php rename to libraries/CMS/toolbar/toolbar.php diff --git a/libraries/cms/ucm/base.php b/libraries/CMS/ucm/base.php similarity index 100% rename from libraries/cms/ucm/base.php rename to libraries/CMS/ucm/base.php diff --git a/libraries/cms/ucm/content.php b/libraries/CMS/ucm/content.php similarity index 100% rename from libraries/cms/ucm/content.php rename to libraries/CMS/ucm/content.php diff --git a/libraries/cms/ucm/type.php b/libraries/CMS/ucm/type.php similarity index 100% rename from libraries/cms/ucm/type.php rename to libraries/CMS/ucm/type.php diff --git a/libraries/cms/ucm/ucm.php b/libraries/CMS/ucm/ucm.php similarity index 100% rename from libraries/cms/ucm/ucm.php rename to libraries/CMS/ucm/ucm.php diff --git a/libraries/cms/version/version.php b/libraries/CMS/version/version.php similarity index 100% rename from libraries/cms/version/version.php rename to libraries/CMS/version/version.php diff --git a/libraries/classmap.php b/libraries/classmap.php index f8ddf2cfc5f84..933bd818ef87d 100644 --- a/libraries/classmap.php +++ b/libraries/classmap.php @@ -19,62 +19,62 @@ JLoader::registerAlias('JDataSet', '\\Joomla\\Data\\DataSet', '4.0'); JLoader::registerAlias('JDataDumpable', '\\Joomla\\Data\\DumpableInterface', '4.0'); -JLoader::registerAlias('JModelAdmin', '\\Joomla\\Cms\\Model\\Admin', '4.0'); -JLoader::registerAlias('JModelForm', '\\Joomla\\Cms\\Model\\Form', '4.0'); -JLoader::registerAlias('JModelItem', '\\Joomla\\Cms\\Model\\Item', '4.0'); -JLoader::registerAlias('JModelList', '\\Joomla\\Cms\\Model\\ListModel', '4.0'); -JLoader::registerAlias('JModelLegacy', '\\Joomla\\Cms\\Model\\Model', '4.0'); -JLoader::registerAlias('JViewCategories', '\\Joomla\\Cms\\View\\Categories', '4.0'); -JLoader::registerAlias('JViewCategory', '\\Joomla\\Cms\\View\\Category', '4.0'); -JLoader::registerAlias('JViewCategoryfeed', '\\Joomla\\Cms\\View\\CategoryFeed', '4.0'); -JLoader::registerAlias('JViewLegacy', '\\Joomla\\Cms\\View\\View', '4.0'); -JLoader::registerAlias('JControllerAdmin', '\\Joomla\\Cms\\Controller\\Admin', '4.0'); -JLoader::registerAlias('JControllerLegacy', '\\Joomla\\Cms\\Controller\\Controller', '4.0'); -JLoader::registerAlias('JControllerForm', '\\Joomla\\Cms\\Controller\\Form', '4.0'); -JLoader::registerAlias('JTableInterface', '\\Joomla\\Cms\\Table\\TableInterface', '4.0'); -JLoader::registerAlias('JTable', '\\Joomla\\Cms\\Table\\Table', '4.0'); -JLoader::registerAlias('JTableNested', '\\Joomla\\Cms\\Table\\Nested', '4.0'); -JLoader::registerAlias('JTableAsset', '\\Joomla\\Cms\\Table\\Asset', '4.0'); -JLoader::registerAlias('JTableExtension', '\\Joomla\\Cms\\Table\\Extension', '4.0'); -JLoader::registerAlias('JTableLanguage', '\\Joomla\\Cms\\Table\\Language', '4.0'); -JLoader::registerAlias('JTableUpdate', '\\Joomla\\Cms\\Table\\Update', '4.0'); -JLoader::registerAlias('JTableUpdatesite', '\\Joomla\\Cms\\Table\\UpdateSite', '4.0'); -JLoader::registerAlias('JTableUser', '\\Joomla\\Cms\\Table\\User', '4.0'); -JLoader::registerAlias('JTableUsergroup', '\\Joomla\\Cms\\Table\\Usergroup', '4.0'); -JLoader::registerAlias('JTableViewlevel', '\\Joomla\\Cms\\Table\\ViewLevel', '4.0'); -JLoader::registerAlias('JTableObserver', '\\Joomla\\Cms\\Table\\Observer\\AbstractObserver', '4.0'); -JLoader::registerAlias('JTableObserverContenthistory', '\\Joomla\\Cms\\Table\\Observer\\ContentHistory', '4.0'); -JLoader::registerAlias('JTableObserverTags', '\\Joomla\\Cms\\Table\\Observer\\Tags', '4.0'); +JLoader::registerAlias('JModelAdmin', '\\Joomla\\CMS\\Model\\Admin', '4.0'); +JLoader::registerAlias('JModelForm', '\\Joomla\\CMS\\Model\\Form', '4.0'); +JLoader::registerAlias('JModelItem', '\\Joomla\\CMS\\Model\\Item', '4.0'); +JLoader::registerAlias('JModelList', '\\Joomla\\CMS\\Model\\ListModel', '4.0'); +JLoader::registerAlias('JModelLegacy', '\\Joomla\\CMS\\Model\\Model', '4.0'); +JLoader::registerAlias('JViewCategories', '\\Joomla\\CMS\\View\\Categories', '4.0'); +JLoader::registerAlias('JViewCategory', '\\Joomla\\CMS\\View\\Category', '4.0'); +JLoader::registerAlias('JViewCategoryfeed', '\\Joomla\\CMS\\View\\CategoryFeed', '4.0'); +JLoader::registerAlias('JViewLegacy', '\\Joomla\\CMS\\View\\View', '4.0'); +JLoader::registerAlias('JControllerAdmin', '\\Joomla\\CMS\\Controller\\Admin', '4.0'); +JLoader::registerAlias('JControllerLegacy', '\\Joomla\\CMS\\Controller\\Controller', '4.0'); +JLoader::registerAlias('JControllerForm', '\\Joomla\\CMS\\Controller\\Form', '4.0'); +JLoader::registerAlias('JTableInterface', '\\Joomla\\CMS\\Table\\TableInterface', '4.0'); +JLoader::registerAlias('JTable', '\\Joomla\\CMS\\Table\\Table', '4.0'); +JLoader::registerAlias('JTableNested', '\\Joomla\\CMS\\Table\\Nested', '4.0'); +JLoader::registerAlias('JTableAsset', '\\Joomla\\CMS\\Table\\Asset', '4.0'); +JLoader::registerAlias('JTableExtension', '\\Joomla\\CMS\\Table\\Extension', '4.0'); +JLoader::registerAlias('JTableLanguage', '\\Joomla\\CMS\\Table\\Language', '4.0'); +JLoader::registerAlias('JTableUpdate', '\\Joomla\\CMS\\Table\\Update', '4.0'); +JLoader::registerAlias('JTableUpdatesite', '\\Joomla\\CMS\\Table\\UpdateSite', '4.0'); +JLoader::registerAlias('JTableUser', '\\Joomla\\CMS\\Table\\User', '4.0'); +JLoader::registerAlias('JTableUsergroup', '\\Joomla\\CMS\\Table\\Usergroup', '4.0'); +JLoader::registerAlias('JTableViewlevel', '\\Joomla\\CMS\\Table\\ViewLevel', '4.0'); +JLoader::registerAlias('JTableObserver', '\\Joomla\\CMS\\Table\\Observer\\AbstractObserver', '4.0'); +JLoader::registerAlias('JTableObserverContenthistory', '\\Joomla\\CMS\\Table\\Observer\\ContentHistory', '4.0'); +JLoader::registerAlias('JTableObserverTags', '\\Joomla\\CMS\\Table\\Observer\\Tags', '4.0'); -JLoader::registerAlias('JAccess', '\\Joomla\\Cms\\Access\\Access', '4.0'); -JLoader::registerAlias('JAccessRule', '\\Joomla\\Cms\\Access\\Rule', '4.0'); -JLoader::registerAlias('JAccessRules', '\\Joomla\\Cms\\Access\\Rules', '4.0'); -JLoader::registerAlias('JAccessWrapperAccess', '\\Joomla\\Cms\\Access\\Wrapper\\Access', '4.0'); -JLoader::registerAlias('JAccessExceptionNotallowed', '\\Joomla\\Cms\\Access\\Exception\\Notallowed', '4.0'); -JLoader::registerAlias('JRule', '\\Joomla\\Cms\\Access\\Rule', '4.0'); -JLoader::registerAlias('JRules', '\\Joomla\\Cms\\Access\\Rules', '4.0'); +JLoader::registerAlias('JAccess', '\\Joomla\\CMS\\Access\\Access', '4.0'); +JLoader::registerAlias('JAccessRule', '\\Joomla\\CMS\\Access\\Rule', '4.0'); +JLoader::registerAlias('JAccessRules', '\\Joomla\\CMS\\Access\\Rules', '4.0'); +JLoader::registerAlias('JAccessWrapperAccess', '\\Joomla\\CMS\\Access\\Wrapper\\Access', '4.0'); +JLoader::registerAlias('JAccessExceptionNotallowed', '\\Joomla\\CMS\\Access\\Exception\\Notallowed', '4.0'); +JLoader::registerAlias('JRule', '\\Joomla\\CMS\\Access\\Rule', '4.0'); +JLoader::registerAlias('JRules', '\\Joomla\\CMS\\Access\\Rules', '4.0'); -JLoader::registerAlias('JAuthenticationHelper', '\\Joomla\\Cms\\Authentication\\AuthenticationHelper', '4.0'); +JLoader::registerAlias('JAuthenticationHelper', '\\Joomla\\CMS\\Authentication\\AuthenticationHelper', '4.0'); -JLoader::registerAlias('JHelp', '\\Joomla\\Cms\\Help\\Help', '4.0'); -JLoader::registerAlias('JCaptcha', '\\Joomla\\Cms\\Captcha\\Captcha', '4.0'); +JLoader::registerAlias('JHelp', '\\Joomla\\CMS\\Help\\Help', '4.0'); +JLoader::registerAlias('JCaptcha', '\\Joomla\\CMS\\Captcha\\Captcha', '4.0'); -JLoader::registerAlias('JLanguageAssociations', '\\Joomla\\Cms\\Language\\Associations', '4.0'); -JLoader::registerAlias('JLanguageMultilang', '\\Joomla\\Cms\\Language\\Multilanguage', '4.0'); +JLoader::registerAlias('JLanguageAssociations', '\\Joomla\\CMS\\Language\\Associations', '4.0'); +JLoader::registerAlias('JLanguageMultilang', '\\Joomla\\CMS\\Language\\Multilanguage', '4.0'); -JLoader::registerAlias('JComponentHelper', '\\Joomla\\Cms\\Component\\ComponentHelper', '4.0'); -JLoader::registerAlias('JComponentRecord', '\\Joomla\\Cms\\Component\\ComponentRecord', '4.0'); -JLoader::registerAlias('JComponentExceptionMissing', '\\Joomla\\Cms\\Component\\Exception\\MissingException', '4.0'); -JLoader::registerAlias('JComponentRouterBase', '\\Joomla\\Cms\\Component\\Router\\RouterBase', '4.0'); -JLoader::registerAlias('JComponentRouterInterface', '\\Joomla\\Cms\\Component\\Router\\RouterInterface', '4.0'); -JLoader::registerAlias('JComponentRouterLegacy', '\\Joomla\\Cms\\Component\\Router\\RouterLegacy', '4.0'); -JLoader::registerAlias('JComponentRouterView', '\\Joomla\\Cms\\Component\\Router\\RouterView', '4.0'); -JLoader::registerAlias('JComponentRouterViewconfiguration', '\\Joomla\\Cms\\Component\\Router\\RouterViewConfiguration', '4.0'); -JLoader::registerAlias('JComponentRouterRulesMenu', '\\Joomla\\Cms\\Component\\Router\\Rules\\MenuRules', '4.0'); -JLoader::registerAlias('JComponentRouterRulesNomenu', '\\Joomla\\Cms\\Component\\Router\\Rules\\NomenuRules', '4.0'); -JLoader::registerAlias('JComponentRouterRulesInterface', '\\Joomla\\Cms\\Component\\Router\\Rules\\RulesInterface', '4.0'); -JLoader::registerAlias('JComponentRouterRulesStandard', '\\Joomla\\Cms\\Component\\Router\\Rules\\StandardRules', '4.0'); +JLoader::registerAlias('JComponentHelper', '\\Joomla\\CMS\\Component\\ComponentHelper', '4.0'); +JLoader::registerAlias('JComponentRecord', '\\Joomla\\CMS\\Component\\ComponentRecord', '4.0'); +JLoader::registerAlias('JComponentExceptionMissing', '\\Joomla\\CMS\\Component\\Exception\\MissingException', '4.0'); +JLoader::registerAlias('JComponentRouterBase', '\\Joomla\\CMS\\Component\\Router\\RouterBase', '4.0'); +JLoader::registerAlias('JComponentRouterInterface', '\\Joomla\\CMS\\Component\\Router\\RouterInterface', '4.0'); +JLoader::registerAlias('JComponentRouterLegacy', '\\Joomla\\CMS\\Component\\Router\\RouterLegacy', '4.0'); +JLoader::registerAlias('JComponentRouterView', '\\Joomla\\CMS\\Component\\Router\\RouterView', '4.0'); +JLoader::registerAlias('JComponentRouterViewconfiguration', '\\Joomla\\CMS\\Component\\Router\\RouterViewConfiguration', '4.0'); +JLoader::registerAlias('JComponentRouterRulesMenu', '\\Joomla\\CMS\\Component\\Router\\Rules\\MenuRules', '4.0'); +JLoader::registerAlias('JComponentRouterRulesNomenu', '\\Joomla\\CMS\\Component\\Router\\Rules\\NomenuRules', '4.0'); +JLoader::registerAlias('JComponentRouterRulesInterface', '\\Joomla\\CMS\\Component\\Router\\Rules\\RulesInterface', '4.0'); +JLoader::registerAlias('JComponentRouterRulesStandard', '\\Joomla\\CMS\\Component\\Router\\Rules\\StandardRules', '4.0'); -JLoader::registerAlias('JEditor', '\\Joomla\\Cms\\Editor\\Editor', '4.0'); +JLoader::registerAlias('JEditor', '\\Joomla\\CMS\\Editor\\Editor', '4.0'); -JLoader::registerAlias('JErrorPage', '\\Joomla\\Cms\\Exception\\ExceptionHandler', '4.0'); +JLoader::registerAlias('JErrorPage', '\\Joomla\\CMS\\Exception\\ExceptionHandler', '4.0'); diff --git a/tests/unit/suites/libraries/joomla/access/JAccessRuleTest.php b/tests/unit/suites/libraries/joomla/access/JAccessRuleTest.php index 2da6940da63e1..42e6dfe829e52 100644 --- a/tests/unit/suites/libraries/joomla/access/JAccessRuleTest.php +++ b/tests/unit/suites/libraries/joomla/access/JAccessRuleTest.php @@ -8,7 +8,7 @@ */ /** - * Test class for \Joomla\Cms\Access\Rule. + * Test class for \Joomla\CMS\Access\Rule. * * @package Joomla.Platform * @@ -17,7 +17,7 @@ class JAccessRuleTest extends \PHPUnit\Framework\TestCase { /** - * Tests the \Joomla\Cms\Access\Rule::__construct and \Joomla\Cms\Access\Rule::__toString methods. + * Tests the \Joomla\CMS\Access\Rule::__construct and \Joomla\CMS\Access\Rule::__toString methods. * * @return void * @@ -35,7 +35,7 @@ public function test__construct() $string = json_encode($array); // Test constructor with array. - $rule1 = new \Joomla\Cms\Access\Rule($array); + $rule1 = new \Joomla\CMS\Access\Rule($array); // Check that import equals export. $this->assertEquals( @@ -56,7 +56,7 @@ public function test__construct() ); $string_A = json_encode($array_A); - $rule_A = new \Joomla\Cms\Access\Rule($string_A); + $rule_A = new \Joomla\CMS\Access\Rule($string_A); $this->assertNotEquals( $string, (string) $rule_A @@ -64,7 +64,7 @@ public function test__construct() } /** - * Tests the \Joomla\Cms\Access\Rule::getData method. + * Tests the \Joomla\CMS\Access\Rule::getData method. * * @return void * @@ -78,7 +78,7 @@ public function testGetData() 3 => 0 ); - $rule = new \Joomla\Cms\Access\Rule($array); + $rule = new \Joomla\CMS\Access\Rule($array); $this->assertEquals( $array, @@ -87,7 +87,7 @@ public function testGetData() } /** - * Tests the \Joomla\Cms\Access\Rule::mergeIdentity method. + * Tests the \Joomla\CMS\Access\Rule::mergeIdentity method. * * @return void * @@ -96,7 +96,7 @@ public function testGetData() public function testMergeIdentity() { // Construct an rule with no identities. - $rule = new \Joomla\Cms\Access\Rule(''); + $rule = new \Joomla\CMS\Access\Rule(''); // Add the identity with allow. $rule->mergeIdentity(-42, true); @@ -121,7 +121,7 @@ public function testMergeIdentity() } /** - * Tests the \Joomla\Cms\Access\Rule::mergeIdentities method. + * Tests the \Joomla\CMS\Access\Rule::mergeIdentities method. * * @return void * @@ -136,7 +136,7 @@ public function testMergeIdentities() ); // Construct an rule with no identities. - $rule = new \Joomla\Cms\Access\Rule(''); + $rule = new \Joomla\CMS\Access\Rule(''); $rule->mergeIdentities($array); $this->assertEquals( @@ -148,7 +148,7 @@ public function testMergeIdentities() // Test testMergeIdentities with object - $rule_A = new \Joomla\Cms\Access\Rule($array); + $rule_A = new \Joomla\CMS\Access\Rule($array); $rule->mergeIdentities($rule_A); $this->assertEquals( json_encode($array), @@ -183,7 +183,7 @@ public function testMergeIdentities() } /** - * Tests the \Joomla\Cms\Access\Rule::allow method. + * Tests the \Joomla\CMS\Access\Rule::allow method. * * @return void * @@ -196,7 +196,7 @@ public function testAllow() -42 => 0, 2 => 1 ); - $rule = new \Joomla\Cms\Access\Rule($array); + $rule = new \Joomla\CMS\Access\Rule($array); // This one should be denied. $this->assertFalse( diff --git a/tests/unit/suites/libraries/joomla/access/JAccessRulesTest.php b/tests/unit/suites/libraries/joomla/access/JAccessRulesTest.php index 29ae96af3990b..52fbf518087d6 100644 --- a/tests/unit/suites/libraries/joomla/access/JAccessRulesTest.php +++ b/tests/unit/suites/libraries/joomla/access/JAccessRulesTest.php @@ -8,7 +8,7 @@ */ /** - * Test class for \Joomla\Cms\Access\Rules. + * Test class for \Joomla\CMS\Access\Rules. * * @package Joomla.Platform * @subpackage Access @@ -40,7 +40,7 @@ public function test__constructString() $string = json_encode($array); // Test input as string. - $rules = new \Joomla\Cms\Access\Rules($string); + $rules = new \Joomla\CMS\Access\Rules($string); $this->assertThat( (string) $rules, $this->equalTo($string), @@ -49,7 +49,7 @@ public function test__constructString() } /** - * Tests the \Joomla\Cms\Access\Rules::getData method. + * Tests the \Joomla\CMS\Access\Rules::getData method. * * @return void * @@ -65,7 +65,7 @@ public function testGetData() ) ); - $rule = new \Joomla\Cms\Access\Rules($array); + $rule = new \Joomla\CMS\Access\Rules($array); $data = $rule->getData(); @@ -75,13 +75,13 @@ public function testGetData() ); $this->assertInstanceOf( - '\Joomla\Cms\Access\Rule', + '\Joomla\CMS\Access\Rule', $data['edit'] ); } /** - * Tests the \Joomla\Cms\Access\Rules constructor + * Tests the \Joomla\CMS\Access\Rules constructor * * @return void * @@ -99,7 +99,7 @@ public function test__constructArray() $string = json_encode($array); - $rules = new \Joomla\Cms\Access\Rules($array); + $rules = new \Joomla\CMS\Access\Rules($array); $this->assertThat( (string) $rules, $this->equalTo($string), @@ -108,7 +108,7 @@ public function test__constructArray() } /** - * Tests the \Joomla\Cms\Access\Rules constructor + * Tests the \Joomla\CMS\Access\Rules constructor * * @return void * @@ -128,7 +128,7 @@ public function test__constructObject() $object = (object) $array; - $rules = new \Joomla\Cms\Access\Rules($object); + $rules = new \Joomla\CMS\Access\Rules($object); $this->assertThat( (string) $rules, $this->equalTo($string), @@ -137,7 +137,7 @@ public function test__constructObject() } /** - * Tests the \Joomla\Cms\Access\Rules::mergeAction method. + * Tests the \Joomla\CMS\Access\Rules::mergeAction method. * * @return void * @@ -159,8 +159,8 @@ public function testMergeRule() ) ); - // Construct and empty \Joomla\Cms\Access\Rules. - $rules = new \Joomla\Cms\Access\Rules(''); + // Construct and empty \Joomla\CMS\Access\Rules. + $rules = new \Joomla\CMS\Access\Rules(''); $rules->mergeAction('edit', $identities); $this->assertThat( @@ -195,7 +195,7 @@ public function testMergeRule() } /** - * Tests the \Joomla\Cms\Access\Rules::merge method. + * Tests the \Joomla\CMS\Access\Rules::merge method. * * @return void * @@ -236,8 +236,8 @@ public function testMerge() ); // Test construction by string - $rules1 = new \Joomla\Cms\Access\Rules($string1); - $rules2 = new \Joomla\Cms\Access\Rules($array2); + $rules1 = new \Joomla\CMS\Access\Rules($string1); + $rules2 = new \Joomla\CMS\Access\Rules($array2); $rules1->merge($rules2); $this->assertThat( @@ -248,7 +248,7 @@ public function testMerge() } /** - * Tests the \Joomla\Cms\Access\Rules::merge method + * Tests the \Joomla\CMS\Access\Rules::merge method * * @return void * @@ -266,19 +266,19 @@ public function testMergeRulesNull() ); $string1 = json_encode($array1); - // Test merge by \Joomla\Cms\Access\Rules. - $rules1 = new \Joomla\Cms\Access\Rules($array1); - $rules2 = new \Joomla\Cms\Access\Rules(''); + // Test merge by \Joomla\CMS\Access\Rules. + $rules1 = new \Joomla\CMS\Access\Rules($array1); + $rules2 = new \Joomla\CMS\Access\Rules(''); $rules2->merge($rules1); $this->assertThat( (string) $rules2, $this->equalTo($string1), - 'Merge by \Joomla\Cms\Access\Rules where second rules are empty' + 'Merge by \Joomla\CMS\Access\Rules where second rules are empty' ); } /** - * Tests the \Joomla\Cms\Access\Rules::merge method + * Tests the \Joomla\CMS\Access\Rules::merge method * * @return void * @@ -317,18 +317,18 @@ public function testMergeRules() ), ); - $rules1 = new \Joomla\Cms\Access\Rules($array1); + $rules1 = new \Joomla\CMS\Access\Rules($array1); $rules1->merge($array2); $this->assertThat( (string) $rules1, $this->equalTo(json_encode($result2)), - 'Input as a \Joomla\Cms\Access\Rules' + 'Input as a \Joomla\CMS\Access\Rules' ); } /** - * Tests the \Joomla\Cms\Access\Rules::allow method. + * Tests the \Joomla\CMS\Access\Rules::allow method. * * @return void * @@ -346,7 +346,7 @@ public function testAllow() ) ); - $rules = new \Joomla\Cms\Access\Rules($array1); + $rules = new \Joomla\CMS\Access\Rules($array1); // Explicit allow. $this->assertTrue( @@ -385,7 +385,7 @@ public function testAllow() } /** - * Tests the \Joomla\Cms\Access\Rules::getAllowed method. + * Tests the \Joomla\CMS\Access\Rules::getAllowed method. * * @return void * @@ -410,7 +410,7 @@ public function testGetAllowed() $result->set('create', true); $result->set('edit', true); - $rules = new \Joomla\Cms\Access\Rules($array1); + $rules = new \Joomla\CMS\Access\Rules($array1); $allowed = $rules->getAllowed(-42); $this->assertThat( diff --git a/tests/unit/suites/libraries/joomla/access/JAccessTest.php b/tests/unit/suites/libraries/joomla/access/JAccessTest.php index ca2c556418cc1..5d60a3e8af941 100644 --- a/tests/unit/suites/libraries/joomla/access/JAccessTest.php +++ b/tests/unit/suites/libraries/joomla/access/JAccessTest.php @@ -10,7 +10,7 @@ jimport('joomla.filesystem.path'); /** - * Test class for \Joomla\Cms\Access\Access. + * Test class for \Joomla\CMS\Access\Access. * * @package Joomla.UnitTest * @subpackage Access @@ -19,13 +19,13 @@ class JAccessTest extends TestCaseDatabase { /** - * @var \Joomla\Cms\Access\Access + * @var \Joomla\CMS\Access\Access * @since 11.1 */ protected $object; /** - * Tests the \Joomla\Cms\Access\Access::getAuthorisedViewLevels method. + * Tests the \Joomla\CMS\Access\Access::getAuthorisedViewLevels method. * * @return void * @@ -38,7 +38,7 @@ public function testGetAuthorisedViewLevels() $array1 = array(0 => 1, 1 => 1, 2 => 2, 3 => 3); $this->assertThat( - \Joomla\Cms\Access\Access::getAuthorisedViewLevels(42), + \Joomla\CMS\Access\Access::getAuthorisedViewLevels(42), $this->equalTo($array1), 'Line:' . __Line__ . ' Super user gets Public (levels 1)' ); @@ -78,7 +78,7 @@ public function casesCheck() } /** - * Tests the \Joomla\Cms\Access\Access::check method. + * Tests the \Joomla\CMS\Access\Access::check method. * * @param integer $userId user id * @param string $action action to test @@ -94,7 +94,7 @@ public function casesCheck() public function testCheck($userId, $action, $assetId, $result, $message) { - $this->assertThat(\Joomla\Cms\Access\Access::check($userId, $action, $assetId), $this->equalTo($result), $message); + $this->assertThat(\Joomla\CMS\Access\Access::check($userId, $action, $assetId), $this->equalTo($result), $message); } /** @@ -133,7 +133,7 @@ public function casesCheckGroup() } /** - * Tests the \Joomla\Cms\Access\Access::checkGroup method. + * Tests the \Joomla\CMS\Access\Access::checkGroup method. * * @param integer $groupId group id * @param string $action action to test @@ -148,11 +148,11 @@ public function casesCheckGroup() */ public function testCheckGroup($groupId, $action, $assetId, $result, $message) { - $this->assertThat(\Joomla\Cms\Access\Access::checkGroup($groupId, $action, $assetId), $this->equalTo($result), $message); + $this->assertThat(\Joomla\CMS\Access\Access::checkGroup($groupId, $action, $assetId), $this->equalTo($result), $message); } /** - * Tests the \Joomla\Cms\Access\Access::getAssetRules method. + * Tests the \Joomla\CMS\Access\Access::getAssetRules method. * * @return void * @@ -160,7 +160,7 @@ public function testCheckGroup($groupId, $action, $assetId, $result, $message) */ public function testGetAssetRulesValidTrue() { - $ObjArrayJrules = \Joomla\Cms\Access\Access::getAssetRules(3, true); + $ObjArrayJrules = \Joomla\CMS\Access\Access::getAssetRules(3, true); $string1 = '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.admin":{"8":1,"7":1},' . '"core.manage":{"7":1,"6":1},"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},' . @@ -169,7 +169,7 @@ public function testGetAssetRulesValidTrue() } /** - * Tests the \Joomla\Cms\Access\Access::getAssetRules method. + * Tests the \Joomla\CMS\Access\Access::getAssetRules method. * * @return void * @@ -177,14 +177,14 @@ public function testGetAssetRulesValidTrue() */ public function testGetAssetRulesValidFalse() { - $ObjArrayJrules = \Joomla\Cms\Access\Access::getAssetRules(3, false); + $ObjArrayJrules = \Joomla\CMS\Access\Access::getAssetRules(3, false); $string1 = '{"core.admin":{"7":1},"core.manage":{"6":1}}'; $this->assertThat((string) $ObjArrayJrules, $this->equalTo($string1), 'Non recursive rules from a valid asset. Line: ' . __LINE__); } /** - * Tests the \Joomla\Cms\Access\Access::getAssetRules method. + * Tests the \Joomla\CMS\Access\Access::getAssetRules method. * * @return void * @@ -192,7 +192,7 @@ public function testGetAssetRulesValidFalse() */ public function testGetAssetRulesInvalidFalse() { - $ObjArrayJrules = \Joomla\Cms\Access\Access::getAssetRules(1550, false); + $ObjArrayJrules = \Joomla\CMS\Access\Access::getAssetRules(1550, false); $string1 = '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},' . '"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'; @@ -200,7 +200,7 @@ public function testGetAssetRulesInvalidFalse() } /** - * Tests the \Joomla\Cms\Access\Access::getAssetRules method. + * Tests the \Joomla\CMS\Access\Access::getAssetRules method. * * @return void * @@ -208,7 +208,7 @@ public function testGetAssetRulesInvalidFalse() */ public function testGetAssetRulesTextFalse() { - $ObjArrayJrules = \Joomla\Cms\Access\Access::getAssetRules('testasset', false); + $ObjArrayJrules = \Joomla\CMS\Access\Access::getAssetRules('testasset', false); $string1 = '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},' . '"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'; @@ -216,7 +216,7 @@ public function testGetAssetRulesTextFalse() } /** - * Tests the \Joomla\Cms\Access\Access::getAssetRules method. + * Tests the \Joomla\CMS\Access\Access::getAssetRules method. * * @return void * @@ -224,7 +224,7 @@ public function testGetAssetRulesTextFalse() */ public function testGetAssetRulesTextTrue() { - $ObjArrayJrules = \Joomla\Cms\Access\Access::getAssetRules('testasset', true); + $ObjArrayJrules = \Joomla\CMS\Access\Access::getAssetRules('testasset', true); $string1 = '{"core.login.site":{"6":1,"2":1},"core.login.admin":{"6":1},"core.admin":{"8":1},"core.manage":{"7":1},' . '"core.create":{"6":1,"3":1},"core.delete":{"6":1},"core.edit":{"6":1,"4":1},"core.edit.state":{"6":1,"5":1},"core.edit.own":{"6":1,"3":1}}'; @@ -232,7 +232,7 @@ public function testGetAssetRulesTextTrue() } /** - * Tests the \Joomla\Cms\Access\Access::getGroupTitle method. + * Tests the \Joomla\CMS\Access\Access::getGroupTitle method. * * @return void * @@ -240,11 +240,11 @@ public function testGetAssetRulesTextTrue() */ public function testGetGroupTitle() { - $this->assertThat(\Joomla\Cms\Access\Access::getGroupTitle(1), $this->equalTo('Public'), 'Get group title. Line: ' . __LINE__); + $this->assertThat(\Joomla\CMS\Access\Access::getGroupTitle(1), $this->equalTo('Public'), 'Get group title. Line: ' . __LINE__); } /** - * Tests the \Joomla\Cms\Access\Access::getUsersByGroup method. + * Tests the \Joomla\CMS\Access\Access::getUsersByGroup method. * * @return void * @@ -253,11 +253,11 @@ public function testGetGroupTitle() public function testGetUsersByGroupSimple() { $array1 = array(0 => 42); - $this->assertThat(\Joomla\Cms\Access\Access::getUsersByGroup(8, true), $this->equalTo($array1), 'Get one user. Line: ' . __LINE__); + $this->assertThat(\Joomla\CMS\Access\Access::getUsersByGroup(8, true), $this->equalTo($array1), 'Get one user. Line: ' . __LINE__); } /** - * Tests the \Joomla\Cms\Access\Access::getUsersByGroup method. + * Tests the \Joomla\CMS\Access\Access::getUsersByGroup method. * * @return void * @@ -266,11 +266,11 @@ public function testGetUsersByGroupSimple() public function testGetUsersByGroupTwoUsers() { $array3 = array(0 => 42, 1 => 43, 2 => 44); - $this->assertThat(\Joomla\Cms\Access\Access::getUsersByGroup(1, true), $this->equalTo($array3), 'Get multiple users. Line: ' . __LINE__); + $this->assertThat(\Joomla\CMS\Access\Access::getUsersByGroup(1, true), $this->equalTo($array3), 'Get multiple users. Line: ' . __LINE__); } /** - * Tests the \Joomla\Cms\Access\Access::getUsersByGroup method. + * Tests the \Joomla\CMS\Access\Access::getUsersByGroup method. * * @return void * @@ -279,11 +279,11 @@ public function testGetUsersByGroupTwoUsers() public function testGetUsersByGroupInvalidGroup() { $array2 = array(); - $this->assertThat(\Joomla\Cms\Access\Access::getUsersByGroup(15, false), $this->equalTo($array2), 'No group specified. Line: ' . __LINE__); + $this->assertThat(\Joomla\CMS\Access\Access::getUsersByGroup(15, false), $this->equalTo($array2), 'No group specified. Line: ' . __LINE__); } /** - * Tests the \Joomla\Cms\Access\Access::getGroupsByUser method. + * Tests the \Joomla\CMS\Access\Access::getGroupsByUser method. * * @return void * @@ -292,20 +292,20 @@ public function testGetUsersByGroupInvalidGroup() public function testGetGroupsByUser() { $array1 = array(0 => 1, 1 => 8); - $this->assertThat(\Joomla\Cms\Access\Access::getGroupsByUser(42, true), $this->equalTo($array1)); + $this->assertThat(\Joomla\CMS\Access\Access::getGroupsByUser(42, true), $this->equalTo($array1)); $array2 = array(0 => 8); - $this->assertThat(\Joomla\Cms\Access\Access::getGroupsByUser(42, false), $this->equalTo($array2)); + $this->assertThat(\Joomla\CMS\Access\Access::getGroupsByUser(42, false), $this->equalTo($array2)); $this->markTestSkipped('Test is now failing with full test suite.'); - $this->assertThat(\Joomla\Cms\Access\Access::getGroupsByUser(null), $this->equalTo(array(1))); + $this->assertThat(\Joomla\CMS\Access\Access::getGroupsByUser(null), $this->equalTo(array(1))); - $this->assertThat(\Joomla\Cms\Access\Access::getGroupsByUser(null, false), $this->equalTo(array(1))); + $this->assertThat(\Joomla\CMS\Access\Access::getGroupsByUser(null, false), $this->equalTo(array(1))); } /** - * Data provider for the \Joomla\Cms\Access\Access::getActionsFromData method. + * Data provider for the \Joomla\CMS\Access\Access::getActionsFromData method. * * @return array * @@ -373,7 +373,7 @@ public function casesGetActionsFromData() } /** - * Tests the \Joomla\Cms\Access\Access::getActionsFromData method. + * Tests the \Joomla\CMS\Access\Access::getActionsFromData method. * * @param string $data The XML string representing the actions. * @param string $xpath The XPath query to extract the action elements. @@ -387,11 +387,11 @@ public function casesGetActionsFromData() */ public function testGetActionsFromData($data, $xpath, $expected, $msg) { - $this->assertThat(\Joomla\Cms\Access\Access::getActionsFromData($data, $xpath), $this->equalTo($expected), 'Line:' . __LINE__ . $msg); + $this->assertThat(\Joomla\CMS\Access\Access::getActionsFromData($data, $xpath), $this->equalTo($expected), 'Line:' . __LINE__ . $msg); } /** - * Tests the \Joomla\Cms\Access\Access::getActionsFromFile method. + * Tests the \Joomla\CMS\Access\Access::getActionsFromFile method. * * @return void * @@ -400,7 +400,7 @@ public function testGetActionsFromData($data, $xpath, $expected, $msg) public function testGetActionsFromFile() { $this->assertThat( - \Joomla\Cms\Access\Access::getActionsFromFile('/path/to/unexisting/file'), + \Joomla\CMS\Access\Access::getActionsFromFile('/path/to/unexisting/file'), $this->equalTo(false), 'Line:' . __LINE__ . ' Getting actions from an unexisting file must return false' ); @@ -426,7 +426,7 @@ public function testGetActionsFromFile() ); $this->assertThat( - \Joomla\Cms\Access\Access::getActionsFromFile(JPATH_TESTS . '/tmp/access/access.xml'), + \Joomla\CMS\Access\Access::getActionsFromFile(JPATH_TESTS . '/tmp/access/access.xml'), $this->equalTo( array( (object) array('name' => "core.admin", 'title' => "JACTION_ADMIN", 'description' => "JACTION_ADMIN_COMPONENT_DESC"), @@ -474,9 +474,9 @@ protected function setUp() parent::setUp(); // Clear the static caches. - \Joomla\Cms\Access\Access::clearStatics(); + \Joomla\CMS\Access\Access::clearStatics(); - $this->object = new \Joomla\Cms\Access\Access; + $this->object = new \Joomla\CMS\Access\Access; // Make sure previous test files are cleaned up $this->_cleanupTestFiles(); diff --git a/tests/unit/suites/libraries/legacy/controller/JControllerLegacyTest.php b/tests/unit/suites/libraries/legacy/controller/JControllerLegacyTest.php index a5ee332ed1f1a..8ddf2c3f18fc9 100644 --- a/tests/unit/suites/libraries/legacy/controller/JControllerLegacyTest.php +++ b/tests/unit/suites/libraries/legacy/controller/JControllerLegacyTest.php @@ -204,7 +204,7 @@ public function testAddViewPath() */ public function testGetName() { - $this->assertEquals($this->class->getName(), 'joomla\\cms\\controller\\'); + $this->assertEquals($this->class->getName(), 'joomla\\CMS\\controller\\'); TestReflection::setValue($this->class, 'name', 'inspector'); diff --git a/tests/unit/suites/libraries/legacy/model/JModelListTest.php b/tests/unit/suites/libraries/legacy/model/JModelListTest.php index 1eee1f6a6ead7..5093ce71cf981 100644 --- a/tests/unit/suites/libraries/legacy/model/JModelListTest.php +++ b/tests/unit/suites/libraries/legacy/model/JModelListTest.php @@ -81,7 +81,7 @@ public function testFilterFieldsIsSetInConstructor() */ public function testContextIsSetInConstructor() { - $this->assertSame("com_joomla\cms\model\list.\listmodel", TestReflection::getValue($this->object, 'context')); + $this->assertSame("com_joomla\CMS\model\list.\listmodel", TestReflection::getValue($this->object, 'context')); } /** @@ -134,7 +134,7 @@ public function testGetStoreIdIncludesAllStates() $this->object->setState('list.ordering', 'enabled'); $this->object->setState('list.direction', 'ASC'); - $expectedString = "com_joomla\cms\model\list.\listmodel:1:0:100:enabled:ASC"; + $expectedString = "com_joomla\CMS\model\list.\listmodel:1:0:100:enabled:ASC"; $this->assertSame(md5($expectedString), $method->invokeArgs($this->object, array('1'))); } @@ -401,7 +401,7 @@ public function testListInfoIsAppendedToFormData() $applicationMock->expects($this->once()) ->method('getUserState') ->with( - $this->equalTo('com_joomla\cms\model\list.\listmodel'), + $this->equalTo('com_joomla\CMS\model\list.\listmodel'), $this->equalTo(new stdClass) ) ->will( @@ -451,7 +451,7 @@ public function testLoadFormDataDoesNotOverwriteListInfo() $applicationMock->expects($this->once()) ->method('getUserState') ->with( - $this->equalTo('com_joomla\cms\model\list.\listmodel'), + $this->equalTo('com_joomla\CMS\model\list.\listmodel'), $this->equalTo(new stdClass) ) ->will($this->returnValue($data)); @@ -485,12 +485,12 @@ public function testPopulateStateAppliesFilters() $applicationMock = $this->getMockCmsApp(); $applicationMock->method('getUserStateFromRequest') ->withConsecutive( - array($this->equalTo('com_joomla\cms\model\list.\listmodel.filter'), $this->equalTo('filter'), $this->equalTo(array()), $this->equalTo('array')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.list'), $this->equalTo('list'), $this->equalTo(array()), $this->equalTo('array')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.filter'), $this->equalTo('filter'), $this->equalTo(array()), $this->equalTo('array')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.list'), $this->equalTo('list'), $this->equalTo(array()), $this->equalTo('array')), array($this->equalTo('global.list.limit'), $this->equalTo('limit'), $this->equalTo(null), $this->equalTo('uint')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.ordercol'), $this->equalTo('filter_order'), $this->equalTo('col'), $this->equalTo('none')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.orderdirn'), $this->equalTo('filter_order_Dir'), $this->equalTo('ASC'), $this->equalTo('none')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.limitstart'), $this->equalTo('limitstart'), $this->equalTo(0)) + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.ordercol'), $this->equalTo('filter_order'), $this->equalTo('col'), $this->equalTo('none')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.orderdirn'), $this->equalTo('filter_order_Dir'), $this->equalTo('ASC'), $this->equalTo('none')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.limitstart'), $this->equalTo('limitstart'), $this->equalTo(0)) ) ->will( $this->onConsecutiveCalls( @@ -539,12 +539,12 @@ public function testPopulateStateUsesWhitelistForOrderColumn() $applicationMock = $this->getMockCmsApp(); $applicationMock->method('getUserStateFromRequest') ->withConsecutive( - array($this->equalTo('com_joomla\cms\model\list.\listmodel.filter'), $this->equalTo('filter'), $this->equalTo(array()), $this->equalTo('array')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.list'), $this->equalTo('list'), $this->equalTo(array()), $this->equalTo('array')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.filter'), $this->equalTo('filter'), $this->equalTo(array()), $this->equalTo('array')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.list'), $this->equalTo('list'), $this->equalTo(array()), $this->equalTo('array')), array($this->equalTo('global.list.limit'), $this->equalTo('limit'), $this->equalTo(null), $this->equalTo('uint')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.ordercol'), $this->equalTo('filter_order'), $this->equalTo('inwhitelist'), $this->equalTo('none')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.orderdirn'), $this->equalTo('filter_order_Dir'), $this->equalTo('ASC'), $this->equalTo('none')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.limitstart'), $this->equalTo('limitstart'), $this->equalTo(0)) + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.ordercol'), $this->equalTo('filter_order'), $this->equalTo('inwhitelist'), $this->equalTo('none')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.orderdirn'), $this->equalTo('filter_order_Dir'), $this->equalTo('ASC'), $this->equalTo('none')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.limitstart'), $this->equalTo('limitstart'), $this->equalTo(0)) ) ->will( $this->onConsecutiveCalls( @@ -591,12 +591,12 @@ public function testPopulateStateFixedInvalidOrderDirection() $applicationMock = $this->getMockCmsApp(); $applicationMock->method('getUserStateFromRequest') ->withConsecutive( - array($this->equalTo('com_joomla\cms\model\list.\listmodel.filter'), $this->equalTo('filter'), $this->equalTo(array()), $this->equalTo('array')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.list'), $this->equalTo('list'), $this->equalTo(array()), $this->equalTo('array')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.filter'), $this->equalTo('filter'), $this->equalTo(array()), $this->equalTo('array')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.list'), $this->equalTo('list'), $this->equalTo(array()), $this->equalTo('array')), array($this->equalTo('global.list.limit'), $this->equalTo('limit'), $this->equalTo(null), $this->equalTo('uint')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.ordercol'), $this->equalTo('filter_order'), $this->equalTo('col'), $this->equalTo('none')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.orderdirn'), $this->equalTo('filter_order_Dir'), $this->equalTo('ASC'), $this->equalTo('none')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.limitstart'), $this->equalTo('limitstart'), $this->equalTo(0)) + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.ordercol'), $this->equalTo('filter_order'), $this->equalTo('col'), $this->equalTo('none')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.orderdirn'), $this->equalTo('filter_order_Dir'), $this->equalTo('ASC'), $this->equalTo('none')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.limitstart'), $this->equalTo('limitstart'), $this->equalTo(0)) ) ->will( $this->onConsecutiveCalls( @@ -639,12 +639,12 @@ public function testPopulateStateSupportsOldFilterOrder() $applicationMock = $this->getMockCmsApp(); $applicationMock->method('getUserStateFromRequest') ->withConsecutive( - array($this->equalTo('com_joomla\cms\model\list.\listmodel.filter'), $this->equalTo('filter'), $this->equalTo(array()), $this->equalTo('array')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.list'), $this->equalTo('list'), $this->equalTo(array()), $this->equalTo('array')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.filter'), $this->equalTo('filter'), $this->equalTo(array()), $this->equalTo('array')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.list'), $this->equalTo('list'), $this->equalTo(array()), $this->equalTo('array')), array($this->equalTo('global.list.limit'), $this->equalTo('limit'), $this->equalTo(null), $this->equalTo('uint')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.ordercol'), $this->equalTo('filter_order'), $this->equalTo('col'), $this->equalTo('none')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.orderdirn'), $this->equalTo('filter_order_Dir'), $this->equalTo('ASC'), $this->equalTo('none')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.limitstart'), $this->equalTo('limitstart'), $this->equalTo(0)) + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.ordercol'), $this->equalTo('filter_order'), $this->equalTo('col'), $this->equalTo('none')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.orderdirn'), $this->equalTo('filter_order_Dir'), $this->equalTo('ASC'), $this->equalTo('none')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.limitstart'), $this->equalTo('limitstart'), $this->equalTo(0)) ) ->will( $this->onConsecutiveCalls( @@ -703,9 +703,9 @@ public function testPopulateStateSupportsListFilters() $applicationMock = $this->getMockCmsApp(); $applicationMock->method('getUserStateFromRequest') ->withConsecutive( - array($this->equalTo('com_joomla\cms\model\list.\listmodel.filter'), $this->equalTo('filter'), $this->equalTo(array()), $this->equalTo('array')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.list'), $this->equalTo('list'), $this->equalTo(array()), $this->equalTo('array')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.limitstart'), $this->equalTo('limitstart'), $this->equalTo(0)) + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.filter'), $this->equalTo('filter'), $this->equalTo(array()), $this->equalTo('array')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.list'), $this->equalTo('list'), $this->equalTo(array()), $this->equalTo('array')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.limitstart'), $this->equalTo('limitstart'), $this->equalTo(0)) ) ->will( $this->onConsecutiveCalls( @@ -756,9 +756,9 @@ public function testPopulateStateSupportsFullordering() $applicationMock = $this->getMockCmsApp(); $applicationMock->method('getUserStateFromRequest') ->withConsecutive( - array($this->equalTo('com_joomla\cms\model\list.\listmodel.filter'), $this->equalTo('filter'), $this->equalTo(array()), $this->equalTo('array')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.list'), $this->equalTo('list'), $this->equalTo(array()), $this->equalTo('array')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.limitstart'), $this->equalTo('limitstart'), $this->equalTo(0)) + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.filter'), $this->equalTo('filter'), $this->equalTo(array()), $this->equalTo('array')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.list'), $this->equalTo('list'), $this->equalTo(array()), $this->equalTo('array')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.limitstart'), $this->equalTo('limitstart'), $this->equalTo(0)) ) ->will( $this->onConsecutiveCalls( @@ -806,9 +806,9 @@ public function testPopulateStateFixesInvalidFullordering() $applicationMock = $this->getMockCmsApp(); $applicationMock->method('getUserStateFromRequest') ->withConsecutive( - array($this->equalTo('com_joomla\cms\model\list.\listmodel.filter'), $this->equalTo('filter'), $this->equalTo(array()), $this->equalTo('array')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.list'), $this->equalTo('list'), $this->equalTo(array()), $this->equalTo('array')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.limitstart'), $this->equalTo('limitstart'), $this->equalTo(0)) + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.filter'), $this->equalTo('filter'), $this->equalTo(array()), $this->equalTo('array')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.list'), $this->equalTo('list'), $this->equalTo(array()), $this->equalTo('array')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.limitstart'), $this->equalTo('limitstart'), $this->equalTo(0)) ) ->will( $this->onConsecutiveCalls( @@ -854,9 +854,9 @@ public function testPopulateStateFixesInvalidOrderValuesFromList() $applicationMock = $this->getMockCmsApp(); $applicationMock->method('getUserStateFromRequest') ->withConsecutive( - array($this->equalTo('com_joomla\cms\model\list.\listmodel.filter'), $this->equalTo('filter'), $this->equalTo(array()), $this->equalTo('array')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.list'), $this->equalTo('list'), $this->equalTo(array()), $this->equalTo('array')), - array($this->equalTo('com_joomla\cms\model\list.\listmodel.limitstart'), $this->equalTo('limitstart'), $this->equalTo(0)) + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.filter'), $this->equalTo('filter'), $this->equalTo(array()), $this->equalTo('array')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.list'), $this->equalTo('list'), $this->equalTo(array()), $this->equalTo('array')), + array($this->equalTo('com_joomla\CMS\model\list.\listmodel.limitstart'), $this->equalTo('limitstart'), $this->equalTo(0)) ) ->will( $this->onConsecutiveCalls(