Multiple bridges: fixes to pass unit test

bridges/DealabsBridge.php

@@ -15,35 +15,33 @@ class DealabsBridge extends PepperBridgeAbstract {
 			'hide_expired' => array(
 				'name' => 'Masquer les éléments expirés',
 				'type' => 'checkbox',
-				'required' => 'true'
+				'required' => true
 			),
 			'hide_local' => array(
 				'name' => 'Masquer les deals locaux',
 				'type' => 'checkbox',
 				'title' => 'Masquer les deals en magasins physiques',
-				'required' => 'true'
+				'required' => true
 			),
 			'priceFrom' => array(
 				'name' => 'Prix minimum',
 				'type' => 'text',
 				'title' => 'Prix mnimum en euros',
-				'required' => 'false',
-				'defaultValue' => ''
+				'required' => false
 			),
 			'priceTo' => array(
 				'name' => 'Prix maximum',
 				'type' => 'text',
 				'title' => 'Prix maximum en euros',
-				'required' => 'false',
-				'defaultValue' => ''
+				'required' => false
 			),
 		),
 
 		'Deals par groupe' => array(
 			'group' => array(
 				'name' => 'Groupe',
 				'type' => 'list',
-				'required' => 'true',
+				'required' => true,
 				'title' => 'Groupe dont il faut afficher les deals',
 				'values' => array(
 					'Abonnements internet' => 'abonnements-internet',
@@ -959,7 +957,7 @@ class DealabsBridge extends PepperBridgeAbstract {
 			'order' => array(
 				'name' => 'Trier par',
 				'type' => 'list',
-				'required' => 'true',
+				'required' => true,
 				'title' => 'Ordre de tri des deals',
 				'values' => array(
 					'Du deal le plus Hot au moins Hot' => '',

bridges/DemonoidBridge.php

@@ -6,72 +6,75 @@ class DemonoidBridge extends BridgeAbstract {
 	const URI = 'https://www.demonoid.pw/';
 	const DESCRIPTION = 'Returns results from search';
 
-	const PARAMETERS = array(array(
-		'q' => array(
-			'name' => 'keywords',
-			'exampleValue' => 'keyword1 keyword2…',
-			'required' => true,
-			),
-		'category' => array(
-			'name' => 'Category',
-			'type' => 'list',
-			'values' => array(
-				'All' => 0,
-				'Movies' => 1,
-				'Music' => 2,
-				'TV' => 3,
-				'Games' => 4,
-				'Applications' => 5,
-				'Pictures' => 8,
-				'Anime' => 9,
-				'Comics' => 10,
-				'Books' => 11,
-				'Audiobooks' => 17
+	const PARAMETERS = array(
+		'Keywords' => array(
+			'q' => array(
+				'name' => 'keywords',
+				'exampleValue' => 'keyword1 keyword2…',
+				'required' => true,
+				),
+			'category' => array(
+				'name' => 'Category',
+				'type' => 'list',
+				'values' => array(
+					'All' => 0,
+					'Movies' => 1,
+					'Music' => 2,
+					'TV' => 3,
+					'Games' => 4,
+					'Applications' => 5,
+					'Pictures' => 8,
+					'Anime' => 9,
+					'Comics' => 10,
+					'Books' => 11,
+					'Audiobooks' => 17
+					)
 				)
-			)
-		), array(
-		'catOnly' => array(
-			'name' => 'Category',
-			'type' => 'list',
-			'values' => array(
-				'All' => 0,
-				'Movies' => 1,
-				'Music' => 2,
-				'TV' => 3,
-				'Games' => 4,
-				'Applications' => 5,
-				'Pictures' => 8,
-				'Anime' => 9,
-				'Comics' => 10,
-				'Books' => 11,
-				'Audiobooks' => 17
+			),
+		'Category Only' => array(
+			'catOnly' => array(
+				'name' => 'Category',
+				'type' => 'list',
+				'values' => array(
+					'All' => 0,
+					'Movies' => 1,
+					'Music' => 2,
+					'TV' => 3,
+					'Games' => 4,
+					'Applications' => 5,
+					'Pictures' => 8,
+					'Anime' => 9,
+					'Comics' => 10,
+					'Books' => 11,
+					'Audiobooks' => 17
+					)
 				)
-			)
-		), array(
-		'userid' => array(
-			'name' => 'user id',
-			'exampleValue' => '00000',
-			'required' => true,
-			'type' => 'number'
 			),
-		'category' => array(
-			'name' => 'Category',
-			'type' => 'list',
-			'values' => array(
-				'All' => 0,
-				'Movies' => 1,
-				'Music' => 2,
-				'TV' => 3,
-				'Games' => 4,
-				'Applications' => 5,
-				'Pictures' => 8,
-				'Anime' => 9,
-				'Comics' => 10,
-				'Books' => 11,
-				'Audiobooks' => 17
+		'User ID' => array(
+			'userid' => array(
+				'name' => 'user id',
+				'exampleValue' => '00000',
+				'required' => true,
+				'type' => 'number'
+				),
+			'category' => array(
+				'name' => 'Category',
+				'type' => 'list',
+				'values' => array(
+					'All' => 0,
+					'Movies' => 1,
+					'Music' => 2,
+					'TV' => 3,
+					'Games' => 4,
+					'Applications' => 5,
+					'Pictures' => 8,
+					'Anime' => 9,
+					'Comics' => 10,
+					'Books' => 11,
+					'Audiobooks' => 17
+					)
 				)
 			)
-		)
 	);
 
 	public function collectData() {

bridges/DevToBridge.php

@@ -22,8 +22,7 @@ class DevToBridge extends BridgeAbstract {
 				'name' => 'Full article',
 				'type' => 'checkbox',
 				'required' => false,
-				'title' => 'Enable to receive the full article for each item',
-				'defaultValue' => false
+				'title' => 'Enable to receive the full article for each item'
 			)
 		)
 	);

bridges/ExtremeDownloadBridge.php

@@ -15,7 +15,7 @@ class ExtremeDownloadBridge extends BridgeAbstract {
 			'filter' => array(
 				'name' => 'Type de contenu',
 				'type' => 'list',
-				'required' => 'true',
+				'required' => true,
 				'title' => 'Type de contenu à suivre : Téléchargement, Streaming ou les deux',
 				'values' => array(
 					'Streaming et Téléchargement' => 'both',

bridges/FeedExpanderExampleBridge.php

@@ -3,7 +3,7 @@ class FeedExpanderExampleBridge extends FeedExpander {
 
 	const MAINTAINER = 'logmanoriginal';
 	const NAME = 'FeedExpander Example';
-	const URI = '#';
+	const URI = 'http://github.com/RSS-Bridge/rss-bridge/';
 	const DESCRIPTION = 'Example bridge to test FeedExpander';
 
 	const PARAMETERS = array(

bridges/GQMagazineBridge.php

@@ -9,7 +9,6 @@
  */
 class GQMagazineBridge extends BridgeAbstract
 {
-
 	const MAINTAINER = 'Riduidel';
 
 	const NAME = 'GQMagazine';
@@ -20,18 +19,18 @@ class GQMagazineBridge extends BridgeAbstract
 	const CACHE_TIMEOUT = 7200; // 2h
 	const DESCRIPTION = 'GQMagazine section extractor bridge. This bridge allows you get only a specific section.';
 
+	const DEFAULT_DOMAIN = 'www.gqmagazine.fr';
+
 	const PARAMETERS = array( array(
 		'domain' => array(
 			'name' => 'Domain to use',
 			'required' => true,
-			'values' => array(
-				'www.gqmagazine.fr' => 'www.gqmagazine.fr'
-			),
-			'defaultValue' => 'www.gqmagazine.fr'
+			'defaultValue' => self::DEFAULT_DOMAIN
 		),
 		'page' => array(
 			'name' => 'Initial page to load',
-			'required' => true
+			'required' => true,
+			'exampleValue' => 'sexe/news'
 		),
 	));
 
@@ -42,7 +41,12 @@ class GQMagazineBridge extends BridgeAbstract
 	);
 
 	private function getDomain() {
-		return $this->getInput('domain');
+		$domain = $this->getInput('domain');
+		if (empty($domain))
+			$domain = self::DEFAULT_DOMAIN;
+		if (strpos($domain, '://') === false)
+			$domain = 'https://' . $domain;
+		return $domain;
 	}
 
 	public function getURI()

bridges/GithubIssueBridge.php

@@ -28,7 +28,7 @@ class GithubIssueBridge extends BridgeAbstract {
 			'i' => array(
 				'name' => 'Issue number',
 				'type' => 'number',
-				'required' => 'true'
+				'required' => true
 			)
 		)
 	);

bridges/HotUKDealsBridge.php

@@ -17,35 +17,33 @@ class HotUKDealsBridge extends PepperBridgeAbstract {
 			'hide_expired' => array(
 				'name' => 'Hide expired deals',
 				'type' => 'checkbox',
-				'required' => 'true'
+				'required' => true
 			),
 			'hide_local' => array(
 				'name' => 'Hide local deals',
 				'type' => 'checkbox',
 				'title' => 'Hide deals in physical store',
-				'required' => 'true'
+				'required' => true
 			),
 			'priceFrom' => array(
 				'name' => 'Minimal Price',
 				'type' => 'text',
 				'title' => 'Minmal Price in Pounds',
-				'required' => 'false',
-				'defaultValue' => ''
+				'required' => false
 			),
 			'priceTo' => array(
 				'name' => 'Maximum Price',
 				'type' => 'text',
 				'title' => 'Maximum Price in Pounds',
-				'required' => 'false',
-				'defaultValue' => ''
+				'required' => false
 			),
 		),
 
 		'Deals per group' => array(
 			'group' => array(
 				'name' => 'Group',
 				'type' => 'list',
-				'required' => 'true',
+				'required' => true,
 				'title' => 'Group whose deals must be displayed',
 				'values' => array(
 					'2DS' => '2ds',
@@ -1319,7 +1317,7 @@ class HotUKDealsBridge extends PepperBridgeAbstract {
 			'order' => array(
 				'name' => 'Order by',
 				'type' => 'list',
-				'required' => 'true',
+				'required' => true,
 				'title' => 'Sort order of deals',
 				'values' => array(
 					'From the most to the least hot deal' => '-hot',

bridges/InstagramBridge.php

@@ -7,19 +7,19 @@ class InstagramBridge extends BridgeAbstract {
 	const DESCRIPTION = 'Returns the newest images';
 
 	const PARAMETERS = array(
-		array(
+		'Username' => array(
 			'u' => array(
 				'name' => 'username',
 				'required' => true
 			)
 		),
-		array(
+		'Hashtag' => array(
 			'h' => array(
 				'name' => 'hashtag',
 				'required' => true
 			)
 		),
-		array(
+		'Location' => array(
 			'l' => array(
 				'name' => 'location',
 				'required' => true

bridges/MydealsBridge.php

@@ -17,35 +17,33 @@ class MydealsBridge extends PepperBridgeAbstract {
 			'hide_expired' => array(
 				'name' => 'Abgelaufenes ausblenden',
 				'type' => 'checkbox',
-				'required' => 'true'
+				'required' => true
 			),
 			'hide_local' => array(
 				'name' => 'Lokales ausblenden',
 				'type' => 'checkbox',
 				'title' => 'Deals im physischen Geschäft ausblenden',
-				'required' => 'true'
+				'required' => true
 			),
 			'priceFrom' => array(
 				'name' => 'Minimaler Preis',
 				'type' => 'text',
 				'title' => 'Minmaler Preis in Euros',
-				'required' => 'false',
-				'defaultValue' => ''
+				'required' => false
 			),
 			'priceTo' => array(
 				'name' => 'Maximaler Preis',
 				'type' => 'text',
 				'title' => 'maximaler Preis in Euro',
-				'required' => 'false',
-				'defaultValue' => ''
+				'required' => false
 			),
 		),
 
 		'Deals pro Gruppen' => array(
 			'group' => array(
 				'name' => 'Gruppen',
 				'type' => 'list',
-				'required' => 'true',
+				'required' => true,
 				'title' => 'Gruppe, deren Deals angezeigt werden müssen',
 				'values' => array(
 					'Elektronik' => 'elektronik',
@@ -68,7 +66,7 @@ class MydealsBridge extends PepperBridgeAbstract {
 			'order' => array(
 				'name' => 'sortieren nach',
 				'type' => 'list',
-				'required' => 'true',
+				'required' => true,
 				'title' => 'Sortierung der deals',
 				'values' => array(
 					'Vom heißesten zum kältesten Deal' => '',