restructured

Author: codemasher

src/Modules/Html5/Singletags.php

@@ -25,15 +25,15 @@ class Singletags extends Html5BaseModule implements ModuleInterface{
 	 * @var array
 	 * @see \chillerlan\bbcode\Modules\Tagmap::$tags
 	 */
-	protected $tags = ['br', 'clear', 'hr'];
+	protected $tags = ['br', 'clear', 'hr', 'xkcd'];
 
 	/**
 	 * An optional array of tags contained in self::$tags which are marked as "single tag"
 	 *
 	 * @var array
 	 * @see \chillerlan\bbcode\Modules\Tagmap::$singletags
 	 */
-	protected $singletags = ['br', 'clear', 'hr'];
+	protected $singletags = ['br', 'clear', 'hr', 'xkcd'];
 
 	/**
 	 * Transforms the bbcode, called from BaseModuleInterface
@@ -44,12 +44,21 @@ class Singletags extends Html5BaseModule implements ModuleInterface{
 	 */
 	public function __transform():string{
 
-		switch($this->tag){
-			case 'clear':
-				return '<br'.$this->getCssClass(['bb-clear', $this->bbtagIn(['both', 'left', 'right'], 'both')]).' />';
-			default:
-				return '<'.$this->tag.$this->getCssClass().' />';
+		if($this->tag === 'clear'){
+			return '<br'.$this->getCssClass(['bb-clear', $this->bbtagIn(['both', 'left', 'right'], 'both')]).' />';
 		}
+		else if($this->tag === 'xkcd'){
+			$num = intval($this->bbtag());
+			if(!empty($num)){
+				return '<a href="https://xkcd.com/'.$num.'/"'.$this->getCssClass(['bb-xkcd']).'>[xkcd '.$num.']</a>';
+			}
+		}
+		else{
+			return '<'.$this->tag.$this->getCssClass().' />';
+		}
+
+		return '';
+
 	}
 
 }

src/Modules/Markdown/Singletags.php

@@ -25,15 +25,15 @@ class Singletags extends MarkdownBaseModule implements ModuleInterface{
 	 * @var array
 	 * @see \chillerlan\bbcode\Modules\Tagmap::$tags
 	 */
-	protected $tags = ['br', 'hr'];
+	protected $tags = ['br', 'hr', 'xkcd'];
 
 	/**
 	 * An optional array of tags contained in self::$tags which are marked as "single tag"
 	 *
 	 * @var array
 	 * @see \chillerlan\bbcode\Modules\Tagmap::$singletags
 	 */
-	protected $singletags = ['br', 'hr'];
+	protected $singletags = ['br', 'hr', 'xkcd'];
 
 	/**
 	 * Transforms the bbcode, called from BaseModuleInterface
@@ -47,6 +47,7 @@ public function __transform():string{
 		return [
 			'br' => $this->eol_token,
 			'hr' => $this->wrap('----', $this->eol_token),
+			'xkcd' => 'https://xkcd.com/'.intval($this->bbtag()).'/',
 		][$this->tag];
 	}
 

tests/normal/Modules/HTML5ModuleTest.php

@@ -55,6 +55,7 @@ public function testEmptyTags(){
 			'br'    => '<br />',
 			'col'   => '<col />',
 			'hr'    => '<hr />',
+			'xkcd'  => '',
 			'clear' => '<br class="bb-clear both" />',
 		];
 
@@ -166,12 +167,22 @@ public function testSimpletextModule(){
 		}
 	}
 
-	public function testSingletagModule(){
-		foreach(array_keys($this->parser->getTagmap(), Singletags::class) as $tag){
-			$parsed = $this->parser->parse('['.$tag.']');
-			$expected = $tag === 'clear' ? '<br class="bb-clear both" />' : '<'.$tag.' />';
-			$this->assertEquals($expected, $parsed);
-		}
+	public function singletagDataProvider(){
+		return [
+			['[br]', '<br />'],
+			['[hr]', '<hr />'],
+			['[clear]', '<br class="bb-clear both" />'],
+			['[col]', '<col />'],
+			['[xkcd]', ''],
+			['[xkcd=1530]', '<a href="https://xkcd.com/1530/" class="bb-xkcd">[xkcd 1530]</a>'],
+		];
+	}
+
+	/**
+	 * @dataProvider singletagDataProvider
+	 */
+	public function testSingletagModule($tag, $expected){
+		$this->assertEquals($expected, $this->parser->parse($tag));
 	}
 
 	public function styledTextDataProvider(){

tests/normal/Modules/MarkdownModuleTest.php

@@ -49,6 +49,9 @@ public function testEmptyTags(){
 			if(!in_array($tag, $singletags)){
 				$this->assertEquals('', $this->parser->parse('['.$tag.'][/'.$tag.']'));
 			}
+			else if($tag === 'xkcd'){
+				$this->assertEquals('https://xkcd.com/221/', $this->parser->parse('[xkcd=221]'));
+			}
 			else{
 				$this->assertEquals($_singletags[$tag], $this->parser->parse('['.$tag.']'));
 			}

tests/normal/ParserTest.php

@@ -54,7 +54,7 @@ public function testGetNoparse(){
 	}
 
 	public function testGetSingle(){
-		$singletags = ['br','clear','col','hr'];
+		$singletags = ['br','clear','col','hr','xkcd'];
 
 		$method = $this->reflectionClass->getMethod('getSingle');
 		$this->parser = $this->reflectionClass->newInstance();