boyska/rss-bridge
1
0
Fork 0
forked from blallo/rss-bridge
Code Releases Activity

[core] Rename item getter/setter

Browse source 
getDatas -> getItems
setDatas -> setItems

Note: Bridge->setDatas actually sets data, where Bridge->getItems
only returns items (this is why Bridge->setDatas was not changed)
This commit is contained in:
logmanoriginal 2016-08-29 19:42:58 +02:00
parent 1e9b5c8611
commit a84016bcb6
9 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
formats/AtomFormat.php
View file

@ -19,7 +19,7 @@ class AtomFormat extends FormatAbstract{
$uri = $this->xml_encode($uri);
$entries = '';
foreach($this->getDatas() as $data){
foreach($this->getItems() as $data){
$entryAuthor = isset($data['author']) ? $this->xml_encode($data['author']) : '';
$entryTitle = isset($data['title']) ? $this->xml_encode($data['title']) : '';
$entryUri = isset($data['uri']) ? $this->xml_encode($data['uri']) : '';

2
formats/HtmlFormat.php
View file

@ -9,7 +9,7 @@ class HtmlFormat extends FormatAbstract{
$mrssquery = str_replace('format=Html', 'format=Mrss', htmlentities($_SERVER['QUERY_STRING']));
$entries = '';
foreach($this->getDatas() as $data){
foreach($this->getItems() as $data){
$entryAuthor = isset($data['author']) ? '<br /><p class="author">by: ' . $data['author'] . '</p>' : '';
$entryTitle = isset($data['title']) ? $this->sanitizeHtml(strip_tags($data['title'])) : '';
$entryUri = isset($data['uri']) ? $data['uri'] : $uri;

2
formats/JsonFormat.php
View file

@ -7,7 +7,7 @@ class JsonFormat extends FormatAbstract{
public function stringify(){
// FIXME : sometime content can be null, transform to empty string
$datas = $this->getDatas();
$datas = $this->getItems();
return json_encode($datas, JSON_PRETTY_PRINT);
}

2
formats/MrssFormat.php
View file

@ -17,7 +17,7 @@ class MrssFormat extends FormatAbstract{
$uri = $this->xml_encode(!empty($extraInfos['uri']) ? $extraInfos['uri'] : 'https://github.com/sebsauvage/rss-bridge');
$items = '';
foreach($this->getDatas() as $data){
foreach($this->getItems() as $data){
$itemAuthor = isset($data['author']) ? $this->xml_encode($data['author']) : '';
$itemTitle = strip_tags(isset($data['title']) ? $this->xml_encode($data['title']) : '');
$itemUri = isset($data['uri']) ? $this->xml_encode($data['uri']) : '';

2
formats/PlaintextFormat.php
View file

@ -6,7 +6,7 @@
class PlaintextFormat extends FormatAbstract{
public function stringify(){
$datas = $this->getDatas();
$datas = $this->getItems();
return print_r($datas, true);
}

2
index.php
View file

@ -137,7 +137,7 @@ try{
try {
$format = Format::create($format);
$format
->setDatas($bridge->getDatas())
->setItems($bridge->getItems())
->setExtraInfos(array(
'name' => $bridge->getName(),
'uri' => $bridge->getURI(),

6
lib/Bridge.php
View file

@ -139,7 +139,7 @@ abstract class BridgeAbstract implements BridgeInterface {
* Return items stored in the bridge
* @return mixed
*/
public function getDatas(){
public function getItems(){
return $this->items;
}
@ -267,7 +267,7 @@ abstract class BridgeAbstract implements BridgeInterface {
$this->collectData();
if(!is_null($this->cache)){
$this->cache->saveData($this->getDatas());
$this->cache->saveData($this->getItems());
}
return;
}
@ -360,7 +360,7 @@ abstract class BridgeAbstract implements BridgeInterface {
$this->collectData();
if(!is_null($this->cache)){
$this->cache->saveData($this->getDatas());
$this->cache->saveData($this->getItems());
}
}

9
lib/Format.php
View file

@ -7,7 +7,7 @@
interface FormatInterface{
public function stringify();
public function display();
public function setDatas(array $bridge);
public function setItems(array $bridges);
}
abstract class FormatAbstract implements FormatInterface{
@ -48,15 +48,14 @@ abstract class FormatAbstract implements FormatInterface{
return $this;
}
public function setDatas(array $datas){
public function setItems(array $datas){
$this->datas = $datas;
return $this;
}
public function getDatas(){
public function getItems(){
if( !is_array($this->datas) ){
throw new \LogicException('Feed the ' . get_class($this) . ' with "setDatas" method before !');
throw new \LogicException('Feed the ' . get_class($this) . ' with "setItems" method before !');
}
return $this->datas;

2
lib/RssBridge.php
View file

@ -32,7 +32,7 @@ require_once $vendorLibSimpleHtmlDom;
Format::setDir(__DIR__ . '/formats/');
$format = Format::create('Atom');
$format
->setDatas($bridge->getDatas())
->setItems($bridge->getItems())
->setExtraInfos(array(
'name' => $bridge->getName(),
'uri' => $bridge->getURI(),