[namespacce] Namespace JAccess* (#13952)

* Move JAccess to namespace * Fix some minor stuff and delete JRule and JRules
joomla · Feb 14, 2017 · 739e62d · 739e62d
1 parent 7682019
commit 739e62d
Show file tree

Hide file tree

Showing 13 changed files with 212 additions and 269 deletions.
diff --git a/libraries/classmap.php b/libraries/classmap.php
@@ -45,3 +45,11 @@
 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');
diff --git a/libraries/import.legacy.php b/libraries/import.legacy.php
@@ -80,8 +80,6 @@
 JLoader::register('JObservable', JPATH_PLATFORM . '/legacy/base/observable.php');
 JLoader::register('LogException', JPATH_PLATFORM . '/legacy/log/logexception.php');
 JLoader::register('JXMLElement', JPATH_PLATFORM . '/legacy/utilities/xmlelement.php');
-JLoader::register('JRule', JPATH_PLATFORM . '/legacy/access/rule.php');
-JLoader::register('JRules', JPATH_PLATFORM . '/legacy/access/rules.php');
 JLoader::register('JCli', JPATH_PLATFORM . '/legacy/application/cli.php');
 JLoader::register('JDaemon', JPATH_PLATFORM . '/legacy/application/daemon.php');
 JLoader::register('JApplication', JPATH_LIBRARIES . '/legacy/application/application.php');
diff --git a/libraries/joomla/access/exception/notallowed.php b/libraries/joomla/access/exception/notallowed.php
diff --git a/libraries/legacy/access/rule.php b/libraries/legacy/access/rule.php
diff --git a/libraries/legacy/access/rules.php b/libraries/legacy/access/rules.php