More tests.

dereuromark · Jan 23, 2016 · c9827f2 · c9827f2
1 parent c4a7998
commit c9827f2
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 9 deletions.
diff --git a/src/Highlighter/Highlighter.php b/src/Highlighter/Highlighter.php
@@ -29,8 +29,8 @@ public function __construct(array $config = []) {
 	 * @return string
 	 */
 	protected function _prepare($string) {
-		if ($this->_config['tabsToSpaces']) {
-			$string = preg_replace('/\t/', str_repeat(' ', $this->_config['tabsToSpaces']), $string);
+		if ($this->_config['tabToSpaces']) {
+			$string = preg_replace('/\t/', str_repeat(' ', $this->_config['tabToSpaces']), $string);
 		}
 		return $string;
 	}

diff --git a/src/Highlighter/JsHighlighter.php b/src/Highlighter/JsHighlighter.php
@@ -9,7 +9,7 @@ class JsHighlighter extends Highlighter {
 	 */
 	protected $_defaultConfig = [
 		'escape' => true,
-		'tabsToSpaces' => 4,
+		'tabToSpaces' => 4,
 		'templates' => [
 			'code' => '<pre><code{{attr}}>{{content}}</code></pre>'
 		],

diff --git a/src/Highlighter/PhpHighlighter.php b/src/Highlighter/PhpHighlighter.php
@@ -10,7 +10,8 @@ class PhpHighlighter extends Highlighter {
 	protected $_defaultConfig = [
 		'templates' => [
 			'code' => '<pre{{attr}}>{{content}}</pre>'
-		]
+		],
+		'prefix' => 'language-'
 	];
 
 	/**
@@ -23,7 +24,7 @@ public function highlight($text, array $options = []) {
 
 		$options += $this->_config;
 
-		$attr = ['class' => 'lang-' . $options['lang']];
+		$attr = ['class' => $options['prefix'] . $options['lang']];
 
 		$options['attr'] = $this->templater()->formatAttributes($attr);
 		$options['content'] = str_replace(["\r\n", "\n", "\r"], '', $string);

diff --git a/src/View/Helper/HighlighterHelper.php b/src/View/Helper/HighlighterHelper.php
@@ -19,7 +19,6 @@ class HighlighterHelper extends Helper {
 	protected $_defaultConfig = [
 		'highlighter' => '\Markup\Highlighter\PhpHighlighter',
 		'debug' => null, // Enable caching mode
-		//'autoParse' => false,
 	];
 
 	/**
@@ -38,6 +37,14 @@ public function __construct(View $View, array $config = []) {
 	}
 
 	/**
+	 * Highlight a string.
+	 *
+	 * Options, depending on the specific highlighter class used:
+	 * - templates
+	 * - escape (defaults to true)
+	 * - tabToSpaces (defaults to 4)
+	 * - prefix (defaults to `language-`)
+	 *
 	 * @param string $text
 	 * @param array $options
 	 * @return string

diff --git a/tests/TestCase/View/Helper/HighlighterHelperTest.php b/tests/TestCase/View/Helper/HighlighterHelperTest.php
@@ -54,7 +54,20 @@ public function testHighlight() {
 TEXT;
 
 		$result = $this->Highlighter->highlight($text, ['lang' => 'php']);
-		$expected = '<pre class="lang-php"><code><span style="color: #000000">$key&nbsp;=&nbsp;\'string\'&nbsp;.&nbsp;$this-&gt;something-&gt;do(true);&nbsp;//&nbsp;Some&nbsp;comment</span></code></pre>';
+		$expected = '<pre class="language-php"><code><span style="color: #000000">$key&nbsp;=&nbsp;\'string\'&nbsp;.&nbsp;$this-&gt;something-&gt;do(true);&nbsp;//&nbsp;Some&nbsp;comment</span></code></pre>';
+		$this->assertSame($expected, $result);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testHighlightPrefix() {
+		$text = <<<'TEXT'
+$key = 'string' . $this->something->do(true);
+TEXT;
+
+		$result = $this->Highlighter->highlight($text, ['lang' => 'php', 'prefix' => 'l-']);
+		$expected = '<pre class="l-php"><code><span style="color: #000000">$key&nbsp;=&nbsp;\'string\'&nbsp;.&nbsp;$this-&gt;something-&gt;do(true);</span></code></pre>';
 		$this->assertSame($expected, $result);
 	}
 
@@ -117,13 +130,13 @@ public function testHighlightIndentation() {
 TEXT;
 
 		$result = $this->Highlighter->highlight($text, ['lang' => 'php']);
-		$expected = '<pre class="lang-php"><code><span style="color: #000000">if&nbsp;($foo)&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;while&nbsp;(true)&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$this-&gt;doSth();<br />&nbsp;&nbsp;&nbsp;&nbsp;}<br />}</span></code></pre>';
+		$expected = '<pre class="language-php"><code><span style="color: #000000">if&nbsp;($foo)&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;while&nbsp;(true)&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$this-&gt;doSth();<br />&nbsp;&nbsp;&nbsp;&nbsp;}<br />}</span></code></pre>';
 		$this->assertEquals($expected, $result);
 
 		$this->Highlighter->config('highlighter', 'Markup\Highlighter\JsHighlighter');
 
 		$result = $this->Highlighter->highlight($text, ['lang' => 'php']);
-		$expected = '<pre class="lang-php"><code><span style="color: #000000">if&nbsp;($foo)&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;while&nbsp;(true)&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$this-&gt;doSth();<br />&nbsp;&nbsp;&nbsp;&nbsp;}<br />}</span></code></pre>';
+		$expected = '<pre class="language-php"><code><span style="color: #000000">if&nbsp;($foo)&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;while&nbsp;(true)&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;$this-&gt;doSth();<br />&nbsp;&nbsp;&nbsp;&nbsp;}<br />}</span></code></pre>';
 		$this->assertSame($expected, $result);
 
 	}