Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Remove/deprecate more code in legacy. #1352

Merged
merged 3 commits into from

2 participants

@realityking
Collaborator

No description provided.

@LouisLandry

There are several test errors.

@realityking
Collaborator

Hmm, I'm not getting any. Could you post the failures you're getting?

@LouisLandry

All good, had a leftover file I forgot to clean.

@LouisLandry LouisLandry merged commit ae1dc8c into joomla:staging
@realityking realityking referenced this pull request from a commit in realityking/joomla-platform
@realityking realityking Fix unit test failures from #1352. a74e7d5
@realityking
Collaborator

Indeed they were failing - but only if you have Xdebug.

@dianaprajescu dianaprajescu referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@dianaprajescu dianaprajescu referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
2  libraries/joomla/installer/installer.php
@@ -2121,8 +2121,6 @@ public static function parseXMLInstallFile($path)
$data = array();
- $data['legacy'] = ($xml->getName() == 'install');
-
$data['name'] = (string) $xml->name;
// Check if we're a language. If so use metafile.
View
6 libraries/legacy/application/helper.php
@@ -167,7 +167,7 @@ public static function addClientInfo($client)
* @return array XML metadata.
*
* @since 11.1
- * @deprecated 13.3
+ * @deprecated 13.3 Use JInstaller::parseXMLInstallFile instead.
*/
public static function parseXMLInstallFile($path)
{
@@ -183,9 +183,13 @@ public static function parseXMLInstallFile($path)
* @param string $path Full path to XML file.
*
* @return array XML metadata.
+ *
+ * @deprecated 13.3 Use JInstaller::parseXMLInstallFile instead.
*/
public static function parseXMLLangMetaFile($path)
{
+ JLog::add('JApplicationHelper::parseXMLLangMetaFile is deprecated. Use JInstaller::parseXMLInstallFile instead.', JLog::WARNING, 'deprecated');
+
// Read the file to see if it's a valid component XML file
$xml = simplexml_load_file($path);
View
28 libraries/legacy/request/request.php
@@ -149,12 +149,6 @@ public static function getVar($name, $default = null, $hash = 'default', $type =
// Get the variable from the input hash and clean it
$var = self::_cleanVar($input[$name], $mask, $type);
- // Handle magic quotes compatibility
- if (get_magic_quotes_gpc() && ($var != $default) && ($hash != 'FILES'))
- {
- $var = self::_stripSlashesRecursive($var);
- }
-
$GLOBALS['_JREQUEST'][$name][$sig] = $var;
}
elseif ($default !== null)
@@ -465,12 +459,6 @@ public static function get($hash = 'default', $mask = 0)
$result = self::_cleanVar($input, $mask);
- // Handle magic quotes compatibility
- if (get_magic_quotes_gpc() && ($hash != 'FILES'))
- {
- $result = self::_stripSlashesRecursive($result);
- }
-
return $result;
}
@@ -563,20 +551,4 @@ protected static function _cleanVar($var, $mask = 0, $type = null)
}
return $var;
}
-
- /**
- * Strips slashes recursively on an array.
- *
- * @param array $value Array or (nested arrays) of strings.
- *
- * @return array The input array with stripslashes applied to it.
- *
- * @deprecated 12.1
- * @since 11.1
- */
- protected static function _stripSlashesRecursive($value)
- {
- $value = is_array($value) ? array_map(array('JRequest', '_stripSlashesRecursive'), $value) : stripslashes($value);
- return $value;
- }
}
View
5 libraries/legacy/toolbar/button.php
@@ -120,7 +120,7 @@ public function fetchIconClass($identifier)
* @package Joomla.Legacy
* @subpackage Toolbar
* @since 11.1
- * @deprecated 12.3
+ * @deprecated 13.3 Use JToolbarButton instead.
*/
abstract class JButton extends JToolbarButton
{
@@ -128,9 +128,12 @@ public function fetchIconClass($identifier)
* Constructor
*
* @param object $parent The parent
+ *
+ * @deprecated 13.3 Use JToolbarButton instead.
*/
public function __construct($parent = null)
{
+ JLog::add('JButton is deprecated. Use JToolbarButton instead.', JLog::WARNING, 'deprecated');
parent::__construct($parent);
}
}
View
2  libraries/legacy/toolbar/button/confirm.php
@@ -16,7 +16,7 @@
* @subpackage Toolbar
* @since 12.1
*/
-class JToolbarButtonConfirm extends JButton
+class JToolbarButtonConfirm extends JToolbarButton
{
/**
* Button type
View
2  libraries/legacy/toolbar/button/custom.php
@@ -16,7 +16,7 @@
* @subpackage Toolbar
* @since 12.1
*/
-class JToolbarButtonCustom extends JButton
+class JToolbarButtonCustom extends JToolbarButton
{
/**
* Button type
View
2  libraries/legacy/toolbar/button/help.php
@@ -16,7 +16,7 @@
* @subpackage Toolbar
* @since 12.1
*/
-class JToolbarButtonHelp extends JButton
+class JToolbarButtonHelp extends JToolbarButton
{
/**
* @var string Button type
View
2  libraries/legacy/toolbar/button/link.php
@@ -16,7 +16,7 @@
* @subpackage Toolbar
* @since 12.1
*/
-class JToolbarButtonLink extends JButton
+class JToolbarButtonLink extends JToolbarButton
{
/**
* Button type
View
2  libraries/legacy/toolbar/button/popup.php
@@ -16,7 +16,7 @@
* @subpackage Toolbar
* @since 12.1
*/
-class JToolbarButtonPopup extends JButton
+class JToolbarButtonPopup extends JToolbarButton
{
/**
* Button type
View
2  libraries/legacy/toolbar/button/separator.php
@@ -16,7 +16,7 @@
* @subpackage Toolbar
* @since 11.1
*/
-class JToolbarButtonSeparator extends JButton
+class JToolbarButtonSeparator extends JToolbarButton
{
/**
* Button type
View
2  libraries/legacy/toolbar/button/standard.php
@@ -16,7 +16,7 @@
* @subpackage Toolbar
* @since 12.1
*/
-class JToolbarButtonStandard extends JButton
+class JToolbarButtonStandard extends JToolbarButton
{
/**
* Button type
View
2  libraries/legacy/utilities/xmlelement.php
@@ -9,6 +9,8 @@
defined('JPATH_PLATFORM') or die;
+JLog::add('JXMLElement is deprecated. Use SimpleXMLElement.', JLog::WARNING, 'deprecated');
+
/**
* Wrapper class for php SimpleXMLElement.
*
Something went wrong with that request. Please try again.