Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #1579 from LouisLandry/cleanup

Initial 12.3 Cleanup
  • Loading branch information...
commit 67101bc1bb35ac66553cfe074ee713ffac0ad4d3 2 parents 55aba69 + b1b1e76
@eddieajau eddieajau authored
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
5 build.xml
@@ -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>
View
36 libraries/config.example.php
@@ -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;
-}
View
19 libraries/import.legacy.php
@@ -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');
View
32 libraries/joomla/access/access.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.
View
12 libraries/joomla/application/web.php
@@ -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
-{
-}
View
15 libraries/joomla/cache/storage.php
@@ -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
View
24 libraries/joomla/client/ftp.php
@@ -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);
- }
-}
View
24 libraries/joomla/client/ldap.php
@@ -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);
- }
-}
View
15 libraries/joomla/database/database.php
@@ -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();
- }
}
View
14 libraries/joomla/database/driver.php
@@ -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()
View
39 libraries/joomla/object/object.php
@@ -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)
{
View
14 libraries/joomla/profiler/profiler.php
@@ -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
View
15 libraries/joomla/session/storage.php
@@ -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();
- }
}
View
25 libraries/joomla/string/string.php
@@ -64,31 +64,6 @@
);
/**
- * Split a string in camel case format
- *
- * "FooBarABCDef" becomes array("Foo", "Bar", "ABC", "Def");
- * "JFooBar" becomes array("J", "Foo", "Bar");
- * "J001FooBar002" becomes array("J001", "Foo", "Bar002");
- * "abcDef" becomes array("abc", "Def");
- * "abc_defGhi_Jkl" becomes array("abc_def", "Ghi_Jkl");
- * "ThisIsA_NASAAstronaut" becomes array("This", "Is", "A_NASA", "Astronaut")),
- * "JohnFitzgerald_Kennedy" becomes array("John", "Fitzgerald_Kennedy")),
- *
- * @param string $string The source string.
- *
- * @return array The splitted string.
- *
- * @deprecated 12.3 Use JStringNormalise::fromCamelCase()
- * @since 11.3
- */
- public static function splitCamelCase($string)
- {
- JLog::add('JString::splitCamelCase has been deprecated. Use JStringNormalise::fromCamelCase.', JLog::WARNING, 'deprecated');
-
- return JStringNormalise::fromCamelCase($string, true);
- }
-
- /**
* Increments a trailing number in a string.
*
* Used to easily create distinct labels when copying objects. The method has the following styles:
View
20 libraries/joomla/user/user.php
@@ -455,26 +455,6 @@ public function setLastVisit($timestamp = null)
/**
* Method to get the user parameters
*
- * This method used to load the user parameters from a file.
- *
- * @return object The user parameters object.
- *
- * @since 11.1
- * @deprecated 12.3 Instead use JUser::getParam()
- */
- public function getParameters()
- {
- // @codeCoverageIgnoreStart
- JLog::add('JUser::getParameters() is deprecated. JUser::getParam().', JLog::WARNING, 'deprecated');
-
- return $this->_params;
-
- // @codeCoverageIgnoreEnd
- }
-
- /**
- * Method to get the user parameters
- *
* @param object $params The user parameters object
*
* @return void
View
38 libraries/legacy/access/rule.php
@@ -1,38 +0,0 @@
-<?php
-/**
- * @package Joomla.Legacy
- * @subpackage Access
- *
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-/**
- * Deprecated class placeholder. You should use JAccessRule instead.
- *
- * @package Joomla.Legacy
- * @subpackage Access
- * @since 11.1
- * @deprecated 12.3
- */
-class JRule extends JAccessRule
-{
- /**
- * Constructor.
- *
- * The input array must be in the form: array(-42 => true, 3 => true, 4 => false)
- * or an equivalent JSON encoded string.
- *
- * @param mixed $identities A JSON format string (probably from the database) or a named array.
- *
- * @since 11.1
- * @deprecated 12.3
- */
- public function __construct($identities)
- {
- JLog::add('JRule is deprecated. Use JAccessRule instead.', JLog::WARNING, 'deprecated');
- parent::__construct($identities);
- }
-}
View
38 libraries/legacy/access/rules.php
@@ -1,38 +0,0 @@
-<?php
-/**
- * @package Joomla.Legacy
- * @subpackage Access
- *
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-/**
- * Deprecated class placeholder. You should use JAccessRules instead.
- *
- * @package Joomla.Legacy
- * @subpackage Access
- * @since 11.1
- * @deprecated 12.3
- */
-class JRules extends JAccessRules
-{
- /**
- * Constructor.
- *
- * The input array must be in the form: array('action' => array(-42 => true, 3 => true, 4 => false))
- * or an equivalent JSON encoded string, or an object where properties are arrays.
- *
- * @param mixed $input A JSON format string (probably from the database) or a nested array.
- *
- * @since 11.1
- * @deprecated 12.3
- */
- public function __construct($input = '')
- {
- JLog::add('JRules is deprecated. Use JAccessRules instead.', JLog::WARNING, 'deprecated');
- parent::__construct($input);
- }
-}
View
45 libraries/legacy/application/cli.php
@@ -1,45 +0,0 @@
-<?php
-/**
- * @package Joomla.Platform
- * @subpackage Application
- *
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-/**
- * Deprecated class placeholder. You should use JApplicationCli instead.
- *
- * @package Joomla.Platform
- * @subpackage Application
- * @since 11.1
- * @deprecated 12.3 Use JApplicationCli instead.
- */
-class JCli extends JApplicationCli
-{
- /**
- * Class constructor.
- *
- * @param mixed $input An optional argument to provide dependency injection for the application's
- * input object. If the argument is a JInputCli object that object will become
- * the application's input object, otherwise a default input object is created.
- * @param mixed $config An optional argument to provide dependency injection for the application's
- * config object. If the argument is a JRegistry object that object will become
- * the application's config object, otherwise a default config object is created.
- * @param mixed $dispatcher An optional argument to provide dependency injection for the application's
- * event dispatcher. If the argument is a JEventDispatcher object that object will become
- * the application's event dispatcher, if it is null then the default event dispatcher
- * will be created based on the application's loadDispatcher() method.
- *
- * @see loadDispatcher()
- * @since 11.1
- * @deprecated 12.3 Use JApplicationCli instead.
- */
- public function __construct(JInputCli $input = null, JRegistry $config = null, JEventDispatcher $dispatcher = null)
- {
- JLog::add('JCli is deprecated. Use JApplicationCli instead.', JLog::WARNING, 'deprecated');
- parent::__construct($input, $config, $dispatcher);
- }
-}
View
47 libraries/legacy/application/daemon.php
@@ -1,47 +0,0 @@
-<?php
-/**
- * @package Joomla.Legacy
- * @subpackage Application
- *
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-JLog::add('JDaemon has been renamed to JApplicationDaemon.', JLog::WARNING, 'deprecated');
-
-/**
- * Backward Compatability Stub for JApplicationDaemon
- *
- * @package Joomla.Legacy
- * @subpackage Application
- * @since 11.1
- * @deprecated 12.3 Use JApplicationDaemon instead.
- */
-class JDaemon extends JApplicationDaemon
-{
- /**
- * Class constructor.
- *
- * @param mixed $input An optional argument to provide dependency injection for the application's
- * input object. If the argument is a JInputCli object that object will become
- * the application's input object, otherwise a default input object is created.
- * @param mixed $config An optional argument to provide dependency injection for the application's
- * config object. If the argument is a JRegistry object that object will become
- * the application's config object, otherwise a default config object is created.
- * @param mixed $dispatcher An optional argument to provide dependency injection for the application's
- * event dispatcher. If the argument is a JEventDispatcher object that object will become
- * the application's event dispatcher, if it is null then the default event dispatcher
- * will be created based on the application's loadDispatcher() method.
- *
- * @since 11.1
- * @deprecated 12.3 Use JApplicationDaemon instead.
- * @throws RuntimeException
- */
- public function __construct(JInputCli $input = null, JRegistry $config = null, JEventDispatcher $dispatcher = null)
- {
- JLog::add('JDaemon is deprecated. Use JApplicationDaemon instead.', JLog::WARNING, 'deprecated');
- parent::__construct($input, $config, $dispatcher);
- }
-}
View
154 libraries/legacy/base/node.php
@@ -1,154 +0,0 @@
-<?php
-/**
- * @package Joomla.Legacy
- * @subpackage Base
- *
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-/**
- * Tree Node Class.
- *
- * @package Joomla.Legacy
- * @subpackage Base
- * @since 11.1
- * @deprecated 12.3
- * @codeCoverageIgnore
- */
-class JNode extends JObject
-{
- /**
- * Parent node
- * @var object
- *
- * @since 11.1
- */
- protected $_parent = null;
-
- /**
- * Array of Children
- *
- * @var array
- * @since 11.1
- */
- protected $_children = array();
-
- /**
- * Constructor
- *
- * @since 11.1
- */
- public function __construct()
- {
- JLog::add('JNode::__construct() is deprecated.', JLog::WARNING, 'deprecated');
-
- return true;
- }
-
- /**
- * Add child to this node
- *
- * If the child already has a parent, the link is unset
- *
- * @param JNode &$child The child to be added
- *
- * @return void
- *
- * @since 11.1
- */
- public function addChild(JNode &$child)
- {
- JLog::add('JNode::addChild() is deprecated.', JLog::WARNING, 'deprecated');
-
- $child->setParent($this);
- }
-
- /**
- * Set the parent of a this node
- *
- * If the node already has a parent, the link is unset
- *
- * @param mixed &$parent The JNode for parent to be set or null
- *
- * @return void
- *
- * @since 11.1
- */
- public function setParent(&$parent)
- {
- JLog::add('JNode::setParent() is deprecated.', JLog::WARNING, 'deprecated');
-
- if ($parent instanceof JNode || is_null($parent))
- {
- $hash = spl_object_hash($this);
- if (!is_null($this->_parent))
- {
- unset($this->_parent->children[$hash]);
- }
- if (!is_null($parent))
- {
- $parent->_children[$hash] = & $this;
- }
- $this->_parent = & $parent;
- }
- }
-
- /**
- * Get the children of this node
- *
- * @return array The children
- *
- * @since 11.1
- */
- public function &getChildren()
- {
- JLog::add('JNode::getChildren() is deprecated.', JLog::WARNING, 'deprecated');
-
- return $this->_children;
- }
-
- /**
- * Get the parent of this node
- *
- * @return mixed JNode object with the parent or null for no parent
- *
- * @since 11.1
- */
- public function &getParent()
- {
- JLog::add('JNode::getParent() is deprecated.', JLog::WARNING, 'deprecated');
-
- return $this->_parent;
- }
-
- /**
- * Test if this node has children
- *
- * @return boolean True if there are children
- *
- * @since 11.1
- */
- public function hasChildren()
- {
- JLog::add('JNode::hasChildren() is deprecated.', JLog::WARNING, 'deprecated');
-
- return (bool) count($this->_children);
- }
-
- /**
- * Test if this node has a parent
- *
- * @return boolean True if there is a parent
- *
- * @since 11.1
- */
- public function hasParent()
- {
- JLog::add('JNode::hasParent() is deprecated.', JLog::WARNING, 'deprecated');
-
- return $this->getParent() != null;
- }
-}
View
197 libraries/legacy/base/observable.php
@@ -1,197 +0,0 @@
-<?php
-/**
- * @package Joomla.Legacy
- * @subpackage Base
- *
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-/**
- * Abstract observable class to implement the observer design pattern
- *
- * @package Joomla.Legacy
- * @subpackage Base
- * @since 11.1
- * @deprecated 12.3
- * @codeCoverageIgnore
- */
-class JObservable extends JObject
-{
- /**
- * An array of Observer objects to notify
- *
- * @var array
- * @since 11.1
- * @deprecated 12.3
- */
- protected $_observers = array();
-
- /**
- * The state of the observable object
- *
- * @var mixed
- * @since 11.1
- * @deprecated 12.3
- */
- protected $_state = null;
-
- /**
- * A multi dimensional array of [function][] = key for observers
- *
- * @var array
- * @since 11.1
- * @deprecated 12.3
- */
- protected $_methods = array();
-
- /**
- * Constructor
- *
- * Note: Make Sure it's not directly instantiated
- *
- * @deprecated 12.3
- */
- public function __construct()
- {
- $this->_observers = array();
- }
-
- /**
- * Get the state of the JObservable object
- *
- * @return mixed The state of the object.
- *
- * @since 11.1
- * @deprecated 12.3
- */
- public function getState()
- {
- return $this->_state;
- }
-
- /**
- * Update each attached observer object and return an array of their return values
- *
- * @return array Array of return values from the observers
- *
- * @since 11.1
- * @deprecated 12.3
- */
- public function notify()
- {
- // Iterate through the _observers array
- foreach ($this->_observers as $observer)
- {
- $return[] = $observer->update();
- }
-
- return $return;
- }
-
- /**
- * Attach an observer object
- *
- * @param object $observer An observer object to attach
- *
- * @return void
- *
- * @since 11.1
- * @deprecated 12.3
- */
- public function attach($observer)
- {
- if (is_array($observer))
- {
- if (!isset($observer['handler']) || !isset($observer['event']) || !is_callable($observer['handler']))
- {
- return;
- }
-
- // Make sure we haven't already attached this array as an observer
- foreach ($this->_observers as $check)
- {
- if (is_array($check) && $check['event'] == $observer['event'] && $check['handler'] == $observer['handler'])
- {
- return;
- }
- }
-
- $this->_observers[] = $observer;
- end($this->_observers);
- $methods = array($observer['event']);
- }
- else
- {
- if (!($observer instanceof JObserver))
- {
- return;
- }
-
- // Make sure we haven't already attached this object as an observer
- $class = get_class($observer);
-
- foreach ($this->_observers as $check)
- {
- if ($check instanceof $class)
- {
- return;
- }
- }
-
- $this->_observers[] = $observer;
- $methods = array_diff(get_class_methods($observer), get_class_methods('JPlugin'));
- }
-
- $key = key($this->_observers);
-
- foreach ($methods as $method)
- {
- $method = strtolower($method);
-
- if (!isset($this->_methods[$method]))
- {
- $this->_methods[$method] = array();
- }
-
- $this->_methods[$method][] = $key;
- }
- }
-
- /**
- * Detach an observer object
- *
- * @param object $observer An observer object to detach.
- *
- * @return boolean True if the observer object was detached.
- *
- * @since 11.1
- * @deprecated 12.3
- */
- public function detach($observer)
- {
- $retval = false;
-
- $key = array_search($observer, $this->_observers);
-
- if ($key !== false)
- {
- unset($this->_observers[$key]);
- $retval = true;
-
- foreach ($this->_methods as &$method)
- {
- $k = array_search($key, $method);
-
- if ($k !== false)
- {
- unset($method[$k]);
- }
- }
- }
-
- return $retval;
- }
-}
View
60 libraries/legacy/base/observer.php
@@ -1,60 +0,0 @@
-<?php
-/**
- * @package Joomla.Legacy
- * @subpackage Base
- *
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-/**
- * Abstract observer class to implement the observer design pattern
- *
- * @package Joomla.Legacy
- * @subpackage Base
- * @since 11.1
- * @deprecated 12.3
- * @codeCoverageIgnore
- */
-abstract class JObserver extends JObject
-{
- /**
- * Event object to observe.
- *
- * @var object
- * @since 11.1
- * @deprecated 12.3
- */
- protected $_subject = null;
-
- /**
- * Constructor
- *
- * @param object &$subject The object to observe.
- *
- * @since 11.1
- * @deprecated 12.3
- */
- public function __construct(&$subject)
- {
- // Register the observer ($this) so we can be notified
- $subject->attach($this);
-
- // Set the subject to observe
- $this->_subject = &$subject;
- }
-
- /**
- * Method to update the state of observable objects
- *
- * @param array &$args An array of arguments to pass to the listener.
- *
- * @return mixed
- *
- * @since 11.1
- * @deprecated 12.3
- */
- public abstract function update(&$args);
-}
View
100 libraries/legacy/base/tree.php
@@ -1,100 +0,0 @@
-<?php
-/**
- * @package Joomla.Legacy
- * @subpackage Base
- *
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-/**
- * Tree Class.
- *
- * @package Joomla.Legacy
- * @subpackage Base
- * @since 11.1
- * @deprecated 12.3
- * @codeCoverageIgnore
- */
-class JTree extends JObject
-{
- /**
- * Root node
- *
- * @var object
- * @since 11.1
- */
- protected $_root = null;
-
- /**
- * Current working node
- *
- * @var object
- * @since 11.1
- */
- protected $_current = null;
-
- /**
- * Constructor
- *
- * @since 11.1
- */
- public function __construct()
- {
- JLog::add('JTree::__construct() is deprecated.', JLog::WARNING, 'deprecated');
-
- $this->_root = new JNode('ROOT');
- $this->_current = & $this->_root;
- }
-
- /**
- * Method to add a child
- *
- * @param JNode &$node The node to process
- * @param boolean $setCurrent True to set as current working node
- *
- * @return mixed
- *
- * @since 11.1
- */
- public function addChild(JNode &$node, $setCurrent = false)
- {
- JLog::add('JTree::addChild() is deprecated.', JLog::WARNING, 'deprecated');
-
- $this->_current->addChild($node);
- if ($setCurrent)
- {
- $this->_current = &$node;
- }
- }
-
- /**
- * Method to get the parent
- *
- * @return void
- *
- * @since 11.1
- */
- public function getParent()
- {
- JLog::add('JTree::getParent() is deprecated.', JLog::WARNING, 'deprecated');
-
- $this->_current = &$this->_current->getParent();
- }
-
- /**
- * Method to get the parent
- *
- * @return void
- *
- * @since 11.1
- */
- public function reset()
- {
- JLog::add('JTree::reset() is deprecated.', JLog::WARNING, 'deprecated');
-
- $this->_current = &$this->_root;
- }
-}
View
24 libraries/legacy/database/exception.php
@@ -1,24 +0,0 @@
-<?php
-/**
- * @package Joomla.Legacy
- * @subpackage Database
- *
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-JLog::add('JDatabaseException is deprecated, use SPL Exceptions instead.', JLog::WARNING, 'deprecated');
-
-/**
- * Exception class definition for the Database subpackage.
- *
- * @package Joomla.Legacy
- * @subpackage Database
- * @since 11.1
- * @deprecated 12.3 Use semantic exceptions instead
- */
-class JDatabaseException extends RuntimeException
-{
-}
View
32 libraries/legacy/dispatcher/dispatcher.php
@@ -1,32 +0,0 @@
-<?php
-/**
- * @package Joomla.Legacy
- * @subpackage Dispatcher
- *
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-/**
- * Deprecated class placeholder. You should use JEventDispatcher instead.
- *
- * @package Joomla.Legacy
- * @subpackage Dispatcher
- * @since 11.1
- * @deprecated 12.3
- */
-class JDispatcher extends JEventDispatcher
-{
- /**
- * Constructor.
- *
- * @since 11.1
- */
- public function __construct()
- {
- JLog::add('JDispatcher is deprecated. Use JEventDispatcher instead.', JLog::WARNING, 'deprecated');
- parent::__construct();
- }
-}
View
24 libraries/legacy/log/logexception.php
@@ -1,24 +0,0 @@
-<?php
-/**
- * @package Joomla.Legacy
- * @subpackage Log
- *
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-JLog::add('LogException is deprecated, use SPL Exceptions instead.', JLog::WARNING, 'deprecated');
-
-/**
- * Exception class definition for the Log subpackage.
- *
- * @package Joomla.Legacy
- * @subpackage Log
- * @since 11.1
- * @deprecated 12.3 Use semantic exceptions instead
- */
-class LogException extends RuntimeException
-{
-}
View
85 libraries/legacy/simplecrypt/simplecrypt.php
@@ -1,85 +0,0 @@
-<?php
-/**
- * @package Joomla.Legacy
- * @subpackage Simplecrypt
- *
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-/**
- * JSimpleCrypt is a very simple encryption algorithm for encrypting/decrypting strings
- *
- * @package Joomla.Legacy
- * @subpackage Simplecrypt
- * @since 11.1
- * @deprecated 12.3 Use JCrypt instead.
- */
-class JSimplecrypt
-{
- /**
- * Encryption/Decryption Key
- *
- * @var JCrypt
- * @since 12.1
- * @deprecated 12.3 Use JCrypt instead.
- */
- private $_crypt;
-
- /**
- * Object Constructor takes an optional key to be used for encryption/decryption. If no key is given then the
- * secret word from the configuration object is used.
- *
- * @param string $privateKey Optional encryption key
- *
- * @since 11.1
- * @deprecated 12.3 Use JCrypt instead.
- */
- public function __construct($privateKey = null)
- {
- JLog::add('JSimpleCrypt is deprecated. Use JCrypt instead.', JLog::WARNING, 'deprecated');
-
- if (empty($privateKey))
- {
- $privateKey = md5(JFactory::getConfig()->get('secret'));
- }
-
- // Build the JCryptKey object.
- $key = new JCryptKey('simple', $privateKey, $privateKey);
-
- // Setup the JCrypt object.
- $this->_crypt = new JCrypt(new JCryptCipherSimple, $key);
- }
-
- /**
- * Decrypt a string
- *
- * @param string $s String to decrypt
- *
- * @return string
- *
- * @since 11.1
- * @deprecated 12.3 Use JCrypt instead.
- */
- public function decrypt($s)
- {
- return $this->_crypt->decrypt($s);
- }
-
- /**
- * Encrypt a string
- *
- * @param string $s String to encrypt
- *
- * @return string
- *
- * @since 11.1
- * @deprecated 12.3 Use JCrypt instead.
- */
- public function encrypt($s)
- {
- return $this->_crypt->encrypt($s);
- }
-}
View
62 libraries/legacy/simplepie/factory.php
@@ -1,62 +0,0 @@
-<?php
-/**
- * @package Joomla.Legacy
- * @subpackage Simplepie
- *
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-jimport('simplepie.simplepie');
-
-/**
- * Class to maintain a pathway.
- *
- * The user's navigated path within the application.
- *
- * @package Joomla.Legacy
- * @subpackage Simplepie
- * @since 12.2
- */
-class JSimplepieFactory
-{
- /**
- * Get a parsed XML Feed Source
- *
- * @param string $url Url for feed source.
- * @param integer $cache_time Time to cache feed for (using internal cache mechanism).
- *
- * @return mixed SimplePie parsed object on success, false on failure.
- *
- * @since 12.2
- * @deprecated 12.3 Will be dropped without replacement.
- */
- public static function getFeedParser($url, $cache_time = 0)
- {
- $cache = JFactory::getCache('feed_parser', 'callback');
-
- if ($cache_time > 0)
- {
- $cache->setLifeTime($cache_time);
- }
-
- $simplepie = new SimplePie(null, null, 0);
-
- $simplepie->enable_cache(false);
- $simplepie->set_feed_url($url);
- $simplepie->force_feed(true);
-
- $contents = $cache->get(array($simplepie, 'init'), null, false, false);
-
- if ($contents)
- {
- return $simplepie;
- }
-
- JLog::add(JText::_('JLIB_UTIL_ERROR_LOADING_FEED_DATA'), JLog::WARNING, 'jerror');
-
- return false;
- }
-}
View
36 libraries/legacy/web/client.php
@@ -1,36 +0,0 @@
-<?php
-/**
- * @package Joomla.Legacy
- * @subpackage Application
- *
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-/**
- * Deprecated class placeholder. You should use JApplicationWebClient instead.
- *
- * @package Joomla.Legacy
- * @subpackage Application
- * @since 11.3
- * @deprecated 12.3
- */
-class JWebClient extends JApplicationWebClient
-{
- /**
- * Class constructor.
- *
- * @param mixed $userAgent The optional user-agent string to parse.
- * @param mixed $acceptEncoding The optional client accept encoding string to parse.
- * @param mixed $acceptLanguage The optional client accept language string to parse.
- *
- * @since 11.3
- */
- public function __construct($userAgent = null, $acceptEncoding = null, $acceptLanguage = null)
- {
- JLog::add('JWebClient is deprecated. Use JApplicationWebClient instead.', JLog::WARNING, 'deprecated');
- parent::__construct($userAgent, $acceptEncoding, $acceptLanguage);
- }
-}
View
43 libraries/legacy/web/web.php
@@ -1,43 +0,0 @@
-<?php
-/**
- * @package Joomla.Legacy
- * @subpackage Application
- *
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-/**
- * Deprecated class placeholder. You should use JApplicationWeb instead.
- *
- * @package Joomla.Legacy
- * @subpackage Application
- * @since 11.3
- * @deprecated 12.3 Use JApplicationWeb instead.
- */
-class JWeb extends JApplicationWeb
-{
- /**
- * Class constructor.
- *
- * @param mixed $input An optional argument to provide dependency injection for the application's
- * input object. If the argument is a JInput object that object will become
- * the application's input object, otherwise a default input object is created.
- * @param mixed $config An optional argument to provide dependency injection for the application's
- * config object. If the argument is a JRegistry object that object will become
- * the application's config object, otherwise a default config object is created.
- * @param mixed $client An optional argument to provide dependency injection for the application's
- * client object. If the argument is a JApplicationWebClient object that object will become
- * the application's client object, otherwise a default client object is created.
- *
- * @since 11.3
- * @deprecated 12.3 Use JApplicationWeb instead.
- */
- public function __construct(JInput $input = null, JRegistry $config = null, JApplicationWebClient $client = null)
- {
- JLog::add('JWeb is deprecated. Use JApplicationWeb instead.', JLog::WARNING, 'deprecated');
- parent::__construct($input, $config, $client);
- }
-}
View
164 libraries/phputf8/README
@@ -1,82 +1,82 @@
-++PHP UTF-8++
-
-Version 0.5
-
-++DOCUMENTATION++
-
-Documentation in progress in ./docs dir
-
-http://www.phpwact.org/php/i18n/charsets
-http://www.phpwact.org/php/i18n/utf-8
-
-Important Note: DO NOT use these functions without understanding WHY
-you are using them. In particular, do not blindly replace all use of PHP's
-string functions which functions found here - most of the time you will
-not need to, and you will be introducing a significant performance
-overhead to your application. You can get a good idea of when to use what
-from reading: http://www.phpwact.org/php/i18n/utf-8
-
-Important Note: For sake of performance most of the functions here are
-not "defensive" (e.g. there is not extensive parameter checking, well
-formed UTF-8 is assumed). This is particularily relevant when is comes to
-catching badly formed UTF-8 - you should screen input on the "outer
-perimeter" with help from functions in the utf8_validation.php and
-utf8_bad.php files.
-
-Important Note: this library treats ALL ASCII characters as valid, including ASCII control characters. But if you use some ASCII control characters in XML, it will render the XML ill-formed. Don't be a bozo: http://hsivonen.iki.fi/producing-xml/#controlchar
-
-++BUGS / SUPPORT / FEATURE REQUESTS ++
-
-Please report bugs to:
-http://sourceforge.net/tracker/?group_id=142846&atid=753842
-- if you are able, please submit a failing unit test
-(http://www.lastcraft.com/simple_test.php) with your bug report.
-
-For feature requests / faster implementation of functions found here,
-please drop them in via the RFE tracker: http://sourceforge.net/tracker/?group_id=142846&atid=753845
-Particularily interested in faster implementations!
-
-For general support / help, use:
-http://sourceforge.net/tracker/?group_id=142846&atid=753843
-
-In the VERY WORST case, you can email me: hfuecks gmail com - I tend to be slow to respond though so be warned.
-
-Important Note: when reporting bugs, please provide the following
-information;
-
-PHP version, whether the iconv extension is loaded (in PHP5 it's
-there by default), whether the mbstring extension is loaded. The
-following PHP script can be used to determine this information;
-
-<?php
-print "PHP Version: " .phpversion()."<br>";
-if ( extension_loaded('mbstring') ) {
- print "mbstring available<br>";
-} else {
- print "mbstring not available<br>";
-}
-if ( extension_loaded('iconv') ) {
- print "iconv available<br>";
-} else {
- print "iconv not available<br>";
-}
-?>
-
-++LICENSING++
-
-Parts of the code in this library come from other places, under different
-licenses.
-The authors involved have been contacted (see below). Attribution for
-which code came from elsewhere can be found in the source code itself.
-
-+Andreas Gohr / Chris Smith - Dokuwiki
-There is a fair degree of collaboration / exchange of ideas and code
-beteen Dokuwiki's UTF-8 library;
-http://dev.splitbrain.org/view/darcs/dokuwiki/inc/utf8.php
-and phputf8. Although Dokuwiki is released under GPL, its UTF-8
-library is released under LGPL, hence no conflict with phputf8
-
-+Henri Sivonen (http://hsivonen.iki.fi/php-utf8/ /
-http://hsivonen.iki.fi/php-utf8/) has also given permission for his
-code to be released under the terms of the LGPL. He ported a Unicode / UTF-8
-converter from the Mozilla codebase to PHP, which is re-used in phputf8
+++PHP UTF-8++
+
+Version 0.5
+
+++DOCUMENTATION++
+
+Documentation in progress in ./docs dir
+
+http://www.phpwact.org/php/i18n/charsets
+http://www.phpwact.org/php/i18n/utf-8
+
+Important Note: DO NOT use these functions without understanding WHY
+you are using them. In particular, do not blindly replace all use of PHP's
+string functions which functions found here - most of the time you will
+not need to, and you will be introducing a significant performance
+overhead to your application. You can get a good idea of when to use what
+from reading: http://www.phpwact.org/php/i18n/utf-8
+
+Important Note: For sake of performance most of the functions here are
+not "defensive" (e.g. there is not extensive parameter checking, well
+formed UTF-8 is assumed). This is particularily relevant when is comes to
+catching badly formed UTF-8 - you should screen input on the "outer
+perimeter" with help from functions in the utf8_validation.php and
+utf8_bad.php files.
+
+Important Note: this library treats ALL ASCII characters as valid, including ASCII control characters. But if you use some ASCII control characters in XML, it will render the XML ill-formed. Don't be a bozo: http://hsivonen.iki.fi/producing-xml/#controlchar
+
+++BUGS / SUPPORT / FEATURE REQUESTS ++
+
+Please report bugs to:
+http://sourceforge.net/tracker/?group_id=142846&atid=753842
+- if you are able, please submit a failing unit test
+(http://www.lastcraft.com/simple_test.php) with your bug report.
+
+For feature requests / faster implementation of functions found here,
+please drop them in via the RFE tracker: http://sourceforge.net/tracker/?group_id=142846&atid=753845
+Particularily interested in faster implementations!
+
+For general support / help, use:
+http://sourceforge.net/tracker/?group_id=142846&atid=753843
+
+In the VERY WORST case, you can email me: hfuecks gmail com - I tend to be slow to respond though so be warned.
+
+Important Note: when reporting bugs, please provide the following
+information;
+
+PHP version, whether the iconv extension is loaded (in PHP5 it's
+there by default), whether the mbstring extension is loaded. The
+following PHP script can be used to determine this information;
+
+<?php
+print "PHP Version: " .phpversion()."<br>";
+if ( extension_loaded('mbstring') ) {
+ print "mbstring available<br>";
+} else {
+ print "mbstring not available<br>";
+}
+if ( extension_loaded('iconv') ) {
+ print "iconv available<br>";
+} else {
+ print "iconv not available<br>";
+}
+?>
+
+++LICENSING++
+
+Parts of the code in this library come from other places, under different
+licenses.
+The authors involved have been contacted (see below). Attribution for
+which code came from elsewhere can be found in the source code itself.
+
++Andreas Gohr / Chris Smith - Dokuwiki
+There is a fair degree of collaboration / exchange of ideas and code
+beteen Dokuwiki's UTF-8 library;
+http://dev.splitbrain.org/view/darcs/dokuwiki/inc/utf8.php
+and phputf8. Although Dokuwiki is released under GPL, its UTF-8
+library is released under LGPL, hence no conflict with phputf8
+
++Henri Sivonen (http://hsivonen.iki.fi/php-utf8/ /
+http://hsivonen.iki.fi/php-utf8/) has also given permission for his
+code to be released under the terms of the LGPL. He ported a Unicode / UTF-8
+converter from the Mozilla codebase to PHP, which is re-used in phputf8
View
8 libraries/platform.php
@@ -20,22 +20,22 @@
const PRODUCT = 'Joomla Platform';
// Release version.
- const RELEASE = '12.1';
+ const RELEASE = '12.3';
// Maintenance version.
const MAINTENANCE = '0';
// Development STATUS.
- const STATUS = 'Stable';
+ const STATUS = 'Dev';
// Build number.
const BUILD = 0;
// Code name.
- const CODE_NAME = 'Louis Landry';
+ const CODE_NAME = 'Curiosity';
// Release date.
- const RELEASE_DATE = '10-May-2012';
+ const RELEASE_DATE = '??-??-2012';
// Release time.
const RELEASE_TIME = '00:00';
View
8 tests/bootstrap.legacy.php
@@ -5,11 +5,11 @@
* Joomla is assumed to include the /unittest/ directory.
* eg, /path/to/joomla/unittest/
*
- * @package Joomla.UnitTest
+ * @package Joomla.UnitTest
*
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE
- * @link http://www.phpunit.de/manual/current/en/installation.html
+ * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE
+ * @link http://www.phpunit.de/manual/current/en/installation.html
*/
define('_JEXEC', 1);
View
8 tests/bootstrap.php
@@ -5,11 +5,11 @@
* Joomla is assumed to include the /unittest/ directory.
* eg, /path/to/joomla/unittest/
*
- * @package Joomla.UnitTest
+ * @package Joomla.UnitTest
*
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE
- * @link http://www.phpunit.de/manual/current/en/installation.html
+ * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE
+ * @link http://www.phpunit.de/manual/current/en/installation.html
*/
define('_JEXEC', 1);
View
11 tests/core/case/case.php
@@ -46,7 +46,7 @@
/**
* Receives the callback from JError and logs the required error information for the test.
*
- * @param JException $error The JException object from JError
+ * @param JException $error The JException object from JError
*
* @return boolean To not continue with JError processing
*
@@ -116,7 +116,7 @@ public function assignMockReturns($mockObject, $array)
* If a test expects a JError to be raised, it should call this setExpectedError first
* If you don't call this method first, the test will fail.
*
- * @param JException $error
+ * @param JException $error The JException object from JError
*
* @return JException
*
@@ -288,7 +288,7 @@ class_exists('JApplicationWeb');
*
* If passed without argument, the array is initialized if it hsn't been already
*
- * @param mixed $error
+ * @param mixed $error The JException object to expect.
*
* @return void
*
@@ -422,8 +422,9 @@ protected function setErrorHandlers($errorHandlers)
}
/**
- * Sets the JError error handlers to callback mode and points them at the test
- * logging method.
+ * Sets the JError error handlers to callback mode and points them at the test logging method.
+ *
+ * @param string $testName The name of the test class for which to set the error callback method.
*
* @return void
*
View
7 tests/core/case/database.php
@@ -56,7 +56,7 @@
/**
* Receives the callback from JError and logs the required error information for the test.
*
- * @param JException The JException object from JError
+ * @param JException $error The JException object from JError
*
* @return bool To not continue with JError processing
*
@@ -459,8 +459,9 @@ protected function setErrorHandlers($errorHandlers)
}
/**
- * Sets the JError error handlers to callback mode and points them at the test
- * logging method.
+ * Sets the JError error handlers to callback mode and points them at the test logging method.
+ *
+ * @param string $testName The name of the test class for which to set the error callback method.
*
* @return void
*
View
14 tests/core/mock/cache.php
@@ -68,11 +68,11 @@ public static function create(TestCase $test, $data = array())
/**
* Callback for the cache get method.
*
- * @param string $id The name of the cache key to retrieve.
+ * @param string $id The name of the cache key to retrieve.
*
- * @return mixed The value of the key or null if it does not exist.
+ * @return mixed The value of the key or null if it does not exist.
*
- * @since 12.1
+ * @since 12.1
*/
public function mockGet($id)
{
@@ -82,12 +82,12 @@ public function mockGet($id)
/**
* Callback for the cache get method.
*
- * @param string $key The name of the cache key.
- * @param string $group Dummy group.
+ * @param string $value The value to store.
+ * @param string $id The name of the cache key.
*
- * @return mixed The value of the key or null if it does not exist.
+ * @return mixed The value of the key or null if it does not exist.
*
- * @since 12.1
+ * @since 12.1
*/
public function mockStore($value, $id)
{
View
28 tests/core/mock/database/driver.php
@@ -25,7 +25,9 @@ class TestMockDatabaseDriver
/**
* Creates and instance of the mock JDatabase object.
*
- * @param object $test A test object.
+ * @param object $test A test object.
+ * @param string $nullDate A null date string for the driver.
+ * @param string $dateFormat A date format for the driver.
*
* @return object
*
@@ -128,11 +130,11 @@ public static function create($test, $nullDate = '0000-00-00 00:00:00', $dateFor
/**
* Callback for the dbo setQuery method.
*
- * @param string $new True to get a new query, false to get the last query.
+ * @param boolean $new True to get a new query, false to get the last query.
*
- * @return void
+ * @return void
*
- * @since 11.3
+ * @since 11.3
*/
public function mockGetQuery($new = false)
{
@@ -149,11 +151,11 @@ public function mockGetQuery($new = false)
/**
* Mocking the quote method.
*
- * @param string $value The value to be quoted.
+ * @param string $value The value to be quoted.
*
- * @return string The value passed wrapped in MySQL quotes.
+ * @return string The value passed wrapped in MySQL quotes.
*
- * @since 11.3
+ * @since 11.3
*/
public function mockQuote($value)
{
@@ -163,11 +165,11 @@ public function mockQuote($value)
/**
* Mock quoteName method.
*
- * @param string $value The value to be quoted.
+ * @param string $value The value to be quoted.
*
- * @return string The value passed wrapped in MySQL quotes.
+ * @return string The value passed wrapped in MySQL quotes.
*
- * @since 11.3
+ * @since 11.3
*/
public function mockQuoteName($value)
{
@@ -177,11 +179,11 @@ public function mockQuoteName($value)
/**
* Callback for the dbo setQuery method.
*
- * @param string $query The query.
+ * @param string $query The query.
*
- * @return void
+ * @return void
*
- * @since 11.3
+ * @since 11.3
*/
public function mockSetQuery($query)
{
View
3  tests/core/mock/dispatcher.php
@@ -33,7 +33,8 @@ class TestMockDispatcher
/**
* Creates and instance of the mock JLanguage object.
*
- * @param object $test A test object.
+ * @param object $test A test object.
+ * @param boolean $defaults True to create the default mock handlers and triggers.
*
* @return object
*
View
2  tests/core/mock/document.php
@@ -17,7 +17,7 @@ class TestMockDocument
/**
* Creates and instance of the mock JLanguage object.
*
- * @param object $test A test object.
+ * @param object $test A test object.
*
* @return object
*
View
2  tests/core/mock/language.php
@@ -17,7 +17,7 @@ class TestMockLanguage
/**
* Creates and instance of the mock JLanguage object.
*
- * @param object $test A test object.
+ * @param object $test A test object.
*
* @return object
*
View
5 tests/core/mock/rules.php
@@ -17,7 +17,7 @@ class TestMockRules
/**
* Creates an instance of the mock JDatabase object.
*
- * @param object $test A test object.
+ * @param object $test A test object.
*
* @return object
*
@@ -55,7 +55,8 @@ public static function create($test)
/**
* Mocking the allow method.
*
- * @param string $action The action.
+ * @param string $action The action.
+ * @param integer $identity The identity ID.
*
* @return mixed Boolean or null.
*
View
16 tests/core/reflection/reflection.php
@@ -17,8 +17,8 @@ class TestReflection
/**
* Helper method that gets a protected or private property in a class by relfection.
*
- * @param object $object
- * @param string $propertyName
+ * @param object $object The object from which to return the property value.
+ * @param string $propertyName The name of the property to return.
*
* @return mixed The value of the property.
*
@@ -57,8 +57,8 @@ public static function getValue($object, $propertyName)
*
* $this->asserTrue(TestCase::invoke('methodName', $this->object, 123));
*
- * @param object $object
- * @param string $methodName
+ * @param object $object The object on which to invoke the method.
+ * @param string $methodName The name of the method to invoke.
*
* @return mixed
*
@@ -84,9 +84,9 @@ public static function invoke($object, $methodName)
/**
* Helper method that sets a protected or private property in a class by relfection.
*
- * @param object $object
- * @param string $propertyName
- * @param mixed $value
+ * @param object $object The object for which to set the property.
+ * @param string $propertyName The name of the property to set.
+ * @param mixed $value The value to set for the property.
*
* @return void
*
@@ -105,7 +105,7 @@ public static function setValue($object, $propertyName, $value)
$property->setValue($object, $value);
}
// Hrm, maybe dealing with a private property in the parent class.
- else if (get_parent_class($object))
+ elseif (get_parent_class($object))
{
$property = new \ReflectionProperty(get_parent_class($object), $propertyName);
$property->setAccessible(true);
View
184 tests/suites/database/driver/mysql/JDatabaseMySQLTest.php
@@ -12,6 +12,7 @@
*
* @package Joomla.UnitTest
* @subpackage Database
+ * @since 11.1
*/
class JDatabaseMysqlTest extends TestCaseDatabaseMysql
{
@@ -31,37 +32,31 @@ public function dataTestEscape()
}
/**
- * Gets the data set to be loaded into the database during setup
+ * Tests the __destruct method.
*
- * @return xml dataset
+ * @return void
*
- * @since 11.1
- */
- protected function getDataSet()
- {
- return $this->createXMLDataSet(__DIR__ . '/stubs/database.xml');
- }
-
- /**
- * @todo Implement test__destruct().
+ * @since 11.4
*/
public function test__destruct()
{
- // Remove the following lines when you implement this test.
$this->markTestIncomplete('This test has not been implemented yet.');
}
/**
- * @todo Implement testConnected().
+ * Tests the connected method.
+ *
+ * @return void
+ *
+ * @since 11.4
*/
public function testConnected()
{
- // Remove the following lines when you implement this test.
$this->markTestIncomplete('This test has not been implemented yet.');
}
/**
- * Tests the JDatabaseMysql dropTable method.
+ * Tests the dropTable method.
*
* @return void