Merge pull request joomla#1411 from ianmacl/html_autoloader

Autoloader cleanup
aaronschmitz · Aug 20, 2012 · c600d0a · c600d0a
2 parents 15e4e48 + f51d935
commit c600d0a
Show file tree

Hide file tree

Showing 33 changed files with 15 additions and 17 deletions.
diff --git a/libraries/joomla/html/html/access.php → libraries/joomla/html/access.php b/libraries/joomla/html/html/access.php → libraries/joomla/html/access.php
diff --git a/libraries/joomla/html/html/behavior.php → libraries/joomla/html/behavior.php b/libraries/joomla/html/html/behavior.php → libraries/joomla/html/behavior.php
diff --git a/libraries/joomla/html/html/content.php → libraries/joomla/html/content.php b/libraries/joomla/html/html/content.php → libraries/joomla/html/content.php
diff --git a/libraries/joomla/html/html/date.php → libraries/joomla/html/date.php b/libraries/joomla/html/html/date.php → libraries/joomla/html/date.php
diff --git a/libraries/joomla/html/html/email.php → libraries/joomla/html/email.php b/libraries/joomla/html/html/email.php → libraries/joomla/html/email.php
diff --git a/libraries/joomla/html/html/form.php → libraries/joomla/html/form.php b/libraries/joomla/html/html/form.php → libraries/joomla/html/form.php
diff --git a/libraries/joomla/html/html/grid.php → libraries/joomla/html/grid.php b/libraries/joomla/html/html/grid.php → libraries/joomla/html/grid.php
diff --git a/libraries/joomla/html/html.php b/libraries/joomla/html/html.php
@@ -9,8 +9,6 @@
 
 defined('JPATH_PLATFORM') or die;
 
-JHtml::addIncludePath(JPATH_PLATFORM . '/joomla/html/html');
-
 jimport('joomla.environment.browser');
 jimport('joomla.filesystem.file');
 jimport('joomla.filesystem.path');

diff --git a/libraries/joomla/html/html/jgrid.php → libraries/joomla/html/jgrid.php b/libraries/joomla/html/html/jgrid.php → libraries/joomla/html/jgrid.php
diff --git a/libraries/joomla/html/html/list.php → libraries/joomla/html/list.php b/libraries/joomla/html/html/list.php → libraries/joomla/html/list.php
diff --git a/libraries/joomla/html/html/number.php → libraries/joomla/html/number.php b/libraries/joomla/html/html/number.php → libraries/joomla/html/number.php
diff --git a/libraries/joomla/html/html/rules.php → libraries/joomla/html/rules.php b/libraries/joomla/html/html/rules.php → libraries/joomla/html/rules.php
diff --git a/libraries/joomla/html/html/select.php → libraries/joomla/html/select.php b/libraries/joomla/html/html/select.php → libraries/joomla/html/select.php
diff --git a/libraries/joomla/html/html/sliders.php → libraries/joomla/html/sliders.php b/libraries/joomla/html/html/sliders.php → libraries/joomla/html/sliders.php
diff --git a/libraries/joomla/html/html/string.php → libraries/joomla/html/string.php b/libraries/joomla/html/html/string.php → libraries/joomla/html/string.php
diff --git a/libraries/joomla/html/html/tabs.php → libraries/joomla/html/tabs.php b/libraries/joomla/html/html/tabs.php → libraries/joomla/html/tabs.php
diff --git a/libraries/joomla/html/html/tel.php → libraries/joomla/html/tel.php b/libraries/joomla/html/html/tel.php → libraries/joomla/html/tel.php
diff --git a/libraries/joomla/html/html/user.php → libraries/joomla/html/user.php b/libraries/joomla/html/html/user.php → libraries/joomla/html/user.php
diff --git a/tests/suites/unit/joomla/html/html/JHtmlAccessTest.php b/tests/suites/unit/joomla/html/html/JHtmlAccessTest.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM.'/joomla/html/html/access.php';
+require_once JPATH_PLATFORM.'/joomla/html/access.php';
 
 /**
  * Test class for JHtmlAccess.

diff --git a/tests/suites/unit/joomla/html/html/JHtmlBehaviorTest.php b/tests/suites/unit/joomla/html/html/JHtmlBehaviorTest.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM . '/joomla/html/html/behavior.php';
+require_once JPATH_PLATFORM . '/joomla/html/behavior.php';
 
 /**
  * Inspector class for JHtmlBehavior.

diff --git a/tests/suites/unit/joomla/html/html/JHtmlContentTest.php b/tests/suites/unit/joomla/html/html/JHtmlContentTest.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM.'/joomla/html/html/content.php';
+require_once JPATH_PLATFORM.'/joomla/html/content.php';
 
 /**
  * Test class for JHtmlContent.

diff --git a/tests/suites/unit/joomla/html/html/JHtmlDateTest.php b/tests/suites/unit/joomla/html/html/JHtmlDateTest.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM.'/joomla/html/html/date.php';
+require_once JPATH_PLATFORM.'/joomla/html/date.php';
 
 /**
  * Test class for JHtmlDate.

diff --git a/tests/suites/unit/joomla/html/html/JHtmlEmailTest.php b/tests/suites/unit/joomla/html/html/JHtmlEmailTest.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM.'/joomla/html/html/email.php';
+require_once JPATH_PLATFORM.'/joomla/html/email.php';
 
 /**
  * Test class for JHtmlEmail.

diff --git a/tests/suites/unit/joomla/html/html/JHtmlFormTest.php b/tests/suites/unit/joomla/html/html/JHtmlFormTest.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM.'/joomla/html/html/form.php';
+require_once JPATH_PLATFORM.'/joomla/html/form.php';
 
 /**
  * Test class for JHtmlForm.

diff --git a/tests/suites/unit/joomla/html/html/JHtmlGridTest.php b/tests/suites/unit/joomla/html/html/JHtmlGridTest.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM.'/joomla/html/html/grid.php';
+require_once JPATH_PLATFORM.'/joomla/html/grid.php';
 
 /**
  * Test class for JHtmlGrid.

diff --git a/tests/suites/unit/joomla/html/html/JHtmlJgridTest.php b/tests/suites/unit/joomla/html/html/JHtmlJgridTest.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM.'/joomla/html/html/jgrid.php';
+require_once JPATH_PLATFORM.'/joomla/html/jgrid.php';
 
 /**
  * Test class for JHtmlJGrid.

diff --git a/tests/suites/unit/joomla/html/html/JHtmlListTest.php b/tests/suites/unit/joomla/html/html/JHtmlListTest.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM.'/joomla/html/html/list.php';
+require_once JPATH_PLATFORM.'/joomla/html/list.php';
 
 /**
  * Test class for JHtmlList.

diff --git a/tests/suites/unit/joomla/html/html/JHtmlNumberTest.php b/tests/suites/unit/joomla/html/html/JHtmlNumberTest.php
@@ -6,7 +6,7 @@
  * @copyright   Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
-require_once JPATH_PLATFORM.'/joomla/html/html/number.php';
+require_once JPATH_PLATFORM.'/joomla/html/number.php';
 
 /**
  * Test class for JHtmlNumberTest.

diff --git a/tests/suites/unit/joomla/html/html/JHtmlRulesTest.php b/tests/suites/unit/joomla/html/html/JHtmlRulesTest.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM.'/joomla/html/html/rules.php';
+require_once JPATH_PLATFORM.'/joomla/html/rules.php';
 
 /**
  * Test class for JHtmlRules.

diff --git a/tests/suites/unit/joomla/html/html/JHtmlSelectTest.php b/tests/suites/unit/joomla/html/html/JHtmlSelectTest.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM.'/joomla/html/html/select.php';
+require_once JPATH_PLATFORM.'/joomla/html/select.php';
 require_once 'TestHelpers/JHtmlSelect-helper-dataset.php';
 
 /**

diff --git a/tests/suites/unit/joomla/html/html/JHtmlStringTest.php b/tests/suites/unit/joomla/html/html/JHtmlStringTest.php
@@ -6,7 +6,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-require_once JPATH_PLATFORM . '/joomla/html/html/string.php';
+require_once JPATH_PLATFORM . '/joomla/html/string.php';
 
 /**
  * Tests for JDate class.

diff --git a/tests/suites/unit/joomla/html/html/JHtmlTelTest.php b/tests/suites/unit/joomla/html/html/JHtmlTelTest.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM.'/joomla/html/html/tel.php';
+require_once JPATH_PLATFORM.'/joomla/html/tel.php';
 
 /**
  * Test class for JHtmlTel.

diff --git a/tests/suites/unit/joomla/html/html/JHtmlUserTest.php b/tests/suites/unit/joomla/html/html/JHtmlUserTest.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM.'/joomla/html/html/user.php';
+require_once JPATH_PLATFORM.'/joomla/html/user.php';
 
 /**
  * Test class for JHtmlUser.