Permalink
Browse files

Merging with master

  • Loading branch information...
2 parents ed4df77 + 9218fd8 commit f0552c342a1c32f5df40817aadd0cdca1e3ec7a8 @chdemko committed Nov 14, 2011
Showing with 4,520 additions and 175 deletions.
  1. +0 −1 libraries/index.html
  2. +0 −1 libraries/joomla/access/index.html
  3. +1 −1 libraries/joomla/application/cli.php
  4. +2 −2 libraries/joomla/application/component/controller.php
  5. +0 −1 libraries/joomla/application/component/index.html
  6. +0 −1 libraries/joomla/application/index.html
  7. +0 −1 libraries/joomla/application/input/index.html
  8. +0 −1 libraries/joomla/application/module/index.html
  9. +7 −7 libraries/joomla/application/web.php
  10. +0 −1 libraries/joomla/base/index.html
  11. +2 −0 libraries/joomla/base/object.php
  12. +1 −0 libraries/joomla/base/observable.php
  13. +1 −0 libraries/joomla/base/observer.php
  14. +0 −1 libraries/joomla/cache/controller/index.html
  15. +0 −1 libraries/joomla/cache/index.html
  16. +0 −1 libraries/joomla/cache/storage/helpers/index.html
  17. +0 −1 libraries/joomla/cache/storage/index.html
  18. +0 −1 libraries/joomla/client/index.html
  19. +0 −1 libraries/joomla/database/database/index.html
  20. +0 −1 libraries/joomla/database/index.html
  21. +0 −1 libraries/joomla/database/table/index.html
  22. +0 −1 libraries/joomla/document/error/index.html
  23. +0 −1 libraries/joomla/document/feed/index.html
  24. +0 −1 libraries/joomla/document/feed/renderer/index.html
  25. +0 −1 libraries/joomla/document/html/index.html
  26. +0 −1 libraries/joomla/document/html/renderer/index.html
  27. +0 −1 libraries/joomla/document/index.html
  28. +0 −1 libraries/joomla/document/json/index.html
  29. +0 −1 libraries/joomla/document/opensearch/index.html
  30. +0 −1 libraries/joomla/document/raw/index.html
  31. +0 −1 libraries/joomla/document/xml/index.html
  32. +0 −1 libraries/joomla/environment/index.html
  33. +0 −1 libraries/joomla/error/index.html
  34. +0 −1 libraries/joomla/event/index.html
  35. +0 −1 libraries/joomla/filesystem/archive/index.html
  36. +0 −1 libraries/joomla/filesystem/index.html
  37. +0 −1 libraries/joomla/filesystem/streams/index.html
  38. +0 −1 libraries/joomla/filesystem/support/index.html
  39. +0 −1 libraries/joomla/filter/index.html
  40. +0 −1 libraries/joomla/form/fields/index.html
  41. +0 −1 libraries/joomla/form/index.html
  42. +0 −1 libraries/joomla/form/rules/index.html
  43. +0 −1 libraries/joomla/html/html/index.html
  44. +0 −1 libraries/joomla/html/index.html
  45. +0 −1 libraries/joomla/html/parameter/element/index.html
  46. +0 −1 libraries/joomla/html/parameter/index.html
  47. +0 −1 libraries/joomla/html/toolbar/button/index.html
  48. +0 −1 libraries/joomla/html/toolbar/index.html
  49. +0 −1 libraries/joomla/index.html
  50. +0 −1 libraries/joomla/installer/adapters/index.html
  51. +0 −1 libraries/joomla/installer/index.html
  52. +0 −1 libraries/joomla/language/index.html
  53. +0 −1 libraries/joomla/mail/index.html
  54. +0 −1 libraries/joomla/media/filters/index.html
  55. +0 −1 libraries/joomla/media/index.html
  56. +0 −1 libraries/joomla/plugin/index.html
  57. +0 −1 libraries/joomla/registry/format/index.html
  58. +0 −1 libraries/joomla/registry/index.html
  59. +0 −1 libraries/joomla/session/index.html
  60. +0 −1 libraries/joomla/session/storage/index.html
  61. +2 −2 libraries/joomla/updater/adapters/collection.php
  62. +0 −1 libraries/joomla/updater/adapters/index.html
  63. +0 −1 libraries/joomla/updater/index.html
  64. +0 −8 libraries/joomla/user/helper.php
  65. +0 −1 libraries/joomla/user/index.html
  66. +0 −25 libraries/joomla/utilities/garbagecron.txt
  67. +0 −1 libraries/joomla/utilities/index.html
  68. +0 −1 libraries/phpmailer/index.html
  69. +0 −1 libraries/phpmailer/language/index.html
  70. +0 −1 libraries/phputf8/index.html
  71. +0 −1 libraries/phputf8/mbstring/index.html
  72. +0 −1 libraries/phputf8/native/index.html
  73. +0 −1 libraries/phputf8/utils/index.html
  74. +0 −1 libraries/simplepie/idn/index.html
  75. +0 −1 libraries/simplepie/index.html
  76. +1 −1 media/system/js/mootree-uncompressed.js
  77. +1 −1 media/system/js/mootree.js
  78. +1 −1 tests/suite/joomla/application/JCliTest.php
  79. +1 −1 tests/suite/joomla/application/JWebTest.php
  80. +3 −3 tests/suite/joomla/application/component/JControllerTest.php
  81. +11 −0 tests/suite/joomla/base/JObjectTest.php
  82. +110 −0 tests/suite/joomla/cache/JCacheControllerTest.php
  83. +8 −2 tests/suite/joomla/cache/JCacheStorageTest.php
  84. +111 −0 tests/suite/joomla/cache/storage/JCacheStorageCacheliteTest.php
  85. +110 −0 tests/suite/joomla/cache/storage/JCacheStorageWincacheTest.php
  86. +50 −0 tests/suite/joomla/cache/storage/helpers/JCacheStorageHelperTest.php
  87. +13 −17 tests/suite/joomla/document/JDocumentRendererTest.php
  88. +81 −0 tests/suite/joomla/document/error/JDocumentErrorTest.php
  89. +48 −0 tests/suite/joomla/document/feed/JFeedEnclosureTest.php
  90. +48 −0 tests/suite/joomla/document/feed/JFeedImageTest.php
  91. +50 −0 tests/suite/joomla/document/feed/JFeedItemTest.php
  92. +160 −0 tests/suite/joomla/document/html/JDocumentHTMLTest.php
  93. +50 −0 tests/suite/joomla/document/html/renderer/JDocumentRendererComponentTest.php
  94. +60 −0 tests/suite/joomla/document/html/renderer/JDocumentRendererHeadTest.php
  95. +50 −0 tests/suite/joomla/document/html/renderer/JDocumentRendererMessageTest.php
  96. +50 −0 tests/suite/joomla/document/html/renderer/JDocumentRendererModuleTest.php
  97. +50 −0 tests/suite/joomla/document/html/renderer/JDocumentRendererModulesTest.php
  98. +48 −0 tests/suite/joomla/document/opensearch/JOpenSearchImageTest.php
  99. +48 −0 tests/suite/joomla/document/opensearch/JOpenSearchUrlTest.php
  100. +20 −1 tests/suite/joomla/environment/JURITest.php
  101. +290 −0 tests/suite/joomla/error/JErrorTest.php
  102. +130 −0 tests/suite/joomla/error/JExceptionTest.php
  103. +90 −0 tests/suite/joomla/error/JProfilerTest.php
  104. +48 −0 tests/suite/joomla/event/JDispatcherTest.php
  105. +61 −0 tests/suite/joomla/filesystem/JArchiveTest.php
  106. +150 −0 tests/suite/joomla/filesystem/JFileTest.php
  107. +121 −0 tests/suite/joomla/filesystem/JFilesystemHelperTest.php
  108. +110 −0 tests/suite/joomla/filesystem/JPathTest.php
  109. +310 −0 tests/suite/joomla/filesystem/JStreamTest.php
  110. +50 −0 tests/suite/joomla/filesystem/archive/JArchiveBzip2Test.php
  111. +60 −0 tests/suite/joomla/filesystem/archive/JArchiveGzipTest.php
  112. +50 −0 tests/suite/joomla/filesystem/archive/JArchiveTarTest.php
  113. +80 −0 tests/suite/joomla/filesystem/archive/JArchiveZipTest.php
  114. +130 −0 tests/suite/joomla/filesystem/streams/JStreamStringTest.php
  115. +70 −0 tests/suite/joomla/filesystem/support/JStringControllerTest.php
  116. +0 −4 tests/suite/joomla/filter/index.html
  117. +0 −4 tests/suite/joomla/form/_testfields/index.html
  118. +0 −4 tests/suite/joomla/form/_testrules/index.html
  119. +0 −4 tests/suite/joomla/form/fields/index.html
  120. +0 −4 tests/suite/joomla/form/fields/inspectors/index.html
  121. +0 −4 tests/suite/joomla/form/index.html
  122. +0 −4 tests/suite/joomla/form/language/en-GB/index.html
  123. +0 −4 tests/suite/joomla/form/language/index.html
  124. +0 −4 tests/suite/joomla/form/rules/index.html
  125. +48 −0 tests/suite/joomla/log/LogExceptionTest.php
  126. +100 −0 tests/suite/joomla/mail/JMailHelperTest.php
  127. +181 −0 tests/suite/joomla/mail/JMailTest.php
  128. +70 −0 tests/suite/joomla/plugin/JPluginHelperTest.php
  129. +50 −0 tests/suite/joomla/plugin/JPluginTest.php
  130. +130 −0 tests/suite/joomla/session/JSessionStorageTest.php
  131. +230 −0 tests/suite/joomla/session/JSessionTest.php
  132. +111 −0 tests/suite/joomla/session/storage/JSessionStorageApcTest.php
  133. +101 −0 tests/suite/joomla/session/storage/JSessionStorageDatabaseTest.php
  134. +111 −0 tests/suite/joomla/session/storage/JSessionStorageEacceleratorTest.php
  135. +111 −0 tests/suite/joomla/session/storage/JSessionStorageMemcacheTest.php
  136. +105 −0 tests/suite/joomla/session/storage/JSessionStorageNoneTest.php
  137. +111 −0 tests/suite/joomla/session/storage/JSessionStorageWincacheTest.php
  138. +111 −0 tests/suite/joomla/session/storage/JSessionStorageXcacheTest.php
  139. +1 −1 tests/suite/joomla/string/TestHelpers/JString-helper-dataset.php
View
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -365,7 +365,7 @@ protected function fetchConfigurationData($file = '', $class = 'JConfig')
}
else
{
- throw new Exception('Configuration class does not exist.');
+ throw new RuntimeException('Configuration class does not exist.');
}
}
@@ -287,7 +287,7 @@ public static function getInstance($prefix, $config = array())
}
else
{
- throw new Exception(JText::sprintf('JLIB_APPLICATION_ERROR_INVALID_CONTROLLER', $type, $format));
+ throw new InvalidArgumentException(JText::sprintf('JLIB_APPLICATION_ERROR_INVALID_CONTROLLER', $type, $format));
}
}
@@ -298,7 +298,7 @@ public static function getInstance($prefix, $config = array())
}
else
{
- throw new Exception(JText::sprintf('JLIB_APPLICATION_ERROR_INVALID_CONTROLLER_CLASS', $class));
+ throw new InvalidArgumentException(JText::sprintf('JLIB_APPLICATION_ERROR_INVALID_CONTROLLER_CLASS', $class));
}
return self::$instance;
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -324,13 +324,13 @@ public function execute()
$this->compress();
}
- // Trigger the onBeforeRender event.
+ // Trigger the onBeforeRespond event.
$this->triggerEvent('onBeforeRespond');
// Send the application response.
$this->respond();
- // Trigger the onBeforeRender event.
+ // Trigger the onAfterRespond event.
$this->triggerEvent('onAfterRespond');
}
@@ -367,14 +367,14 @@ protected function render()
'params' => ''
);
- // Handle the convention-based default case for themes path.
- if (defined('JPATH_BASE'))
+ if ($this->get('themes.base'))
{
- $options['directory'] = JPATH_BASE . '/themes';
+ $options['directory'] = $this->get('themes.base');
}
+ // Fall back to constants.
else
{
- $options['directory'] = dirname(__FILE__) . '/themes';
+ $options['directory'] = (defined('JPATH_BASE') ? JPATH_BASE : dirname(__FILE__)) . '/themes';
}
// Parse the document.
@@ -1042,7 +1042,7 @@ protected function fetchConfigurationData($file = '', $class = 'JConfig')
}
else
{
- throw new Exception('Configuration class does not exist.');
+ throw new RuntimeException('Configuration class does not exist.');
}
}
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -239,9 +239,11 @@ public function setError($error)
*/
function toString()
{
+ // @codeCoverageIgnoreStart
// Deprecation warning.
JLog::add('JObject::toString() is deprecated.', JLog::WARNING, 'deprecated');
return $this->__toString();
+ // @codeCoverageIgnoreEnd
}
}
@@ -16,6 +16,7 @@
* @subpackage Base
* @since 11.1
* @deprecated 12.3
+ * @codeCoverageIgnore
*/
class JObservable extends JObject
{
@@ -16,6 +16,7 @@
* @subpackage Base
* @since 11.1
* @deprecated 12.3
+ * @codeCoverageIgnore
*/
abstract class JObserver extends JObject
{
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<html><body></body></html>
@@ -1 +0,0 @@
-<html><body></body></html>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -121,13 +121,13 @@ public function _startElement($parser, $name, $attrs = array())
if (!array_key_exists($col, $attrs))
{
$attrs[$col] = '';
- if ($col == 'CLIENT_ID')
+ if ($col == 'CLIENT')
{
$attrs[$col] = 'site';
}
}
}
- $client = JApplicationHelper::getClientInfo($attrs['CLIENT_ID'], 1);
+ $client = JApplicationHelper::getClientInfo($attrs['CLIENT'], 1);
$attrs['CLIENT_ID'] = $client->id;
// Lower case all of the fields
foreach ($attrs as $key => $attr)
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -531,14 +531,6 @@ public static function genRandomPassword($length = 8)
$len = strlen($salt);
$makepass = '';
- $stat = @stat(__FILE__);
- if (empty($stat) || !is_array($stat))
- {
- $stat = array(php_uname());
- }
-
- mt_srand(crc32(microtime() . implode('|', $stat)));
-
for ($i = 0; $i < $length; $i++)
{
$makepass .= $salt[mt_rand(0, $len - 1)];
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1,25 +0,0 @@
-<?php
-/**
- * @package Joomla.Platform
- * @subpackage Utilities
- *
- * @copyright Copyright (C) 2005 - 2011 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE
- */
-
-// BEFORE USING RENAME THIS FILE TO SOMETHING UNIQUE !!!
-
-// Initialize Joomla framework
-define('_JEXEC', 1);
-define('DS', DIRECTORY_SEPARATOR);
-define('JPATH_BASE', dirname(__FILE__).'/../../..');
-
-/* Required Files */
-require_once JPATH_BASE.'/includes/defines.php';
-require_once JPATH_BASE.'/includes/framework.php';
-
-// Instantiate the application.
-$app = JFactory::getApplication('site');
-
-$cache = JFactory::getCache();
-$cache->gc();
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>
@@ -629,7 +629,7 @@ var MooTreeNode = new Class({
url: url,
onSuccess: this._loaded.bind(this),
onFailure: this._load_err.bind(this)
- }).send(url, vars || '');
+ }).send(vars || '');
}.bind(this).delay(20);
//window.setTimeout(f.bind(this), 20); // allowing a small delay for the browser to draw the loader-icon.
Oops, something went wrong.

0 comments on commit f0552c3

Please sign in to comment.