Permalink
Browse files

Merge pull request #1579 from LouisLandry/cleanup

Initial 12.3 Cleanup
  • Loading branch information...
2 parents 55aba69 + b1b1e76 commit 67101bc1bb35ac66553cfe074ee713ffac0ad4d3 @eddieajau eddieajau committed Oct 8, 2012
Showing with 2,699 additions and 4,503 deletions.
  1. +2 −3 build.xml
  2. +0 −36 libraries/config.example.php
  3. +0 −19 libraries/import.legacy.php
  4. +0 −32 libraries/joomla/access/access.php
  5. +0 −12 libraries/joomla/application/web.php
  6. +0 −15 libraries/joomla/cache/storage.php
  7. +0 −24 libraries/joomla/client/ftp.php
  8. +0 −24 libraries/joomla/client/ldap.php
  9. +0 −15 libraries/joomla/database/database.php
  10. +0 −14 libraries/joomla/database/driver.php
  11. +13 −26 libraries/joomla/object/object.php
  12. +0 −14 libraries/joomla/profiler/profiler.php
  13. +0 −15 libraries/joomla/session/storage.php
  14. +0 −25 libraries/joomla/string/string.php
  15. +0 −20 libraries/joomla/user/user.php
  16. +0 −38 libraries/legacy/access/rule.php
  17. +0 −38 libraries/legacy/access/rules.php
  18. +0 −45 libraries/legacy/application/cli.php
  19. +0 −47 libraries/legacy/application/daemon.php
  20. +0 −154 libraries/legacy/base/node.php
  21. +0 −197 libraries/legacy/base/observable.php
  22. +0 −60 libraries/legacy/base/observer.php
  23. +0 −100 libraries/legacy/base/tree.php
  24. +0 −24 libraries/legacy/database/exception.php
  25. +0 −32 libraries/legacy/dispatcher/dispatcher.php
  26. +0 −24 libraries/legacy/log/logexception.php
  27. +0 −85 libraries/legacy/simplecrypt/simplecrypt.php
  28. +0 −62 libraries/legacy/simplepie/factory.php
  29. +0 −36 libraries/legacy/web/client.php
  30. +0 −43 libraries/legacy/web/web.php
  31. +82 −82 libraries/phputf8/README
  32. +4 −4 libraries/platform.php
  33. +4 −4 tests/bootstrap.legacy.php
  34. +4 −4 tests/bootstrap.php
  35. +6 −5 tests/core/case/case.php
  36. +4 −3 tests/core/case/database.php
  37. +7 −7 tests/core/mock/cache.php
  38. +15 −13 tests/core/mock/database/driver.php
  39. +2 −1 tests/core/mock/dispatcher.php
  40. +1 −1 tests/core/mock/document.php
  41. +1 −1 tests/core/mock/language.php
  42. +3 −2 tests/core/mock/rules.php
  43. +8 −8 tests/core/reflection/reflection.php
  44. +122 −62 tests/suites/database/driver/mysql/JDatabaseMySQLTest.php
  45. +9 −6 tests/suites/database/driver/mysql/iterator/JDatabaseIteratorMySQLTest.php
  46. +117 −60 tests/suites/database/driver/mysqli/JDatabaseMySQLiTest.php
  47. +0 −155 tests/suites/legacy/base/JNodeTest.php
  48. +0 −140 tests/suites/legacy/base/JObservableTest.php
  49. +0 −43 tests/suites/legacy/base/JObserverTest.php
  50. +0 −60 tests/suites/legacy/base/JTreeTest.php
  51. +5 −5 tests/suites/legacy/error/JErrorTest.php
  52. +1 −1 tests/suites/legacy/request/JRequest-helper-dataset.php
  53. +0 −145 tests/suites/legacy/simplecrypt/JSimpleCryptTest.php
  54. +22 −22 tests/suites/legacy/table/stubs/jos_menu.csv
  55. +69 −43 tests/suites/unit/JLoaderTest.php
  56. +236 −341 tests/suites/unit/joomla/access/JAccessTest.php
  57. +1,779 −1,779 tests/suites/unit/joomla/application/JApplicationWebTest.php
  58. +0 −13 tests/suites/unit/joomla/cache/JCacheStorageTest.php
  59. +0 −16 tests/suites/unit/joomla/database/JDatabaseTest.php
  60. +0 −11 tests/suites/unit/joomla/object/JObjectTest.php
  61. +160 −160 tests/suites/unit/joomla/table/stubs/jos_assets.csv
  62. +0 −16 tests/suites/unit/joomla/user/JUserTest.php
  63. +5 −5 tests/tmp/.gitignore
  64. +9 −3 tests/tmp/config.jweb-wrongclass.php
  65. +9 −3 tests/tmp/configuration.php
View
@@ -3,11 +3,11 @@
<project name="joomla-platform" default="build" basedir=".">
<property name="source" value="libraries" />
<property name="joomlasource" value="libraries/joomla,libraries/legacy,libraries/compat,libraries/platform.php,libraries/loader.php,libraries/import.php" />
-
+
<condition property="script-suffix" value=".bat" else="">
<os family="windows" />
</condition>
-
+
<condition property="script-null" value="NUL" else="/dev/null">
<os family="windows" />
</condition>
@@ -91,7 +91,6 @@
<arg value="--extensions=php,css" />
<arg value="--report-file=${basedir}/build/logs/checkstyle.xml" />
<arg value="--standard=${basedir}/build/phpcs/Joomla" />
- <arg value="--ignore=config.example.php" />
<arg path="${source}" />
</exec>
</target>
@@ -1,36 +0,0 @@
-<?php
-class JConfigExample
-{
- public $dbtype = 'mysql';
- public $host = 'localhost';
- public $user = '';
- public $password = '';
- public $db = '';
- public $dbprefix = 'jos_';
- public $ftp_host = '127.0.0.1';
- public $ftp_port = '21';
- public $ftp_user = '';
- public $ftp_pass = '';
- public $ftp_root = '';
- public $ftp_enable = 0;
- public $tmp_path = '/tmp';
- public $log_path = '/var/logs';
- public $mailer = 'mail';
- public $mailfrom = 'admin@localhost.home';
- public $fromname = '';
- public $sendmail = '/usr/sbin/sendmail';
- public $smtpauth = '0';
- public $smtpsecure = 'none';
- public $smtpport = '25';
- public $smtpuser = '';
- public $smtppass = '';
- public $smtphost = 'localhost';
- public $debug = 0;
- public $caching = '0';
- public $cachetime = '900';
- public $language = 'en-GB';
- public $secret = null;
- public $editor = 'none';
- public $offset = 0;
- public $lifetime = 15;
-}
@@ -66,22 +66,3 @@ class_exists('JLoader') or die;
{
JLoader::register('JsonSerializable', __DIR__ . '/compat/jsonserializable.php');
}
-
-// Add deprecated constants
-// @deprecated 12.3
-define('JPATH_ISWIN', IS_WIN);
-define('JPATH_ISMAC', IS_MAC);
-
-// Register classes where the names have been changed to fit the autoloader rules
-// @deprecated 12.3
-JLoader::register('JSimpleCrypt', JPATH_PLATFORM . '/legacy/simplecrypt/simplecrypt.php');
-JLoader::register('JTree', JPATH_PLATFORM . '/legacy/base/tree.php');
-JLoader::register('JNode', JPATH_PLATFORM . '/legacy/base/node.php');
-JLoader::register('JObserver', JPATH_PLATFORM . '/legacy/base/observer.php');
-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');
@@ -449,38 +449,6 @@ public static function getAuthorisedViewLevels($userId)
}
/**
- * Method to return a list of actions for which permissions can be set given a component and section.
- *
- * @param string $component The component from which to retrieve the actions.
- * @param string $section The name of the section within the component from which to retrieve the actions.
- *
- * @return array List of actions available for the given component and section.
- *
- * @since 11.1
- *
- * @deprecated 12.3 Use JAccess::getActionsFromFile or JAccess::getActionsFromData instead.
- *
- * @codeCoverageIgnore
- *
- */
- public static function getActions($component, $section = 'component')
- {
- JLog::add(__METHOD__ . ' is deprecated. Use JAccess::getActionsFromFile or JAcces::getActionsFromData instead.', JLog::WARNING, 'deprecated');
- $actions = self::getActionsFromFile(
- JPATH_ADMINISTRATOR . '/components/' . $component . '/access.xml',
- "/access/section[@name='" . $section . "']/"
- );
- if (empty($actions))
- {
- return array();
- }
- else
- {
- return $actions;
- }
- }
-
- /**
* Method to return a list of actions from a file for which permissions can be set.
*
* @param string $file The path to the XML file.
@@ -1173,15 +1173,3 @@ protected function loadSystemUris($requestUri = null)
}
}
}
-
-/**
- * Deprecated class placeholder. You should use JApplicationWeb instead.
- *
- * @package Joomla.Platform
- * @subpackage Application
- * @since 11.3
- * @deprecated 12.3
- */
-class JWeb extends JApplicationWeb
-{
-}
@@ -254,21 +254,6 @@ public static function isSupported()
}
/**
- * Test to see if the storage handler is available.
- *
- * @return boolean True on success, false otherwise.
- *
- * @since 11.1
- * @deprecated 12.3
- */
- public static function test()
- {
- JLog::add('JCacheStorage::test() is deprecated. Use JCacheStorage::isSupported() instead.', JLog::WARNING, 'deprecated');
-
- return static::isSupported();
- }
-
- /**
* Lock cached item
*
* @param string $id The cache data id
@@ -1663,27 +1663,3 @@ protected function _mode($mode)
return true;
}
}
-
-/**
- * Deprecated class placeholder. You should use JClientFtp instead.
- *
- * @package Joomla.Platform
- * @subpackage Client
- * @since 11.1
- * @deprecated 12.3
- */
-class JFTP extends JClientFtp
-{
- /**
- * JFTP object constructor
- *
- * @param array $options Associative array of options to set
- *
- * @since 11.1
- */
- public function __construct($options)
- {
- JLog::add('JFTP is deprecated. Use JClientFtp instead.', JLog::WARNING, 'deprecated');
- parent::__construct($options);
- }
-}
@@ -637,27 +637,3 @@ public static function generatePassword($password, $type = 'md5')
return $userpassword;
}
}
-
-/**
- * Deprecated class placeholder. You should use JClientLdap instead.
- *
- * @package Joomla.Platform
- * @subpackage Client
- * @since 11.1
- * @deprecated 12.3
- */
-class JLDAP extends JClientLdap
-{
- /**
- * Constructor
- *
- * @param object $configObj An object of configuration variables
- *
- * @since 11.1
- */
- public function __construct($configObj)
- {
- JLog::add('JLDAP is deprecated. Use JClientLdap instead.', JLog::WARNING, 'deprecated');
- parent::__construct($configObj);
- }
-}
@@ -155,19 +155,4 @@ public function stderr($showSQL = false)
return JText::_('JLIB_DATABASE_FUNCTION_NOERROR');
}
}
-
- /**
- * Test to see if the connector is available.
- *
- * @return boolean True on success, false otherwise.
- *
- * @since 11.1
- * @deprecated 12.3 Use JDatabaseDriver::isSupported() instead.
- */
- public static function test()
- {
- JLog::add('JDatabase::test() is deprecated. Use JDatabaseDriver::isSupported() instead.', JLog::WARNING, 'deprecated');
-
- return static::isSupported();
- }
}
@@ -760,20 +760,6 @@ public function getIterator($column = null, $class = 'stdClass')
*
* @return boolean True if the database engine supports UTF-8 character encoding.
*
- * @since 11.1
- * @deprecated 12.3 Use hasUTFSupport() instead
- */
- public function getUTFSupport()
- {
- JLog::add('JDatabase::getUTFSupport() is deprecated. Use JDatabase::hasUTFSupport() instead.', JLog::WARNING, 'deprecated');
- return $this->hasUTFSupport();
- }
-
- /**
- * Determine whether or not the database engine supports UTF-8 character encoding.
- *
- * @return boolean True if the database engine supports UTF-8 character encoding.
- *
* @since 12.1
*/
public function hasUTFSupport()
@@ -24,10 +24,10 @@ class JObject
/**
* An array of error messages or Exception objects.
*
- * @var array
- * @since 11.1
- * @see JError
- * @deprecated 12.3 JError has been deprecated
+ * @var array
+ * @since 11.1
+ * @see JError
+ * @deprecated 13.1
*/
protected $_errors = array();
@@ -48,19 +48,6 @@ public function __construct($properties = null)
}
/**
- * Magic method to convert the object to a string gracefully.
- *
- * @return string The classname.
- *
- * @since 11.1
- * @deprecated 12.3 Classes should provide their own __toString() implementation.
- */
- public function __toString()
- {
- return get_class($this);
- }
-
- /**
* Sets a default value if not alreay assigned
*
* @param string $property The name of the property.
@@ -133,9 +120,9 @@ public function getProperties($public = true)
*
* @return string Error message
*
- * @since 11.1
- * @see JError
- * @deprecated 12.3 JError has been deprecated
+ * @since 11.1
+ * @see JError
+ * @deprecated 13.1
*/
public function getError($i = null, $toString = true)
{
@@ -169,9 +156,9 @@ public function getError($i = null, $toString = true)
*
* @return array Array of error messages or JErrors.
*
- * @since 11.1
- * @see JError
- * @deprecated 12.3 JError has been deprecated
+ * @since 11.1
+ * @see JError
+ * @deprecated 13.1
*/
public function getErrors()
{
@@ -228,9 +215,9 @@ public function setProperties($properties)
*
* @return void
*
- * @since 11.1
- * @see JError
- * @deprecated 12.3 JError has been deprecated
+ * @since 11.1
+ * @see JError
+ * @deprecated 13.1
*/
public function setError($error)
{
@@ -139,20 +139,6 @@ public static function getmicrotime()
}
/**
- * Get information about current memory usage.
- *
- * @return integer The memory usage
- *
- * @link PHP_MANUAL#memory_get_usage
- * @since 11.1
- * @deprecated 12.3 Use PHP's native memory_get_usage()
- */
- public function getMemory()
- {
- return memory_get_usage();
- }
-
- /**
* Get all profiler marks.
*
* Returns an array of all marks created since the Profiler object
@@ -190,19 +190,4 @@ public static function isSupported()
{
return true;
}
-
- /**
- * Test to see if the SessionHandler is available.
- *
- * @return boolean True on success, false otherwise.
- *
- * @since 11.1
- * @deprecated 12.3 Use JSessionStorage::isSupported() instead.
- */
- public static function test()
- {
- JLog::add('JSessionStorage::test() is deprecated. Use JSessionStorage::isSupported() instead.', JLog::WARNING, 'deprecated');
-
- return static::isSupported();
- }
}
Oops, something went wrong.

0 comments on commit 67101bc

Please sign in to comment.