Updating to v0.6.0 🎉

- Updating highlight-php
- Adding `hljs` class to `pre` container by default (configurable)
- Removing `kirby-pep` from README.md

Author: S1SYPHOS

README.md

@@ -43,7 +43,7 @@ Activate the plugin with the following line in your `config.php`:
 
 ```text
 c::set('plugin.kirby-highlight', true);
-``` 
+```
 
 Now proper classes are added to your code snippets, making  them 'themeable'. In order to do so, head over to the [styling](#styling) section. If you want to activate `kirby-highlight` only on specific domains, read about [multi-environment setups](https://getkirby.com/docs/developer-guide/configuration/options).
 
@@ -52,6 +52,7 @@ Change `kirby-highlight` options to suit your needs:
 
 | Option | Type | Default | Description |
 | --- | --- | --- | --- |
+| `plugin.kirby-highlight.class` | String | `'hljs'` | Sets class of surrounding `pre` container. |
 | `plugin.kirby-highlight.languages` | Array | `['html', 'php']` | Defines languages to be auto-detected (currently 176 languages are supported). |
 | `plugin.kirby-highlight.escaping` | Boolean | `false` | Enables character escaping (converting `<` to `&lt;`, `>` to `&gt;`, ..), see `htmlspecialchars()` [docs](http://php.net/manual/en/function.htmlspecialchars.php). |
 
@@ -62,13 +63,6 @@ All `highlight.js` styles are fully compatible with `kirby-highlight`. Just incl
 <?php echo css('assets/plugins/kirby-highlight/css/zenburn.css') ?>
 ```
 
-**Note: For most themes to work, the class `.hljs` needs to be added to the code's container!**
-
-To resolve this, any of the following will do:
-- Simply use the [Kirby PEP](https://github.com/S1SYPHOS/kirby-pep) plugin and add the following line to your `config.php`: `c::set('plugin.kirby-pep.code_class', 'language-%s hljs');`
-- Replace `.hljs` with `[class^="language-"]` in the included stylesheet
-- Copy it to your `assets/css` directory and modify it
-- Include the styles in your own workflow
 
 ## Troubleshooting
 If in doubt, check the [correct spelling](https://github.com/S1SYPHOS/kirby-highlight/tree/master/vendor/scrivo/highlight.php/Highlight/languages) of the language in question - doing otherwise breaks `kirbytext()` (see [#2](https://github.com/S1SYPHOS/kirby-highlight/issues/2)).

core/syntax_highlight.php

@@ -7,6 +7,33 @@
 use c;
 
 kirbytext::$post[] = function ($kirbytext, $value) {
+    /*
+     * I. Adding `hljs` class to all `pre` elements
+     */
+
+    // Converting kirbytext to an HTML document
+    // See https://secure.php.net/manual/en/class.domdocument.php
+    $html = new DOMDocument();
+    $html->loadHTML($text, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD);
+
+    // Retrieving all `pre` elements inside our newly created HTML document
+    // See https://secure.php.net/manual/en/class.domxpath.php & https://en.wikipedia.org/wiki/XPath
+    $query = new DOMXPath($html);
+    $elements = $query->evaluate('//pre');
+
+    // Looping through all `pre` elements, adding the class name
+    foreach ($elements as $element) {
+        $element->setAttribute('class', c::get('plugin.kirby-highlight.class', 'hljs'));
+    }
+
+    // Saving all changes
+    $text = $html->saveHTML();
+
+
+    /*
+     * II. Highlighting everything between <code> and </code>
+     */
+
     // Pattern to be matched when parsing kirbytext() (everything between <code> and </code>)
     $pattern = '~<code[^>]*>\K.*(?=</code>)~Uis';
 

kirby-highlight.php

@@ -6,7 +6,7 @@
  * @package   Kirby CMS
  * @author    S1SYPHOS <hello@twobrain.io>
  * @link      http://twobrain.io
- * @version   0.5.0
+ * @version   0.6.0
  * @license   MIT
  */
 
@@ -17,3 +17,4 @@
     // Loading settings & core
     require_once __DIR__ . DS . 'core' . DS . 'syntax_highlight.php';
 }
+

package.json

@@ -2,7 +2,7 @@
   "name": "kirby-highlight",
   "description": "Themeable server-side syntax highlighting for Kirby",
   "author": "S1SYPHOS <hello@twobrain.io>",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "type": "kirby-plugin",
   "license": "MIT"
 }

vendor/composer/ClassLoader.php

@@ -279,7 +279,7 @@ public function isClassMapAuthoritative()
      */
     public function setApcuPrefix($apcuPrefix)
     {
-        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
     }
 
     /**
@@ -377,11 +377,11 @@ private function findFileWithExtension($class, $ext)
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath.'\\';
+                $search = $subPath . '\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
+                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        $length = $this->prefixLengthsPsr4[$first][$search];
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+                        if (file_exists($file = $dir . $pathEnd)) {
                             return $file;
                         }
                     }

vendor/composer/installed.json

@@ -1,24 +1,28 @@
 [
     {
         "name": "scrivo/highlight.php",
-        "version": "v9.12.0.1",
-        "version_normalized": "9.12.0.1",
+        "version": "v9.15.6.0",
+        "version_normalized": "9.15.6.0",
         "source": {
             "type": "git",
             "url": "https://github.com/scrivo/highlight.php.git",
-            "reference": "a4930dde24bf6b9064fb52c22d71211144567e7f"
+            "reference": "5b5fc5eddb43845036f65e47f8d157ce5754511f"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/a4930dde24bf6b9064fb52c22d71211144567e7f",
-            "reference": "a4930dde24bf6b9064fb52c22d71211144567e7f",
+            "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/5b5fc5eddb43845036f65e47f8d157ce5754511f",
+            "reference": "5b5fc5eddb43845036f65e47f8d157ce5754511f",
             "shasum": ""
         },
+        "require": {
+            "ext-json": "*",
+            "ext-mbstring": "*"
+        },
         "require-dev": {
-            "phpunit/phpunit": "^4.8",
+            "phpunit/phpunit": "^4.8|^5.7",
             "symfony/finder": "^2.8"
         },
-        "time": "2017-12-24T23:01:41+00:00",
+        "time": "2019-03-06T07:43:42+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -47,7 +51,7 @@
                 "role": "Contributor"
             }
         ],
-        "description": "Server side syntax highlighter that supports 176 languages. It's a PHP port of highlight.js",
+        "description": "Server side syntax highlighter that supports 185 languages. It's a PHP port of highlight.js",
         "keywords": [
             "code",
             "highlight",

vendor/scrivo/highlight.php/.editorconfig

@@ -0,0 +1,17 @@
+# http://EditorConfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 4
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.crlf.*]
+end_of_line = crlf

vendor/scrivo/highlight.php/.gitattributes

@@ -0,0 +1,6 @@
+* text=auto
+
+*.crlf.* eol=crlf
+
+styles/* linguist-vendored
+test/**/*.txt linguist-vendored

vendor/scrivo/highlight.php/.gitignore

@@ -5,3 +5,5 @@ lib_highlight/
 *.tar.gz
 vendor/
 composer.lock
+test/**/*.js
+.php_cs.cache

vendor/scrivo/highlight.php/.php_cs.dist

@@ -0,0 +1,30 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in('demo')
+    ->in('Highlight')
+    ->in('test')
+;
+
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@PSR1' => true,
+        '@PSR2' => true,
+        '@Symfony' => true,
+        'array_syntax' => ['syntax' => 'long'],
+        'concat_space' => ['spacing' => 'one'],
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'phpdoc_align'=> true,
+        'phpdoc_order' => true,
+        'phpdoc_trim_consecutive_blank_line_separation' => true,
+        'single_quote' => false,
+        'ternary_to_null_coalescing' => true,
+        'trailing_comma_in_multiline_array' => true,
+        'yoda_style' => [
+            'equal' => false,
+            'identical' => false,
+        ],
+    ])
+    ->setFinder($finder)
+;