diff options
| author |  maTh <1645099+math-GH@users.noreply.github.com>
| 2024-04-25 08:28:42 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2024-04-25 08:28:42 +0200 |
| commit | 154a36700c80191121afec00b026daba5ff97dc8 (patch) | |
| tree | a0693104fd8232fb85d5d25c34f3700efd40c1e2 /app/Controllers/feedController.php | |
| parent | 5e66adcc51446fe93b2cba7c25e28a06d9903223 (diff) | |
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 <alexandre@alapetite.fr>
Diffstat (limited to 'app/Controllers/feedController.php')
| -rw-r--r-- | app/Controllers/feedController.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index d1d506c0d..5e364ffcd 100644 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -259,7 +259,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { if (!empty($xPathSettings)) { $attributes['xpath'] = $xPathSettings; } - } elseif ($feed_kind === FreshRSS_Feed::KIND_JSON_DOTPATH) { + } elseif ($feed_kind === FreshRSS_Feed::KIND_JSON_DOTNOTATION) { $jsonSettings = []; if (Minz_Request::paramString('jsonFeedTitle') !== '') { $jsonSettings['feedTitle'] = Minz_Request::paramString('jsonFeedTitle', true); @@ -295,7 +295,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { $jsonSettings['itemUid'] = Minz_Request::paramString('jsonItemUid', true); } if (!empty($jsonSettings)) { - $attributes['json_dotpath'] = $jsonSettings; + $attributes['json_dotnotation'] = $jsonSettings; } } @@ -497,10 +497,10 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { if ($simplePie === null) { throw new FreshRSS_Feed_Exception('XML+XPath parsing failed for [' . $feed->url(false) . ']'); } - } elseif ($feed->kind() === FreshRSS_Feed::KIND_JSON_DOTPATH) { + } elseif ($feed->kind() === FreshRSS_Feed::KIND_JSON_DOTNOTATION) { $simplePie = $feed->loadJson(); if ($simplePie === null) { - throw new FreshRSS_Feed_Exception('JSON dotpath parsing failed for [' . $feed->url(false) . ']'); + throw new FreshRSS_Feed_Exception('JSON dot notation parsing failed for [' . $feed->url(false) . ']'); } } elseif ($feed->kind() === FreshRSS_Feed::KIND_JSONFEED) { $simplePie = $feed->loadJson(); |