Changeset 1787934

Timestamp:

12/16/2017 09:29:13 AM (8 years ago)

Author:

frankverhoeven

Message:

Push 2.0.2

Location:

fv-code-highlighter

Files:

• tags/2.0.2 (copied) (copied from fv-code-highlighter/trunk)
• tags/2.0.2/cache (copied) (copied from fv-code-highlighter/trunk/cache)
• tags/2.0.2/composer.json (copied) (copied from fv-code-highlighter/trunk/composer.json)
• tags/2.0.2/fv-code-highlighter.php (copied) (copied from fv-code-highlighter/trunk/fv-code-highlighter.php) (1 diff)
• tags/2.0.2/public (copied) (copied from fv-code-highlighter/trunk/public)
• tags/2.0.2/public/css/fvch-styles.css (deleted)
• tags/2.0.2/public/css/fvch-styles.min.css (copied) (copied from fv-code-highlighter/trunk/public/css/fvch-styles.min.css) (1 diff)
• tags/2.0.2/public/css/fvch-styles.scss (added)
• tags/2.0.2/readme.txt (copied) (copied from fv-code-highlighter/trunk/readme.txt) (3 diffs)
• tags/2.0.2/screenshot-1.png (copied) (copied from fv-code-highlighter/trunk/screenshot-1.png)
• tags/2.0.2/screenshot-2.png (copied) (copied from fv-code-highlighter/trunk/screenshot-2.png)
• tags/2.0.2/screenshot-3.png (copied) (copied from fv-code-highlighter/trunk/screenshot-3.png)
• tags/2.0.2/screenshot-4.png (copied) (copied from fv-code-highlighter/trunk/screenshot-4.png)
• tags/2.0.2/screenshot-5.png (copied) (copied from fv-code-highlighter/trunk/screenshot-5.png)
• tags/2.0.2/screenshot-6.png (copied) (copied from fv-code-highlighter/trunk/screenshot-6.png)
• tags/2.0.2/screenshot-7.png (copied) (copied from fv-code-highlighter/trunk/screenshot-7.png)
• tags/2.0.2/src (copied) (copied from fv-code-highlighter/trunk/src)
• tags/2.0.2/src/Admin/Options.php (modified) (2 diffs)
• tags/2.0.2/src/Application/Bootstrap.php (modified) (1 diff)
• tags/2.0.2/src/Cache.php (modified) (3 diffs)
• tags/2.0.2/src/Highlighter/AbstractHighlighter.php (modified) (2 diffs)
• tags/2.0.2/src/Highlighter/Php/Factory.php (modified) (5 diffs)
• tags/2.0.2/src/Highlighter/Php/Php.php (modified) (2 diffs)
• tags/2.0.2/src/Installer.php (modified) (1 diff)
• tags/2.0.2/src/Options.php (copied) (copied from fv-code-highlighter/trunk/src/Options.php) (1 diff)
• tags/2.0.2/src/Output.php (modified) (4 diffs)
• tags/2.0.2/src/Parser/Element/Block.php (modified) (2 diffs)
• tags/2.0.2/src/Parser/Parser.php (modified) (4 diffs)
• trunk/fv-code-highlighter.php (modified) (1 diff)
• trunk/public/css/fvch-styles.css (deleted)
• trunk/public/css/fvch-styles.min.css (modified) (1 diff)
• trunk/public/css/fvch-styles.scss (added)
• trunk/readme.txt (modified) (3 diffs)
• trunk/screenshot-1.png (modified) (previous)
• trunk/screenshot-2.png (modified) (previous)
• trunk/screenshot-3.png (modified) (previous)
• trunk/screenshot-4.png (modified) (previous)
• trunk/screenshot-5.png (modified) (previous)
• trunk/screenshot-6.png (modified) (previous)
• trunk/screenshot-7.png (modified) (previous)
• trunk/src/Admin/Options.php (modified) (2 diffs)
• trunk/src/Application/Bootstrap.php (modified) (1 diff)
• trunk/src/Cache.php (modified) (3 diffs)
• trunk/src/Highlighter/AbstractHighlighter.php (modified) (2 diffs)
• trunk/src/Highlighter/Php/Factory.php (modified) (5 diffs)
• trunk/src/Highlighter/Php/Php.php (modified) (2 diffs)
• trunk/src/Installer.php (modified) (1 diff)
• trunk/src/Options.php (modified) (1 diff)
• trunk/src/Output.php (modified) (4 diffs)
• trunk/src/Parser/Element/Block.php (modified) (2 diffs)
• trunk/src/Parser/Parser.php (modified) (4 diffs)

fv-code-highlighter/tags/2.0.2/fv-code-highlighter.php

@@ -7 +7 @@
  * Author:      Frank Verhoeven
  * Author URI:  https://frankverhoeven.me/
- * Version:     2.0.1
+ * Version:     2.0.2
  */
 
 final class FvCodeHighlighter
 {
-    const VERSION = '2.0.1';
+    const VERSION = '2.0.2';
 
     /**

fv-code-highlighter/tags/2.0.2/public/css/fvch-styles.min.css

@@ -1 @@
-.fvch-hide-if-no-js{display:none !important}.fvch-codeblock{background:url(../images/notepaper.png) top left repeat;border:1px solid #d2d2d2;padding:0 !important;margin:0 0 1em;border-radius:3px;overflow-x:auto;position:relative;font-size:10px}.fvch-codeblock table,.fvch-codeblock thead,.fvch-codeblock tbody,.fvch-codeblock tr,.fvch-codeblock td,.fvch-codeblock pre{padding:0;margin:0;border:none}.fvch-codeblock pre{white-space:pre;padding-left:.5em;font-family:"Monaco", "Courier New", Courier, monospace;border:none !important;background:none !important;color:inherit !important}.fvch-toolbox{position:absolute;top:0;right:0;display:none;border-left:1px solid #d2d2d2;border-bottom:1px solid #d2d2d2;border-bottom-left-radius:3px;border-top-right-radius:3px;background:#fff;padding:3px 6px 0}.fvch-codeblock:hover .fvch-toolbox{display:block}.fvch-toolbox .fvch-toolbox-icon{border:none !important;background:none !important;cursor:pointer !important;margin:0 4px 4px 0 !important;padding:2px !important;height:20px}.fvch-toolbox .fvch-toolbox-icon:last-child{margin-right:0 !important}td.fvch-line-number{text-align:right;color:#666;width:1%;min-width:30px;padding:0 .5em;background:#e2e2e2;border-right:1px solid #d2d2d2;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}td.fvch-line-number:before{content:attr(data-line-number)}.general{color:#000;font-weight:normal}.general-number{color:#f00}.general-operator{color:#00f}.general-brackets{color:#009}.general-string{color:#c00}.bash{color:#000}.bash-comment{color:#999}.bash-number{color:#f00}.bash-operator{color:#00f}.bash-brackets{color:#009}.bash-command{color:#060}.bash-string{color:#c00}.css{color:#f0f}.css-background{background-color:#fff}.css-import{color:#099;font-weight:bold}.css-media{color:#900;font-weight:bold}.css-comment{color:#999}.css-important{color:#f00;font-weight:bold}.css-property{color:#009}.css-selector{color:#f0f}.css-string{color:#060;font-weight:normal}.css-value{color:#00f}.css-rest{color:#f0f;font-weight:bold}.html{font-weight:normal;color:#000}.html-anchor-element{color:#060}.html-attribute{color:#00f}.html-comment{color:#999}.html-form-element{color:#f90}.html-image-element{color:#909}.html-object-element{color:#900}.html-other-element{color:#009}.html-script-element{color:#900}.html-special-char{color:#000;font-weight:bold}.html-style-element{color:#909}.html-table-element{color:#099}.html-text{color:#000}.php{color:#000;font-weight:normal}.php-script-tag{color:#d00;font-weight:bold}.php-comment{color:#f90}.php-constant{color:#520}.php-function{color:#00f}.php-number{color:#f00}.php-operator{color:#00f}.php-brackets{color:#009}.php-keyword{color:#006600}.php-string{color:#c00}.php-var-type{color:#099}.php-var{color:#06f}.xml{color:#000}.xml-string{color:#060}.xml-comment,.xml-comment span{color:#999}.xml-number{color:#f00}.xml-element{color:#009}.xml-text{color:#000}.javascript{color:#000}.js-string{color:#00f}.js-bracket{color:#009;font-weight:bold}.js-client-keyword{color:#909}.js-comment{color:#999}.js-function-keyword{color:#000;font-weight:bold}.js-native-keyword{color:#099}.js-number{color:#f00}.js-operator{color:#00f}.js-regexp{color:#060}.js-reserved-keyword{color:#009;font-weight:bold}.js-string{color:#00f}
+.fvch-hide-if-no-js{display:none !important}.fvch-codeblock{background:url(../images/notepaper.png) top left repeat;border:1px solid #d2d2d2;padding:0 !important;margin:0 0 1em;border-radius:3px;overflow-x:auto;position:relative}.fvch-codeblock table,.fvch-codeblock tbody,.fvch-codeblock tr,.fvch-codeblock td,.fvch-codeblock pre{padding:0;margin:0;border:none}.fvch-codeblock pre{white-space:pre;padding-left:.5em;font-family:"Monaco", "Courier New", Courier, monospace;border:none !important;background:none !important;color:inherit !important}.fvch-toolbox{position:absolute;top:0;right:0;display:none;border-left:1px solid #d2d2d2;border-bottom:1px solid #d2d2d2;border-bottom-left-radius:3px;border-top-right-radius:3px;background:#fff;padding:3px 6px 0}.fvch-codeblock:hover .fvch-toolbox{display:block}.fvch-toolbox .fvch-toolbox-icon{border:none !important;background:none !important;cursor:pointer !important;margin:0 4px 4px 0 !important;padding:2px !important;height:20px}.fvch-toolbox .fvch-toolbox-icon:last-child{margin-right:0 !important}td.fvch-line-number{text-align:right;color:#666;width:1%;min-width:30px;padding:0 .5em;background:#e2e2e2;border-right:1px solid #d2d2d2;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}td.fvch-line-number:before{content:attr(data-line-number)}table.fvch-code tr:first-child td{padding-top:5px}table.fvch-code tr:last-child td{padding-bottom:5px}.general{color:#000;font-weight:normal}.general-number{color:#2934d4}.general-operator{color:#000}.general-brackets{color:#009}.general-string{color:#cf3125}.bash{color:#000}.bash-comment{color:#008312}.bash-number{color:#2934d4}.bash-operator{color:#000}.bash-brackets{color:#009}.bash-command{color:#b833a1}.bash-string{color:#cf3125}.css{color:#f0f}.css-background{background-color:#fff}.css-import{color:#099;font-weight:bold}.css-media{color:#900;font-weight:bold}.css-comment{color:#999}.css-important{color:#f00;font-weight:bold}.css-property{color:#009}.css-selector{color:#f0f}.css-string{color:#060;font-weight:normal}.css-value{color:#00f}.css-rest{color:#f0f;font-weight:bold}.html{font-weight:normal;color:#000}.html-anchor-element{color:#060}.html-attribute{color:#00f}.html-comment{color:#999}.html-form-element{color:#f90}.html-image-element{color:#909}.html-object-element{color:#900}.html-other-element{color:#009}.html-script-element{color:#900}.html-special-char{color:#000;font-weight:bold}.html-style-element{color:#909}.html-table-element{color:#099}.html-text{color:#000}.php{color:#000;font-weight:normal}.php-script-tag{color:#7c226d;font-weight:bold}.php-comment{color:#008312}.php-comment-phpdoc{color:#00500b}.php-constant{color:#77492d}.php-function{color:#3d237f}.php-method{color:#33595d}.php-class{color:#508187}.php-number{color:#2934d4}.php-operator{color:#000}.php-brackets{color:#009}.php-keyword{color:#b833a1}.php-string{color:#cf3125}.php-var-type{color:#6f41a7}.php-var{color:#508187}.xml{color:#000}.xml-string{color:#060}.xml-comment,.xml-comment span{color:#999}.xml-number{color:#f00}.xml-element{color:#009}.xml-text{color:#000}.javascript{color:#000}.js-string{color:#00f}.js-bracket{color:#009;font-weight:bold}.js-client-keyword{color:#909}.js-comment{color:#999}.js-function-keyword{color:#000;font-weight:bold}.js-native-keyword{color:#099}.js-number{color:#f00}.js-operator{color:#00f}.js-regexp{color:#060}.js-reserved-keyword{color:#009;font-weight:bold}.js-string{color:#00f}

fv-code-highlighter/tags/2.0.2/readme.txt

@@ -6 +6 @@
 Requires at least:  3.2
 Tested up to:       4.9
-Stable tag:         2.0.1
+Stable tag:         2.0.2
 
-Highlight your code, Dreamweaver style.
+Highlight your code with beautiful highlighters.
 
 
@@ -43 +43 @@
 In order to successfully use this plugin, you will need the following:
 
-* PHP 5 or higher
+* PHP 5.6 or higher
 * WordPress 3.2 or higher
 
@@ -86 +86 @@
 
 
+= 2.0.2 =
+
+* New: New Xcode inspired color scheme for PHP.
+* New: PHP highlighter now also highlights classes, methods and phpdoc.
+* Improvement: Stylesheet is minified.
+* Improvement: Colorscheme stylesheet is dynamically loaded.
+* Change: Font-size unit is changed from px to em.
+
+
 = 2.0 =
 

fv-code-highlighter/tags/2.0.2/src/Admin/Options.php

@@ -72 +72 @@
     <div class="fvch-support">
         <a href="https://www.paypal.me/FrankVerhoeven" class="button button-primary">
-            <?php _e('Donate me a beer :)', 'fvch'); ?>
+            <?php _e('Support this plugin', 'fvch'); ?>
         </a>
     </div>
@@ -107 +107 @@
                 <td>
                     <select name="fvch-font-size" id="fvch-font-size">
-                    <?php for ($i=9; $i<=13; $i++) : ?>
+                    <?php for ($i = .5; $i < 2.1; $i += .1) : ?>
                         <option <?php selected($this->options->getOption('fvch-font-size'), $i); ?> value="<?php echo $i; ?>"><?php echo $i; ?></option>
                     <?php endfor; ?>
                     </select>
-                    px
+                    <code>em</code>
+                    <p class="description"><?php _e('Using a font-size greater than 17px in combination with the notepaper background might cause display issues.', 'fvch'); ?></p>
                 </td>
             </tr>

fv-code-highlighter/tags/2.0.2/src/Application/Bootstrap.php

@@ -82 +82 @@
 
         add_action('wp_head',               [$output, 'displayHead']);
+        add_action('wp_footer',             [$output, 'displayFooter']);
     }
 

fv-code-highlighter/tags/2.0.2/src/Cache.php

@@ -3 +3 @@
 namespace FvCodeHighlighter;
 
-use Exception;
+use InvalidArgumentException;
 
 /**
- * FvCodeHighlighter_Cache
+ * Cache
  *
  * @author Frank Verhoeven <[email protected]>
@@ -15 +15 @@
      * @var string
      */
-    protected $cacheDir;
-
+    protected $cacheDirectory;
     /**
      * @var bool
      */
-    protected $enabled = true;
+    protected $enabled;
 
     /**
-     * __construct()
+     * Create a new cache handler with the provided cache directory.
+     *  Caching is automatically disabled if the given directory is not
+     *  writable or WP_DEBUG is set to true.
      *
-     * @param string $cacheDir
-     * @version 20171103
+     * @param string $cacheDirectory
+     * @version 20171216
      */
-    public function __construct($cacheDir)
+    public function __construct($cacheDirectory)
     {
-        $this->cacheDir = realpath($cacheDir) . '/';
+        $this->cacheDirectory = realpath($cacheDirectory) . '/';
 
-        // Disable cache if $cacheDir is not writable, or if we're debugging
-        if (!wp_is_writable($cacheDir) || true === WP_DEBUG) {
+        if (!wp_is_writable($cacheDirectory) || true === WP_DEBUG) {
             $this->enabled = false;
         }
@@ -39 +39 @@
 
     /**
-     * setCacheDir()
+     * Check if the cache file exists.
+     *  Returns false if cache is disabled.
      *
-     * @param string $dir
-     * @return $this
-     * @version 20171103
+     * @param string $filename
+     * @return bool
+     * @version 20171216
      */
-    public function setCacheDir($dir)
+    public function cacheFileExists($filename)
     {
-        $this->cacheDir = $dir;
-        return $this;
+        return $this->enabled && file_exists($this->cacheDirectory . $filename);
     }
 
     /**
-     * getCacheDir()
+     * Create a new cache file if cache is enabled.
      *
-     * @return string
-     * @version 20171103
+     * @param string $filename
+     * @param string $content
+     * @version 20171216
      */
-    public function getCacheDir()
+    public function createCacheFile($filename, $content)
     {
-        return $this->cacheDir;
+        if ($this->enabled) {
+            file_put_contents($this->cacheDirectory . $filename, $content);
+        }
+    }
+
+    /**
+     * Get the content of a cache file.
+     *  Returns null if cache is disabled.
+     *  An InvalidArgumentException is thrown if the cache file does not exist.
+     *
+     * @param string $filename
+     * @return string|null
+     * @throws InvalidArgumentException
+     * @version 20171216
+     */
+    public function getCacheFile($filename)
+    {
+        if (!$this->enabled) {
+            return null;
+        }
+        if (!$this->cacheFileExists($filename)) {
+            throw new InvalidArgumentException('The requested cache file does not exist');
+        }
+
+        return file_get_contents($this->cacheDirectory . $filename);
     }
 
     /**
-     * cacheFileExists()
+     * Clear the entire cache by removing all files in the cache directory.
      *
-     * @param string $name
-     * @return bool
-     * @version 20171103
-     */
-    public function cacheFileExists($name)
-    {
-        if (!$this->enabled)
-            return false;
-
-        return file_exists($this->getCacheDir() . $name);
-    }
-
-    /**
-     * createCacheFile()
-     *
-     * @param string $name
-     * @param string $content
-     * @return $this
-     * @version 20171103
-     */
-    public function createCacheFile($name, $content)
-    {
-        if (!$this->enabled)
-            return $this;
-
-        file_put_contents($this->getCacheDir() . $name, $content);
-        return $this;
-    }
-
-    /**
-     * getCacheFile()
-     *
-     * @param string $name
-     * @return string
-     * @throws Exception
-     * @version 20171103
-     */
-    public function getCacheFile($name)
-    {
-        if (!$this->enabled)
-            return $this;
-
-        if (!$this->cacheFileExists($name)) {
-            throw new Exception('The requested cache file does not exist');
-        }
-
-        return file_get_contents($this->getCacheDir() . $name);
-    }
-
-    /**
-     * clear()
-     *
-     * @return $this
-     * @version 20171103
+     * @return void
+     * @version 20171216
      */
     public function clear()
     {
-        if (!$this->enabled)
-            return $this;
+        if ($this->enabled && $handle = opendir($this->cacheDirectory)) {
+            while (false !== ($file = readdir($handle))) {
+                if ('.' != $file && '..' != $file) {
+                    unlink($this->cacheDirectory . $file);
+                }
+            }
 
-        if ($dr = opendir($this->getCacheDir())) {
-            while (false !== ($file = readdir($dr))) {
-                if ('.' != $file && '..' != $file) {
-                    unlink($this->getCacheDir() . $file);
-                }
-            }
-
-            closedir($dr);
-        }
-
-        return $this;
+            closedir($handle);
+        }
     }
 }

fv-code-highlighter/tags/2.0.2/src/Highlighter/AbstractHighlighter.php

@@ -32 +32 @@
      */
     public static $operators = [
-        '=', '+', '/', '*', '&', '^', '%', ':', '?', '!', '-', '<', '>', '|', '~', '`', '~', '.', ' and ', ' or ', ' xor '
+        '=', '+', '/', '*', '&', '^', '%', ':', '?', '!', '-', '<', '>', '|', '~', '.', ' and ', ' or ', ' xor '
     ];
 
@@ -40 +40 @@
     public static $brackets = [
         '{', '}', '[', ']', '(', ')'
+    ];
+
+    /**
+     * @var array List of valid method name chars
+     */
+    public static $methodChars = [
+        'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+        'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        '_',
     ];
 

fv-code-highlighter/tags/2.0.2/src/Highlighter/Php/Factory.php

@@ -27 +27 @@
                 'start' => ['/*'],
                 'end'   => ['*/'],
-                'cssClass'  => 'php-comment'
+                'cssClass'  => 'php-comment',
+                'children' => [Key::create(Php::$phpDoc, 'php-comment-phpdoc', '^(?![a-zA-Z0-9_]).*$', '^(?![a-zA-Z0-9_]).*$')],
             ]),
             Block::create([
@@ -33 +34 @@
                 'end'   => ["\n", "?>"],
                 'cssClass'  => 'php-comment',
-                'includeEnd' => false
+                'includeEnd' => false,
+                'children' => [Key::create(Php::$phpDoc, 'php-comment-phpdoc', '^(?![a-zA-Z0-9_]).*$', '^(?![a-zA-Z0-9_]).*$')],
             ]),
             Block::create([
@@ -46 +48 @@
                 'end'   => ["'"],
                 'cssClass'  => 'php-string',
-                'endPrefix'=> '.*(?<!\\\)$|[\\\]{2}',
+                'endPrefix' => '.*(?<!\\\)$|[\\\]{2}',
                 'endPrefixLength' => 2,
             ]),
@@ -54 +56 @@
                 'end'   => array_merge(Php::$whitespace, Php::$operators, Php::$brackets, [',', ';']),
                 'cssClass'  => 'php-var',
-                'endIncluded'   => false
+                'endIncluded'   => false,
             ]),
             Key::create(Php::$operators, 'php-operator'),
@@ -60 +62 @@
             Key::create(Php::$brackets, 'php-brackets'),
             Key::create(Php::$varTypes, 'php-var-type', '^(?![a-zA-Z0-9_]).*$', '^(?![a-zA-Z0-9_]).*$'),
-            Key::create(Php::$constants, 'php-constant', '^(?![a-zA-Z0-9_]).*$', '^(?![a-zA-Z0-9_]).*$'),
+            Key::create(array_merge(Php::$constants, ['strict_types']), 'php-constant', '^(?![a-zA-Z0-9_]).*$', '^(?![a-zA-Z0-9_]).*$'),
             Key::create(Php::$keywords, 'php-keyword', '^(?![a-zA-Z0-9_]).*$', '^(?![a-zA-Z0-9_]).*$'),
             Key::create(get_defined_functions()['internal'], 'php-function', '^(?![a-zA-Z0-9_]).*$', '^(?![a-zA-Z0-9_]).*$'),
+            Block::create([
+                'start' => Php::$methodChars,
+                'end'   => array_merge(Php::$whitespace, Php::$operators, [',', ';', '{', '}', '[', ']', ')', '->']),
+                'contains' => '[a-zA-Z0-9_]+',
+                'cssClass'  => 'php-var',
+                'endIncluded'   => false,
+                'startPrefix' => '(->)$',
+                'startPrefixLength' => 2,
+            ]),
+            Block::create([
+                'start' => Php::$methodChars,
+                'end'   => ['('],
+                'contains' => '[a-zA-Z0-9_]+',
+                'cssClass'  => 'php-method',
+                'endIncluded'   => false,
+                'startPrefix' => '(->)$',
+                'startPrefixLength' => 2,
+            ]),
+            Block::create([
+                'start' => Php::$methodChars,
+                'end'   => array_merge(Php::$whitespace, ['{', ';', '(', ' as']),
+                'cssClass'  => 'php-class',
+                'endIncluded'   => false,
+                'startPrefix' => '(use|as|class|new|namespace)[\s]+$',
+                'startPrefixLength' => 10,
+            ]),
+            Block::create([
+                'start' => Php::$methodChars,
+                'end'   => ['::'],
+                'contains' => '[a-zA-Z0-9_]+',
+                'cssClass'  => 'php-class',
+                'endIncluded'   => false,
+                'startPrefix' => '(\(|[\s])+$',
+                'startPrefixLength' => 10,
+            ]),
+            Block::create([
+                'start' => Php::$methodChars,
+                'end'   => ['('],
+                'contains' => '[a-zA-Z0-9_]+',
+                'cssClass'  => 'php-method',
+                'endIncluded'   => false,
+                'startPrefix' => '::$',
+                'startPrefixLength' => 2,
+            ]),
+            Block::create([
+                'start' => Php::$methodChars,
+                'end'   => ['('],
+                'cssClass'  => 'php-method',
+                'endIncluded'   => false,
+                'startPrefix' => '(function)[\s]+$',
+                'startPrefixLength' => 9,
+            ]),
+            Block::create([
+                'start' => Php::$methodChars,
+                'end'   => ['('],
+                'contains' => '[a-zA-Z0-9_]+',
+                'cssClass'  => 'php-method',
+                'endIncluded'   => false,
+                'startPrefix' => '[\!\(\+\-\=\*\/\&\%\^\.\<\>\?\s]+$',
+                'startPrefixLength' => 1,
+            ]),
         ];
 

fv-code-highlighter/tags/2.0.2/src/Highlighter/Php/Php.php

@@ -8 +8 @@
  * Php
  *
- * @author Frank Verhoeven <hi@frankverhoeven.me>
+ * '@author Frank Verhoeven <hi'@frankverhoeven.me>
  */
 class Php extends AbstractHighlighter
@@ -346 +346 @@
     ];
 
+    public static $phpDoc = [
+        '@api',
+        '@author',
+        '@category',
+        '@copyright',
+        '@deprecated',
+        '@example',
+        '@filesource',
+        '@global',
+        '@ignore',
+        '@internal',
+        '@license',
+        '@link',
+        '@method',
+        '@package',
+        '@param',
+        '@property',
+        '@property-read',
+        '@property-write',
+        '@return',
+        '@see',
+        '@since',
+        '@source',
+        '@subpackage',
+        '@throws',
+        '@todo',
+        '@uses',
+        '@used-by',
+        '@var',
+        '@version',
+        '@example',
+        '@internal',
+        '@inheritdoc',
+        '@link',
+        '@see',
+    ];
+
     public function __construct(array $elements)
     {

fv-code-highlighter/tags/2.0.2/src/Installer.php

@@ -57 +57 @@
             ->updateOption('fvch_version', $this->options->getDefaultOption('fvch_version'));
 
+        // Migrate font-size from px to em
+        if ((float) $this->options->getOption('fvch-font-size') > 2) {
+            $this->options->updateOption('fvch-font-size', $this->options->getDefaultOption('fvch-font-size'));
+        }
+
         $this->cache->clear();
 

fv-code-highlighter/tags/2.0.2/src/Options.php

@@ -42 +42 @@
             'fvch-cache-dir'        => __DIR__ . '/../cache',
             'fvch-font-family'      => 'Monaco',
-            'fvch-font-size'        => '11',
+            'fvch-font-size'        => '1',
             'fvch-background'       => '#ffffff',
             'fvch-background-custom'=> '#f6f6f6',

fv-code-highlighter/tags/2.0.2/src/Output.php

@@ -49 +49 @@
      * @return string
      * @version 20171118
+     * @throws \Exception
      */
     public function highlightCode($content)
@@ -200 +201 @@
     public function enqueueScripts()
     {
-        $stylesheet = plugins_url('public/css/fvch-styles.min.css', dirname(__FILE__));
-        if (file_exists(get_stylesheet_directory() . '/fvch-styles.css')) {
-            $stylesheet = get_stylesheet_directory_uri() . '/fvch-styles.css';
-        }
-
-        wp_register_style('fvch-styles', $stylesheet, false, '1.2');
-        wp_enqueue_style('fvch-styles');
-
         if ($this->options->getOption('fvch-toolbox')) {
             wp_enqueue_script('fvch-toolbox', plugins_url('public/js/toolbox.min.js', dirname(__FILE__)), ['jquery'], '1.1', true);
@@ -236 +229 @@
         $font = $font[$this->options->getOption('fvch-font-family')];
 
-        $fontSize = esc_attr($this->options->getOption('fvch-font-size')) . 'px';
+        $fontSize = esc_attr($this->options->getOption('fvch-font-size')) . 'em';
         ?>
         <style type="text/css">
             .fvch-codeblock {
-                background: <?php echo $background; ?>;
+                background: <?php echo $background; ?> !important;
+                background-position-y: 4px !important;
             }
 
             .fvch-codeblock pre, .fvch-line-number {
-                line-height: <?php echo 'notepaper' == $this->options->getOption('fvch-background') ? '17px' : '1.4em'; ?>;
-                font-family: <?php echo $font; ?>;
-                font-size: <?php echo $fontSize; ?>;
+                line-height: <?php echo 'notepaper' == $this->options->getOption('fvch-background') ? '17px' : '1.4em'; ?> !important;
+                font-family: <?php echo $font; ?> !important;
+                font-size: <?php echo $fontSize; ?> !important;
             }
         </style>
@@ -252 +246 @@
         <?php
     }
+
+    /**
+     * Include the colors stylesheet in the footer to make it non-blocking.
+     *
+     * @return void
+     */
+    public function displayFooter()
+    {
+        $stylesheet = plugins_url('public/css/fvch-styles.min.css', dirname(__FILE__));
+        if (file_exists(get_stylesheet_directory() . '/fvch-styles.min.css')) {
+            $stylesheet = get_stylesheet_directory_uri() . '/fvch-styles.min.css';
+        }
+
+        ?>
+        <script type="text/javascript">
+            (function(){
+                var stylesheet = document.createElement('link');
+                stylesheet.rel = 'stylesheet';
+                stylesheet.href = '<?= $stylesheet; ?>';
+                stylesheet.type = 'text/css';
+                stylesheet.media = 'screen';
+                document.getElementsByTagName('head')[0].appendChild(stylesheet);
+            })();
+        </script>
+        <?php
+    }
 }

fv-code-highlighter/tags/2.0.2/src/Parser/Element/Block.php

@@ -61 +61 @@
      * @var string
      */
+    private $contains;
+    /**
+     * @var string
+     */
     private $cssClass;
     /**
@@ -196 +200 @@
 
     /**
+     * @return string|null
+     */
+    public function getContains()
+    {
+        return $this->contains;
+    }
+
+    /**
      * @return string
      */

fv-code-highlighter/tags/2.0.2/src/Parser/Parser.php

@@ -147 +147 @@
 
             if ($element instanceof Block && $this->findBlockStart($element, substr($this->code, $this->pointer))) {
+                $blockStart = $this->pointer;
                 if ($element->isStartIncluded()) {
                     $parsed = '<span class="' . $element->getCssClass() . '">';
@@ -163 +164 @@
                 $endReached = false;
                 while (!$this->findBlockEnd($element, substr($this->code, $this->pointer))) {
+                    if (!$this->isValidContains($element, substr($this->code, $this->pointer, 1))) {
+                        $this->pointer = $blockStart;
+                        $parsed = null;
+                        $endReached = true;
+                        break;
+                    }
+
                     if (null !== ($children = $element->getChildren())) {
                         $childParsed = $this->findElement($children);
@@ -177 +185 @@
                     }
 
+
                     if ($this->pointer > $this->codeLength) {
                         $endReached = true;
@@ -277 +286 @@
 
     /**
+     * Check if the provided char is valid for the current block
+     *
+     * @param Block $element
+     * @param string $char
+     * @return bool
+     */
+    public function isValidContains(Block $element, $char)
+    {
+        if (null === $element->getContains()) {
+            return true;
+        }
+
+        return preg_match('/' . $element->getContains() . '/', $char);
+    }
+
+    /**
      * Validate given prefix
      *

fv-code-highlighter/trunk/fv-code-highlighter.php

@@ -7 +7 @@
  * Author:      Frank Verhoeven
  * Author URI:  https://frankverhoeven.me/
- * Version:     2.0.1
+ * Version:     2.0.2
  */
 
 final class FvCodeHighlighter
 {
-    const VERSION = '2.0.1';
+    const VERSION = '2.0.2';
 
     /**

fv-code-highlighter/trunk/public/css/fvch-styles.min.css

@@ -1 @@
-.fvch-hide-if-no-js{display:none !important}.fvch-codeblock{background:url(../images/notepaper.png) top left repeat;border:1px solid #d2d2d2;padding:0 !important;margin:0 0 1em;border-radius:3px;overflow-x:auto;position:relative;font-size:10px}.fvch-codeblock table,.fvch-codeblock thead,.fvch-codeblock tbody,.fvch-codeblock tr,.fvch-codeblock td,.fvch-codeblock pre{padding:0;margin:0;border:none}.fvch-codeblock pre{white-space:pre;padding-left:.5em;font-family:"Monaco", "Courier New", Courier, monospace;border:none !important;background:none !important;color:inherit !important}.fvch-toolbox{position:absolute;top:0;right:0;display:none;border-left:1px solid #d2d2d2;border-bottom:1px solid #d2d2d2;border-bottom-left-radius:3px;border-top-right-radius:3px;background:#fff;padding:3px 6px 0}.fvch-codeblock:hover .fvch-toolbox{display:block}.fvch-toolbox .fvch-toolbox-icon{border:none !important;background:none !important;cursor:pointer !important;margin:0 4px 4px 0 !important;padding:2px !important;height:20px}.fvch-toolbox .fvch-toolbox-icon:last-child{margin-right:0 !important}td.fvch-line-number{text-align:right;color:#666;width:1%;min-width:30px;padding:0 .5em;background:#e2e2e2;border-right:1px solid #d2d2d2;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}td.fvch-line-number:before{content:attr(data-line-number)}.general{color:#000;font-weight:normal}.general-number{color:#f00}.general-operator{color:#00f}.general-brackets{color:#009}.general-string{color:#c00}.bash{color:#000}.bash-comment{color:#999}.bash-number{color:#f00}.bash-operator{color:#00f}.bash-brackets{color:#009}.bash-command{color:#060}.bash-string{color:#c00}.css{color:#f0f}.css-background{background-color:#fff}.css-import{color:#099;font-weight:bold}.css-media{color:#900;font-weight:bold}.css-comment{color:#999}.css-important{color:#f00;font-weight:bold}.css-property{color:#009}.css-selector{color:#f0f}.css-string{color:#060;font-weight:normal}.css-value{color:#00f}.css-rest{color:#f0f;font-weight:bold}.html{font-weight:normal;color:#000}.html-anchor-element{color:#060}.html-attribute{color:#00f}.html-comment{color:#999}.html-form-element{color:#f90}.html-image-element{color:#909}.html-object-element{color:#900}.html-other-element{color:#009}.html-script-element{color:#900}.html-special-char{color:#000;font-weight:bold}.html-style-element{color:#909}.html-table-element{color:#099}.html-text{color:#000}.php{color:#000;font-weight:normal}.php-script-tag{color:#d00;font-weight:bold}.php-comment{color:#f90}.php-constant{color:#520}.php-function{color:#00f}.php-number{color:#f00}.php-operator{color:#00f}.php-brackets{color:#009}.php-keyword{color:#006600}.php-string{color:#c00}.php-var-type{color:#099}.php-var{color:#06f}.xml{color:#000}.xml-string{color:#060}.xml-comment,.xml-comment span{color:#999}.xml-number{color:#f00}.xml-element{color:#009}.xml-text{color:#000}.javascript{color:#000}.js-string{color:#00f}.js-bracket{color:#009;font-weight:bold}.js-client-keyword{color:#909}.js-comment{color:#999}.js-function-keyword{color:#000;font-weight:bold}.js-native-keyword{color:#099}.js-number{color:#f00}.js-operator{color:#00f}.js-regexp{color:#060}.js-reserved-keyword{color:#009;font-weight:bold}.js-string{color:#00f}
+.fvch-hide-if-no-js{display:none !important}.fvch-codeblock{background:url(../images/notepaper.png) top left repeat;border:1px solid #d2d2d2;padding:0 !important;margin:0 0 1em;border-radius:3px;overflow-x:auto;position:relative}.fvch-codeblock table,.fvch-codeblock tbody,.fvch-codeblock tr,.fvch-codeblock td,.fvch-codeblock pre{padding:0;margin:0;border:none}.fvch-codeblock pre{white-space:pre;padding-left:.5em;font-family:"Monaco", "Courier New", Courier, monospace;border:none !important;background:none !important;color:inherit !important}.fvch-toolbox{position:absolute;top:0;right:0;display:none;border-left:1px solid #d2d2d2;border-bottom:1px solid #d2d2d2;border-bottom-left-radius:3px;border-top-right-radius:3px;background:#fff;padding:3px 6px 0}.fvch-codeblock:hover .fvch-toolbox{display:block}.fvch-toolbox .fvch-toolbox-icon{border:none !important;background:none !important;cursor:pointer !important;margin:0 4px 4px 0 !important;padding:2px !important;height:20px}.fvch-toolbox .fvch-toolbox-icon:last-child{margin-right:0 !important}td.fvch-line-number{text-align:right;color:#666;width:1%;min-width:30px;padding:0 .5em;background:#e2e2e2;border-right:1px solid #d2d2d2;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}td.fvch-line-number:before{content:attr(data-line-number)}table.fvch-code tr:first-child td{padding-top:5px}table.fvch-code tr:last-child td{padding-bottom:5px}.general{color:#000;font-weight:normal}.general-number{color:#2934d4}.general-operator{color:#000}.general-brackets{color:#009}.general-string{color:#cf3125}.bash{color:#000}.bash-comment{color:#008312}.bash-number{color:#2934d4}.bash-operator{color:#000}.bash-brackets{color:#009}.bash-command{color:#b833a1}.bash-string{color:#cf3125}.css{color:#f0f}.css-background{background-color:#fff}.css-import{color:#099;font-weight:bold}.css-media{color:#900;font-weight:bold}.css-comment{color:#999}.css-important{color:#f00;font-weight:bold}.css-property{color:#009}.css-selector{color:#f0f}.css-string{color:#060;font-weight:normal}.css-value{color:#00f}.css-rest{color:#f0f;font-weight:bold}.html{font-weight:normal;color:#000}.html-anchor-element{color:#060}.html-attribute{color:#00f}.html-comment{color:#999}.html-form-element{color:#f90}.html-image-element{color:#909}.html-object-element{color:#900}.html-other-element{color:#009}.html-script-element{color:#900}.html-special-char{color:#000;font-weight:bold}.html-style-element{color:#909}.html-table-element{color:#099}.html-text{color:#000}.php{color:#000;font-weight:normal}.php-script-tag{color:#7c226d;font-weight:bold}.php-comment{color:#008312}.php-comment-phpdoc{color:#00500b}.php-constant{color:#77492d}.php-function{color:#3d237f}.php-method{color:#33595d}.php-class{color:#508187}.php-number{color:#2934d4}.php-operator{color:#000}.php-brackets{color:#009}.php-keyword{color:#b833a1}.php-string{color:#cf3125}.php-var-type{color:#6f41a7}.php-var{color:#508187}.xml{color:#000}.xml-string{color:#060}.xml-comment,.xml-comment span{color:#999}.xml-number{color:#f00}.xml-element{color:#009}.xml-text{color:#000}.javascript{color:#000}.js-string{color:#00f}.js-bracket{color:#009;font-weight:bold}.js-client-keyword{color:#909}.js-comment{color:#999}.js-function-keyword{color:#000;font-weight:bold}.js-native-keyword{color:#099}.js-number{color:#f00}.js-operator{color:#00f}.js-regexp{color:#060}.js-reserved-keyword{color:#009;font-weight:bold}.js-string{color:#00f}

fv-code-highlighter/trunk/readme.txt

@@ -6 +6 @@
 Requires at least:  3.2
 Tested up to:       4.9
-Stable tag:         2.0.1
+Stable tag:         2.0.2
 
-Highlight your code, Dreamweaver style.
+Highlight your code with beautiful highlighters.
 
 
@@ -43 +43 @@
 In order to successfully use this plugin, you will need the following:
 
-* PHP 5 or higher
+* PHP 5.6 or higher
 * WordPress 3.2 or higher
 
@@ -86 +86 @@
 
 
+= 2.0.2 =
+
+* New: New Xcode inspired color scheme for PHP.
+* New: PHP highlighter now also highlights classes, methods and phpdoc.
+* Improvement: Stylesheet is minified.
+* Improvement: Colorscheme stylesheet is dynamically loaded.
+* Change: Font-size unit is changed from px to em.
+
+
 = 2.0 =
 

fv-code-highlighter/trunk/src/Admin/Options.php

@@ -72 +72 @@
     <div class="fvch-support">
         <a href="https://www.paypal.me/FrankVerhoeven" class="button button-primary">
-            <?php _e('Donate me a beer :)', 'fvch'); ?>
+            <?php _e('Support this plugin', 'fvch'); ?>
         </a>
     </div>
@@ -107 +107 @@
                 <td>
                     <select name="fvch-font-size" id="fvch-font-size">
-                    <?php for ($i=9; $i<=13; $i++) : ?>
+                    <?php for ($i = .5; $i < 2.1; $i += .1) : ?>
                         <option <?php selected($this->options->getOption('fvch-font-size'), $i); ?> value="<?php echo $i; ?>"><?php echo $i; ?></option>
                     <?php endfor; ?>
                     </select>
-                    px
+                    <code>em</code>
+                    <p class="description"><?php _e('Using a font-size greater than 17px in combination with the notepaper background might cause display issues.', 'fvch'); ?></p>
                 </td>
             </tr>

fv-code-highlighter/trunk/src/Application/Bootstrap.php

@@ -82 +82 @@
 
         add_action('wp_head',               [$output, 'displayHead']);
+        add_action('wp_footer',             [$output, 'displayFooter']);
     }
 

fv-code-highlighter/trunk/src/Cache.php

@@ -3 +3 @@
 namespace FvCodeHighlighter;
 
-use Exception;
+use InvalidArgumentException;
 
 /**
- * FvCodeHighlighter_Cache
+ * Cache
  *
  * @author Frank Verhoeven <[email protected]>
@@ -15 +15 @@
      * @var string
      */
-    protected $cacheDir;
-
+    protected $cacheDirectory;
     /**
      * @var bool
      */
-    protected $enabled = true;
+    protected $enabled;
 
     /**
-     * __construct()
+     * Create a new cache handler with the provided cache directory.
+     *  Caching is automatically disabled if the given directory is not
+     *  writable or WP_DEBUG is set to true.
      *
-     * @param string $cacheDir
-     * @version 20171103
+     * @param string $cacheDirectory
+     * @version 20171216
      */
-    public function __construct($cacheDir)
+    public function __construct($cacheDirectory)
     {
-        $this->cacheDir = realpath($cacheDir) . '/';
+        $this->cacheDirectory = realpath($cacheDirectory) . '/';
 
-        // Disable cache if $cacheDir is not writable, or if we're debugging
-        if (!wp_is_writable($cacheDir) || true === WP_DEBUG) {
+        if (!wp_is_writable($cacheDirectory) || true === WP_DEBUG) {
             $this->enabled = false;
         }
@@ -39 +39 @@
 
     /**
-     * setCacheDir()
+     * Check if the cache file exists.
+     *  Returns false if cache is disabled.
      *
-     * @param string $dir
-     * @return $this
-     * @version 20171103
+     * @param string $filename
+     * @return bool
+     * @version 20171216
      */
-    public function setCacheDir($dir)
+    public function cacheFileExists($filename)
     {
-        $this->cacheDir = $dir;
-        return $this;
+        return $this->enabled && file_exists($this->cacheDirectory . $filename);
     }
 
     /**
-     * getCacheDir()
+     * Create a new cache file if cache is enabled.
      *
-     * @return string
-     * @version 20171103
+     * @param string $filename
+     * @param string $content
+     * @version 20171216
      */
-    public function getCacheDir()
+    public function createCacheFile($filename, $content)
     {
-        return $this->cacheDir;
+        if ($this->enabled) {
+            file_put_contents($this->cacheDirectory . $filename, $content);
+        }
+    }
+
+    /**
+     * Get the content of a cache file.
+     *  Returns null if cache is disabled.
+     *  An InvalidArgumentException is thrown if the cache file does not exist.
+     *
+     * @param string $filename
+     * @return string|null
+     * @throws InvalidArgumentException
+     * @version 20171216
+     */
+    public function getCacheFile($filename)
+    {
+        if (!$this->enabled) {
+            return null;
+        }
+        if (!$this->cacheFileExists($filename)) {
+            throw new InvalidArgumentException('The requested cache file does not exist');
+        }
+
+        return file_get_contents($this->cacheDirectory . $filename);
     }
 
     /**
-     * cacheFileExists()
+     * Clear the entire cache by removing all files in the cache directory.
      *
-     * @param string $name
-     * @return bool
-     * @version 20171103
-     */
-    public function cacheFileExists($name)
-    {
-        if (!$this->enabled)
-            return false;
-
-        return file_exists($this->getCacheDir() . $name);
-    }
-
-    /**
-     * createCacheFile()
-     *
-     * @param string $name
-     * @param string $content
-     * @return $this
-     * @version 20171103
-     */
-    public function createCacheFile($name, $content)
-    {
-        if (!$this->enabled)
-            return $this;
-
-        file_put_contents($this->getCacheDir() . $name, $content);
-        return $this;
-    }
-
-    /**
-     * getCacheFile()
-     *
-     * @param string $name
-     * @return string
-     * @throws Exception
-     * @version 20171103
-     */
-    public function getCacheFile($name)
-    {
-        if (!$this->enabled)
-            return $this;
-
-        if (!$this->cacheFileExists($name)) {
-            throw new Exception('The requested cache file does not exist');
-        }
-
-        return file_get_contents($this->getCacheDir() . $name);
-    }
-
-    /**
-     * clear()
-     *
-     * @return $this
-     * @version 20171103
+     * @return void
+     * @version 20171216
      */
     public function clear()
     {
-        if (!$this->enabled)
-            return $this;
+        if ($this->enabled && $handle = opendir($this->cacheDirectory)) {
+            while (false !== ($file = readdir($handle))) {
+                if ('.' != $file && '..' != $file) {
+                    unlink($this->cacheDirectory . $file);
+                }
+            }
 
-        if ($dr = opendir($this->getCacheDir())) {
-            while (false !== ($file = readdir($dr))) {
-                if ('.' != $file && '..' != $file) {
-                    unlink($this->getCacheDir() . $file);
-                }
-            }
-
-            closedir($dr);
-        }
-
-        return $this;
+            closedir($handle);
+        }
     }
 }

fv-code-highlighter/trunk/src/Highlighter/AbstractHighlighter.php

@@ -32 +32 @@
      */
     public static $operators = [
-        '=', '+', '/', '*', '&', '^', '%', ':', '?', '!', '-', '<', '>', '|', '~', '`', '~', '.', ' and ', ' or ', ' xor '
+        '=', '+', '/', '*', '&', '^', '%', ':', '?', '!', '-', '<', '>', '|', '~', '.', ' and ', ' or ', ' xor '
     ];
 
@@ -40 +40 @@
     public static $brackets = [
         '{', '}', '[', ']', '(', ')'
+    ];
+
+    /**
+     * @var array List of valid method name chars
+     */
+    public static $methodChars = [
+        'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+        'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        '_',
     ];
 

fv-code-highlighter/trunk/src/Highlighter/Php/Factory.php

@@ -27 +27 @@
                 'start' => ['/*'],
                 'end'   => ['*/'],
-                'cssClass'  => 'php-comment'
+                'cssClass'  => 'php-comment',
+                'children' => [Key::create(Php::$phpDoc, 'php-comment-phpdoc', '^(?![a-zA-Z0-9_]).*$', '^(?![a-zA-Z0-9_]).*$')],
             ]),
             Block::create([
@@ -33 +34 @@
                 'end'   => ["\n", "?>"],
                 'cssClass'  => 'php-comment',
-                'includeEnd' => false
+                'includeEnd' => false,
+                'children' => [Key::create(Php::$phpDoc, 'php-comment-phpdoc', '^(?![a-zA-Z0-9_]).*$', '^(?![a-zA-Z0-9_]).*$')],
             ]),
             Block::create([
@@ -46 +48 @@
                 'end'   => ["'"],
                 'cssClass'  => 'php-string',
-                'endPrefix'=> '.*(?<!\\\)$|[\\\]{2}',
+                'endPrefix' => '.*(?<!\\\)$|[\\\]{2}',
                 'endPrefixLength' => 2,
             ]),
@@ -54 +56 @@
                 'end'   => array_merge(Php::$whitespace, Php::$operators, Php::$brackets, [',', ';']),
                 'cssClass'  => 'php-var',
-                'endIncluded'   => false
+                'endIncluded'   => false,
             ]),
             Key::create(Php::$operators, 'php-operator'),
@@ -60 +62 @@
             Key::create(Php::$brackets, 'php-brackets'),
             Key::create(Php::$varTypes, 'php-var-type', '^(?![a-zA-Z0-9_]).*$', '^(?![a-zA-Z0-9_]).*$'),
-            Key::create(Php::$constants, 'php-constant', '^(?![a-zA-Z0-9_]).*$', '^(?![a-zA-Z0-9_]).*$'),
+            Key::create(array_merge(Php::$constants, ['strict_types']), 'php-constant', '^(?![a-zA-Z0-9_]).*$', '^(?![a-zA-Z0-9_]).*$'),
             Key::create(Php::$keywords, 'php-keyword', '^(?![a-zA-Z0-9_]).*$', '^(?![a-zA-Z0-9_]).*$'),
             Key::create(get_defined_functions()['internal'], 'php-function', '^(?![a-zA-Z0-9_]).*$', '^(?![a-zA-Z0-9_]).*$'),
+            Block::create([
+                'start' => Php::$methodChars,
+                'end'   => array_merge(Php::$whitespace, Php::$operators, [',', ';', '{', '}', '[', ']', ')', '->']),
+                'contains' => '[a-zA-Z0-9_]+',
+                'cssClass'  => 'php-var',
+                'endIncluded'   => false,
+                'startPrefix' => '(->)$',
+                'startPrefixLength' => 2,
+            ]),
+            Block::create([
+                'start' => Php::$methodChars,
+                'end'   => ['('],
+                'contains' => '[a-zA-Z0-9_]+',
+                'cssClass'  => 'php-method',
+                'endIncluded'   => false,
+                'startPrefix' => '(->)$',
+                'startPrefixLength' => 2,
+            ]),
+            Block::create([
+                'start' => Php::$methodChars,
+                'end'   => array_merge(Php::$whitespace, ['{', ';', '(', ' as']),
+                'cssClass'  => 'php-class',
+                'endIncluded'   => false,
+                'startPrefix' => '(use|as|class|new|namespace)[\s]+$',
+                'startPrefixLength' => 10,
+            ]),
+            Block::create([
+                'start' => Php::$methodChars,
+                'end'   => ['::'],
+                'contains' => '[a-zA-Z0-9_]+',
+                'cssClass'  => 'php-class',
+                'endIncluded'   => false,
+                'startPrefix' => '(\(|[\s])+$',
+                'startPrefixLength' => 10,
+            ]),
+            Block::create([
+                'start' => Php::$methodChars,
+                'end'   => ['('],
+                'contains' => '[a-zA-Z0-9_]+',
+                'cssClass'  => 'php-method',
+                'endIncluded'   => false,
+                'startPrefix' => '::$',
+                'startPrefixLength' => 2,
+            ]),
+            Block::create([
+                'start' => Php::$methodChars,
+                'end'   => ['('],
+                'cssClass'  => 'php-method',
+                'endIncluded'   => false,
+                'startPrefix' => '(function)[\s]+$',
+                'startPrefixLength' => 9,
+            ]),
+            Block::create([
+                'start' => Php::$methodChars,
+                'end'   => ['('],
+                'contains' => '[a-zA-Z0-9_]+',
+                'cssClass'  => 'php-method',
+                'endIncluded'   => false,
+                'startPrefix' => '[\!\(\+\-\=\*\/\&\%\^\.\<\>\?\s]+$',
+                'startPrefixLength' => 1,
+            ]),
         ];
 

fv-code-highlighter/trunk/src/Highlighter/Php/Php.php

@@ -8 +8 @@
  * Php
  *
- * @author Frank Verhoeven <hi@frankverhoeven.me>
+ * '@author Frank Verhoeven <hi'@frankverhoeven.me>
  */
 class Php extends AbstractHighlighter
@@ -346 +346 @@
     ];
 
+    public static $phpDoc = [
+        '@api',
+        '@author',
+        '@category',
+        '@copyright',
+        '@deprecated',
+        '@example',
+        '@filesource',
+        '@global',
+        '@ignore',
+        '@internal',
+        '@license',
+        '@link',
+        '@method',
+        '@package',
+        '@param',
+        '@property',
+        '@property-read',
+        '@property-write',
+        '@return',
+        '@see',
+        '@since',
+        '@source',
+        '@subpackage',
+        '@throws',
+        '@todo',
+        '@uses',
+        '@used-by',
+        '@var',
+        '@version',
+        '@example',
+        '@internal',
+        '@inheritdoc',
+        '@link',
+        '@see',
+    ];
+
     public function __construct(array $elements)
     {

fv-code-highlighter/trunk/src/Installer.php

@@ -57 +57 @@
             ->updateOption('fvch_version', $this->options->getDefaultOption('fvch_version'));
 
+        // Migrate font-size from px to em
+        if ((float) $this->options->getOption('fvch-font-size') > 2) {
+            $this->options->updateOption('fvch-font-size', $this->options->getDefaultOption('fvch-font-size'));
+        }
+
         $this->cache->clear();
 

fv-code-highlighter/trunk/src/Options.php

@@ -42 +42 @@
             'fvch-cache-dir'        => __DIR__ . '/../cache',
             'fvch-font-family'      => 'Monaco',
-            'fvch-font-size'        => '11',
+            'fvch-font-size'        => '1',
             'fvch-background'       => '#ffffff',
             'fvch-background-custom'=> '#f6f6f6',

fv-code-highlighter/trunk/src/Output.php

@@ -49 +49 @@
      * @return string
      * @version 20171118
+     * @throws \Exception
      */
     public function highlightCode($content)
@@ -200 +201 @@
     public function enqueueScripts()
     {
-        $stylesheet = plugins_url('public/css/fvch-styles.min.css', dirname(__FILE__));
-        if (file_exists(get_stylesheet_directory() . '/fvch-styles.css')) {
-            $stylesheet = get_stylesheet_directory_uri() . '/fvch-styles.css';
-        }
-
-        wp_register_style('fvch-styles', $stylesheet, false, '1.2');
-        wp_enqueue_style('fvch-styles');
-
         if ($this->options->getOption('fvch-toolbox')) {
             wp_enqueue_script('fvch-toolbox', plugins_url('public/js/toolbox.min.js', dirname(__FILE__)), ['jquery'], '1.1', true);
@@ -236 +229 @@
         $font = $font[$this->options->getOption('fvch-font-family')];
 
-        $fontSize = esc_attr($this->options->getOption('fvch-font-size')) . 'px';
+        $fontSize = esc_attr($this->options->getOption('fvch-font-size')) . 'em';
         ?>
         <style type="text/css">
             .fvch-codeblock {
-                background: <?php echo $background; ?>;
+                background: <?php echo $background; ?> !important;
+                background-position-y: 4px !important;
             }
 
             .fvch-codeblock pre, .fvch-line-number {
-                line-height: <?php echo 'notepaper' == $this->options->getOption('fvch-background') ? '17px' : '1.4em'; ?>;
-                font-family: <?php echo $font; ?>;
-                font-size: <?php echo $fontSize; ?>;
+                line-height: <?php echo 'notepaper' == $this->options->getOption('fvch-background') ? '17px' : '1.4em'; ?> !important;
+                font-family: <?php echo $font; ?> !important;
+                font-size: <?php echo $fontSize; ?> !important;
             }
         </style>
@@ -252 +246 @@
         <?php
     }
+
+    /**
+     * Include the colors stylesheet in the footer to make it non-blocking.
+     *
+     * @return void
+     */
+    public function displayFooter()
+    {
+        $stylesheet = plugins_url('public/css/fvch-styles.min.css', dirname(__FILE__));
+        if (file_exists(get_stylesheet_directory() . '/fvch-styles.min.css')) {
+            $stylesheet = get_stylesheet_directory_uri() . '/fvch-styles.min.css';
+        }
+
+        ?>
+        <script type="text/javascript">
+            (function(){
+                var stylesheet = document.createElement('link');
+                stylesheet.rel = 'stylesheet';
+                stylesheet.href = '<?= $stylesheet; ?>';
+                stylesheet.type = 'text/css';
+                stylesheet.media = 'screen';
+                document.getElementsByTagName('head')[0].appendChild(stylesheet);
+            })();
+        </script>
+        <?php
+    }
 }

fv-code-highlighter/trunk/src/Parser/Element/Block.php

@@ -61 +61 @@
      * @var string
      */
+    private $contains;
+    /**
+     * @var string
+     */
     private $cssClass;
     /**
@@ -196 +200 @@
 
     /**
+     * @return string|null
+     */
+    public function getContains()
+    {
+        return $this->contains;
+    }
+
+    /**
      * @return string
      */

fv-code-highlighter/trunk/src/Parser/Parser.php

@@ -147 +147 @@
 
             if ($element instanceof Block && $this->findBlockStart($element, substr($this->code, $this->pointer))) {
+                $blockStart = $this->pointer;
                 if ($element->isStartIncluded()) {
                     $parsed = '<span class="' . $element->getCssClass() . '">';
@@ -163 +164 @@
                 $endReached = false;
                 while (!$this->findBlockEnd($element, substr($this->code, $this->pointer))) {
+                    if (!$this->isValidContains($element, substr($this->code, $this->pointer, 1))) {
+                        $this->pointer = $blockStart;
+                        $parsed = null;
+                        $endReached = true;
+                        break;
+                    }
+
                     if (null !== ($children = $element->getChildren())) {
                         $childParsed = $this->findElement($children);
@@ -177 +185 @@
                     }
 
+
                     if ($this->pointer > $this->codeLength) {
                         $endReached = true;
@@ -277 +286 @@
 
     /**
+     * Check if the provided char is valid for the current block
+     *
+     * @param Block $element
+     * @param string $char
+     * @return bool
+     */
+    public function isValidContains(Block $element, $char)
+    {
+        if (null === $element->getContains()) {
+            return true;
+        }
+
+        return preg_match('/' . $element->getContains() . '/', $char);
+    }
+
+    /**
      * Validate given prefix
      *