From 154a36700c80191121afec00b026daba5ff97dc8 Mon Sep 17 00:00:00 2001 From: maTh <1645099+math-GH@users.noreply.github.com> Date: Thu, 25 Apr 2024 08:28:42 +0200 Subject: Refactoring: Rename dotpath into dotnotation (#6369) * KIND_JSON_DOTPATH -> KIND_JSON_DOTNOTATION * TYPE_JSON_DOTPATH => TYPE_JSON_DOTNOTATION * json_dotpath => json_dotnotation * dotPathsForStandardJsonFeed => dotNotationForStandardJsonFeed * TYPE_JSON_DOTNOTATION = 'JSON+DotPath' => 'JSON+DotNotation' * documentation: OPML.md * convertJsonToRss() * $dotpaths => $dotnotations * FreshRSS_Feed_Exception * comment * Compatibility TYPE_JSON_DOTPATH --------- Co-authored-by: Alexandre Alapetite --- app/Services/ExportService.php | 3 ++- app/Services/ImportService.php | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'app/Services') diff --git a/app/Services/ExportService.php b/app/Services/ExportService.php index ea268fc0f..e57359906 100644 --- a/app/Services/ExportService.php +++ b/app/Services/ExportService.php @@ -20,7 +20,8 @@ class FreshRSS_Export_Service { public const TYPE_HTML_XPATH = 'HTML+XPath'; public const TYPE_XML_XPATH = 'XML+XPath'; public const TYPE_RSS_ATOM = 'rss'; - public const TYPE_JSON_DOTPATH = 'JSON+DotPath'; + public const TYPE_JSON_DOTPATH = 'JSON+DotPath'; // Legacy 1.24.0-dev + public const TYPE_JSON_DOTNOTATION = 'JSON+DotNotation'; public const TYPE_JSONFEED = 'JSONFeed'; /** diff --git a/app/Services/ImportService.php b/app/Services/ImportService.php index 5c6cea8f3..4555969ef 100644 --- a/app/Services/ImportService.php +++ b/app/Services/ImportService.php @@ -161,8 +161,9 @@ class FreshRSS_Import_Service { case strtolower(FreshRSS_Export_Service::TYPE_XML_XPATH): $feed->_kind(FreshRSS_Feed::KIND_XML_XPATH); break; + case strtolower(FreshRSS_Export_Service::TYPE_JSON_DOTNOTATION): case strtolower(FreshRSS_Export_Service::TYPE_JSON_DOTPATH): - $feed->_kind(FreshRSS_Feed::KIND_JSON_DOTPATH); + $feed->_kind(FreshRSS_Feed::KIND_JSON_DOTNOTATION); break; case strtolower(FreshRSS_Export_Service::TYPE_JSONFEED): $feed->_kind(FreshRSS_Feed::KIND_JSONFEED); @@ -254,7 +255,7 @@ class FreshRSS_Import_Service { $jsonSettings['itemUid'] = $feed_elt['frss:jsonItemUid']; } if (!empty($jsonSettings)) { - $feed->_attribute('json_dotpath', $jsonSettings); + $feed->_attribute('json_dotnotation', $jsonSettings); } $curl_params = []; -- cgit v1.2.3