bridges: Put name/uri directly in bridge metadata

Some bridges used getName() and getURI() to put information into the
metadatas. Instead the metadatas should be initialized with data and
(not yet done) returned by default via getName() and getURI().

bridges/DilbertBridge.php

@@ -4,8 +4,8 @@ class DilbertBridge extends BridgeAbstract {
     public function loadMetadatas() {
 
         $this->maintainer = 'kranack';
-        $this->name = $this->getName();
-        $this->uri = $this->getURI();
+        $this->name = 'Dilbert Daily Strip';
+        $this->uri = 'http://dilbert.com';
         $this->description = 'The Unofficial Dilbert Daily Comic Strip';
         $this->update = "2016-08-06";
 
@@ -39,11 +39,11 @@ class DilbertBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        return 'Dilbert Daily Strip';
+        return $this->name;
     }
 
     public function getURI() {
-        return 'http://dilbert.com';
+        return $this->uri;
     }
 
     public function getCacheDuration() {

bridges/EstCeQuonMetEnProdBridge.php

@@ -3,8 +3,8 @@ class EstCeQuonMetEnProdBridge extends BridgeAbstract {
 
     public function loadMetadatas() {
         $this->maintainer = 'ORelio';
-        $this->name = $this->getName();
-        $this->uri = $this->getURI();
+        $this->name = 'Est-ce qu\'on met en prod aujourd\'hui ?';
+        $this->uri = 'https://www.estcequonmetenprodaujourdhui.info/';
         $this->description = 'Should we put a website in production today? (French)';
         $this->update = "2016-08-06";
     }
@@ -38,11 +38,11 @@ class EstCeQuonMetEnProdBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        return 'Est-ce qu\'on met en prod aujourd\'hui ?';
+        return $this->name;
     }
 
     public function getURI() {
-        return 'https://www.estcequonmetenprodaujourdhui.info/';
+        return $this->uri;
     }
 
     public function getCacheDuration() {

bridges/FuturaSciencesBridge.php

@@ -4,8 +4,8 @@ class FuturaSciencesBridge extends BridgeAbstract {
     public function loadMetadatas() {
 
         $this->maintainer = 'ORelio';
-        $this->name = $this->getName();
-        $this->uri = $this->getURI();
+        $this->name = 'Futura-Sciences Bridge';
+        $this->uri = 'http://www.futura-sciences.com/';
         $this->description = 'Returns the newest articles.';
         $this->update = '2016-08-06';
 
@@ -220,10 +220,10 @@ class FuturaSciencesBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        return 'Futura-Sciences Bridge';
+        return $this->name;
     }
 
     public function getURI() {
-        return 'http://www.futura-sciences.com/';
+        return $this->uri;
     }
 }

bridges/LichessBridge.php

@@ -5,10 +5,10 @@ class LichessBridge  extends BridgeAbstract
     public function loadMetadatas()
     {
         $this->maintainer = 'AmauryCarrade';
-        $this->name = $this->getName() . ' Bridge';
-        $this->uri = $this->getURI();
+        $this->name = 'Lichess Blog';
+        $this->uri = 'http://lichess.org/blog';
         $this->description = 'Returns the 5 newest posts from the Lichess blog (full text)';
-        $this->update = "2016-03-22";
+        $this->update = "2016-08-06";
     }
 
     public function collectData(array $param)
@@ -51,11 +51,11 @@ class LichessBridge  extends BridgeAbstract
 
     public function getName()
     {
-        return 'Lichess Blog';
+        return $this->name;
     }
 
     public function getURI()
     {
-        return 'http://lichess.org/blog';
+        return $this->uri;
     }
 }

bridges/NakedSecurityBridge.php

@@ -3,8 +3,8 @@ class NakedSecurityBridge extends BridgeAbstract {
 
     public function loadMetadatas() {
         $this->maintainer = 'ORelio';
-        $this->name = $this->getName();
-        $this->uri = $this->getURI();
+        $this->name = 'Naked Security';
+        $this->uri = 'https://nakedsecurity.sophos.com/';
         $this->description = 'Returns the newest articles.';
         $this->update = '2016-08-06';
     }
@@ -71,10 +71,10 @@ class NakedSecurityBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        return 'Naked Security';
+        return $this->name;
     }
 
     public function getURI() {
-        return 'https://nakedsecurity.sophos.com/';
+        return $this->uri;
     }
 }

bridges/NextgovBridge.php

@@ -4,8 +4,8 @@ class NextgovBridge extends BridgeAbstract {
     public function loadMetadatas() {
 
         $this->maintainer = 'ORelio';
-        $this->name = $this->getName();
-        $this->uri = $this->getURI();
+        $this->name = 'Nextgov Bridge';
+        $this->uri = 'https://www.nextgov.com/';
         $this->description = 'USA Federal technology news, best practices, and web 2.0 tools.';
         $this->update = '2016-08-06';
 
@@ -97,10 +97,10 @@ class NextgovBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        return 'Nextgov Bridge';
+        return $this->name;
     }
 
     public function getURI() {
-        return 'https://www.nextgov.com/';
+        return $this->uri;
     }
 }

bridges/ShanaprojectBridge.php

@@ -2,8 +2,8 @@
 class ShanaprojectBridge extends BridgeAbstract {
     public function loadMetadatas() {
         $this->maintainer = 'logmanoriginal';
-        $this->name = $this->getName();
-        $this->uri = $this->getURI();
+        $this->name = 'Shanaproject Bridge';
+        $this->uri = 'http://www.shanaproject.com';
         $this->description = 'Returns a list of anime from the current Season Anime List';
         $this->update = '2016-08-06';
     }
@@ -111,10 +111,10 @@ class ShanaprojectBridge extends BridgeAbstract {
     }
 
     public function getName(){
-        return 'Shanaproject Bridge';
+        return $this->name;
     }
 
     public function getURI(){
-        return 'http://www.shanaproject.com';
+        return $this->uri;
     }
 }

bridges/TheHackerNewsBridge.php

@@ -4,8 +4,8 @@ class TheHackerNewsBridge extends BridgeAbstract {
     public function loadMetadatas() {
 
         $this->maintainer = 'ORelio';
-        $this->name = $this->getName();
-        $this->uri = $this->getURI();
+        $this->name = 'The Hacker News Bridge';
+        $this->uri = 'https://thehackernews.com/';
         $this->description = 'Cyber Security, Hacking, Technology News.';
         $this->update = '2016-08-06';
 
@@ -77,10 +77,10 @@ class TheHackerNewsBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        return 'The Hacker News Bridge';
+        return $this->name;
     }
 
     public function getURI() {
-        return 'https://thehackernews.com/';
+        return $this->uri;
     }
 }

bridges/WeLiveSecurityBridge.php

@@ -3,8 +3,8 @@ class WeLiveSecurityBridge extends BridgeAbstract {
 
     public function loadMetadatas() {
         $this->maintainer = 'ORelio';
-        $this->name = $this->getName();
-        $this->uri = $this->getURI();
+        $this->name = 'We Live Security';
+        $this->uri = 'http://www.welivesecurity.com/';
         $this->description = 'Returns the newest articles.';
         $this->update = '2016-08-06';
     }
@@ -62,10 +62,10 @@ class WeLiveSecurityBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        return 'We Live Security';
+        return $this-name;
     }
 
     public function getURI() {
-        return 'http://www.welivesecurity.com/';
+        return $this->uri;
     }
 }

bridges/ZDNetBridge.php

@@ -4,8 +4,8 @@ class ZDNetBridge extends BridgeAbstract {
     public function loadMetadatas() {
 
         $this->maintainer = 'ORelio';
-        $this->name = $this->getName();
-        $this->uri = $this->getURI();
+        $this->name = 'ZDNet Bridge';
+        $this->uri = 'http://www.zdnet.com/';
         $this->description = 'Technology News, Analysis, Comments and Product Reviews for IT Professionals.';
         $this->update = '2016-08-06';
 
@@ -304,10 +304,10 @@ class ZDNetBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        return 'ZDNet Bridge';
+        return $this->name;
     }
 
     public function getURI() {
-        return 'http://www.zdnet.com/';
+        return $this->uri;
     }
 }

bridges/ZoneTelechargementBridge.php

@@ -4,8 +4,8 @@ class ZoneTelechargementBridge extends BridgeAbstract {
     public function loadMetadatas() {
 
         $this->maintainer = 'ORelio';
-        $this->name = $this->getName();
-        $this->uri = $this->getURI();
+        $this->name = 'Zone Telechargement Bridge';
+        $this->uri = 'https://www.zone-telechargement.com/';
         $this->description = 'RSS proxy returning the newest releases.<br />You may specify a category found in RSS URLs, else main feed is selected.';
         $this->update = "2016-08-06";
 
@@ -45,10 +45,10 @@ class ZoneTelechargementBridge extends BridgeAbstract {
     }
 
     public function getName() {
-        return 'Zone Telechargement Bridge';
+        return $this->name;
     }
 
     public function getURI() {
-        return 'https://www.zone-telechargement.com/';
+        return $this->uri;
     }
 }