diff --git a/src/Core/Convert.php b/src/Core/Convert.php index 3db7472a2..161750ae2 100644 --- a/src/Core/Convert.php +++ b/src/Core/Convert.php @@ -225,47 +225,6 @@ class Convert return html_entity_decode($val ?? '', ENT_QUOTES, 'UTF-8'); } - /** - * Convert a XML string to a PHP array recursively. Do not - * call this function directly. - * - * @param SimpleXMLElement $xml - * - * @return mixed - * @deprecated 4.11.0 Will be removed without equivalent functionality - */ - protected static function recursiveXMLToArray($xml) - { - Deprecation::notice('4.11.0', 'Will be removed without equivalent functionality'); - $x = null; - if ($xml instanceof SimpleXMLElement) { - $attributes = $xml->attributes(); - foreach ($attributes as $k => $v) { - if ($v) { - $a[$k] = (string) $v; - } - } - $x = $xml; - $xml = get_object_vars($xml); - } - if (is_array($xml)) { - if (count($xml ?? []) === 0) { - return (string)$x; - } // for CDATA - $r = []; - foreach ($xml as $key => $value) { - $r[$key] = self::recursiveXMLToArray($value); - } - // Attributes - if (isset($a)) { - $r['@'] = $a; - } - return $r; - } - - return (string) $xml; - } - /** * Create a link if the string is a valid URL * diff --git a/src/Core/CustomMethods.php b/src/Core/CustomMethods.php index 8841a8c25..465cb5b07 100644 --- a/src/Core/CustomMethods.php +++ b/src/Core/CustomMethods.php @@ -227,7 +227,6 @@ trait CustomMethods * * @param object $object * @return array - * @deprecated 4.13.0 Will be replaced by findMethodsFrom() in CMS 5 */ protected function findMethodsFrom($object) { diff --git a/src/i18n/Data/Sources.php b/src/i18n/Data/Sources.php index f6bebdd7a..0d285fd75 100644 --- a/src/i18n/Data/Sources.php +++ b/src/i18n/Data/Sources.php @@ -19,15 +19,6 @@ class Sources implements Resettable use Injectable; use Configurable; - /** - * List of prioritised modules, in lowest to highest priority. - * - * @config - * @var array - * @deprecated 4.0.0 Use SilverStripe\Core\Manifest\ModuleManifest.module_priority instead - */ - private static $module_priority = []; - /** * Get sorted modules *