mirror of
https://github.com/RSS-Bridge/rss-bridge.git
synced 2025-07-22 19:55:02 +02:00
refactor: deprecate FeedItem constructor (#4201)
* fix: bug in prior commit * refactor: deprecate FeedItem constructor * test: fix
This commit is contained in:
parent
2a96bf19b5
commit
6afd13eb06
11 changed files with 78 additions and 114 deletions
|
@ -422,9 +422,18 @@ abstract class XPathAbstract extends BridgeAbstract
|
|||
}
|
||||
|
||||
foreach ($entries as $entry) {
|
||||
$item = new FeedItem();
|
||||
foreach (['title', 'content', 'uri', 'author', 'timestamp', 'enclosures', 'categories'] as $param) {
|
||||
$expression = $this->getParam($param);
|
||||
$item = [];
|
||||
$parameters = [
|
||||
'title',
|
||||
'content',
|
||||
'uri',
|
||||
'author',
|
||||
'timestamp',
|
||||
'enclosures',
|
||||
'categories',
|
||||
];
|
||||
foreach ($parameters as $parameter) {
|
||||
$expression = $this->getParam($parameter);
|
||||
if ('' === $expression) {
|
||||
continue;
|
||||
}
|
||||
|
@ -438,21 +447,21 @@ abstract class XPathAbstract extends BridgeAbstract
|
|||
continue;
|
||||
}
|
||||
|
||||
if ('categories' === $param && $typedResult instanceof \DOMNodeList) {
|
||||
if ('categories' === $parameter && $typedResult instanceof \DOMNodeList) {
|
||||
$value = [];
|
||||
foreach ($typedResult as $domNode) {
|
||||
$value[] = $this->getItemValueOrNodeValue($domNode, false);
|
||||
}
|
||||
} else {
|
||||
$value = $this->getItemValueOrNodeValue($typedResult, 'content' === $param);
|
||||
$value = $this->getItemValueOrNodeValue($typedResult, 'content' === $parameter);
|
||||
}
|
||||
|
||||
$item->__set($param, $this->formatParamValue($param, $value));
|
||||
$item[$parameter] = $this->formatParamValue($parameter, $value);
|
||||
}
|
||||
|
||||
$itemId = $this->generateItemId($item);
|
||||
if (null !== $itemId) {
|
||||
$item->setUid($itemId);
|
||||
$item['uid'] = $itemId;
|
||||
}
|
||||
|
||||
$this->items[] = $item;
|
||||
|
@ -646,10 +655,9 @@ abstract class XPathAbstract extends BridgeAbstract
|
|||
/**
|
||||
* Allows overriding default mechanism determining items Uid's
|
||||
*
|
||||
* @param FeedItem $item
|
||||
* @return string|null
|
||||
*/
|
||||
protected function generateItemId(FeedItem $item)
|
||||
protected function generateItemId(array $item)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue