Merge branch 'release/6.2.0'

Author: rhukster

CHANGELOG.md

@@ -1,3 +1,11 @@
+# v6.2.0
+## 06/24/2026
+
+1. [](#improved)
+    * Renamed the `TarsParser` added in 6.1.0 to `HybridParser`, a name that better describes how it works: one regex pass lexes every tag, then a stack-based pass resolves nesting. It pairs RegexParser's speed with RegularParser's correctness.
+    * Made `hybrid` the default parser for new installs and renamed the matching Processor dropdown option in the plugin settings.
+    * Kept the old `tars` setting working. Sites that selected it keep running unchanged, the value now resolves to `HybridParser` automatically, so no config edits are needed.
+
 # v6.1.0
 ## 06/21/2026
 

blueprints.yaml

@@ -1,7 +1,7 @@
 name: Shortcode Core
 slug: shortcode-core
 type: plugin
-version: 6.1.0
+version: 6.2.0
 description: "This plugin provides the core functionality for shortcode plugins"
 icon: code
 author:
@@ -84,12 +84,12 @@ form:
               size: medium
               classes: fancy
               label: Processor
-              help: Which built-in processor to use. Tars (fast and robust), Regular (robust reference), Regex (fast), WordPress (limited)
+              help: Which built-in processor to use. Hybrid (fast and robust), Regular (robust reference), Regex (fast), WordPress (limited)
               options:
-                  tars: TarsParser
-                  wordpress: WordpressParser
-                  regex: RegexParser
+                  hybrid: HybridParser
                   regular: RegularParser
+                  regex: RegexParser
+                  wordpress: WordpressParser
 
             custom_shortcodes:
               type: text

classes/plugin/ShortcodeManager.php

@@ -10,7 +10,7 @@
 use Thunder\Shortcode\HandlerContainer\HandlerContainer;
 use Thunder\Shortcode\Parser\RegexParser;
 use Thunder\Shortcode\Parser\RegularParser;
-use Thunder\Shortcode\Parser\TarsParser;
+use Thunder\Shortcode\Parser\HybridParser;
 use Thunder\Shortcode\Parser\WordpressParser;
 use Thunder\Shortcode\Processor\Processor;
 use Thunder\Shortcode\Shortcode\ShortcodeInterface;
@@ -391,14 +391,16 @@ protected function getParser($parser)
             case 'regular':
                 $parser = RegularParser::class;
                 break;
-            case 'tars':
-                $parser = TarsParser::class;
+            case 'regex':
+                $parser = RegexParser::class;
                 break;
             case 'wordpress':
                 $parser = WordpressParser::class;
                 break;
+            case 'tars': // legacy alias kept for configs created before the rename to Hybrid
+            case 'hybrid':
             default:
-                $parser = RegexParser::class;
+                $parser = HybridParser::class;
                 break;
         }
 

composer.json

@@ -21,7 +21,7 @@
     ],
     "require": {
         "php": ">=7.1.3",
-        "thunderer/shortcode": "dev-feature/tars-parser as 0.7.7"
+        "thunderer/shortcode": "dev-add-tars-parser as 0.7.7"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -2,7 +2,7 @@ enabled: true
 active: true
 active_admin: true
 admin_pages_only: true
-parser: tars
+parser: hybrid
 include_default_shortcodes: true
 css:
   notice_enabled: true

shortcode-core.yaml

@@ -2,17 +2,17 @@
     "packages": [
         {
             "name": "thunderer/shortcode",
-            "version": "dev-feature/tars-parser",
-            "version_normalized": "dev-feature/tars-parser",
+            "version": "dev-add-tars-parser",
+            "version_normalized": "dev-add-tars-parser",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rhukster/Shortcode.git",
-                "reference": "69024288e7d4074bb04e16940169b65709ced6c6"
+                "reference": "e4032b4a08ef1011eec2f6f22f25c104923d1fef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rhukster/Shortcode/zipball/69024288e7d4074bb04e16940169b65709ced6c6",
-                "reference": "69024288e7d4074bb04e16940169b65709ced6c6",
+                "url": "https://api.github.com/repos/rhukster/Shortcode/zipball/e4032b4a08ef1011eec2f6f22f25c104923d1fef",
+                "reference": "e4032b4a08ef1011eec2f6f22f25c104923d1fef",
                 "shasum": ""
             },
             "require": {
@@ -27,7 +27,7 @@
                 "ext-json": "if you want to use JSON serializer",
                 "symfony/yaml": "if you want to use YAML serializer"
             },
-            "time": "2026-06-18T14:52:56+00:00",
+            "time": "2026-06-24T19:42:47+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -58,7 +58,7 @@
                 "shortcode"
             ],
             "support": {
-                "source": "https://github.com/rhukster/Shortcode/tree/feature/tars-parser"
+                "source": "https://github.com/rhukster/Shortcode/tree/add-tars-parser"
             },
             "install-path": "../thunderer/shortcode"
         }

vendor/composer/installed.json

@@ -3,7 +3,7 @@
         'name' => 'getgrav/shortcode-core',
         'pretty_version' => 'dev-develop',
         'version' => 'dev-develop',
-        'reference' => 'bfbe3a7e18936bfe6b6d671b5ec49e9dd87eb77f',
+        'reference' => '267ba040eae1a40a89a2dc88d3c43958309f185b',
         'type' => 'grav-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,16 +13,16 @@
         'getgrav/shortcode-core' => array(
             'pretty_version' => 'dev-develop',
             'version' => 'dev-develop',
-            'reference' => 'bfbe3a7e18936bfe6b6d671b5ec49e9dd87eb77f',
+            'reference' => '267ba040eae1a40a89a2dc88d3c43958309f185b',
             'type' => 'grav-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'thunderer/shortcode' => array(
-            'pretty_version' => 'dev-feature/tars-parser',
-            'version' => 'dev-feature/tars-parser',
-            'reference' => '69024288e7d4074bb04e16940169b65709ced6c6',
+            'pretty_version' => 'dev-add-tars-parser',
+            'version' => 'dev-add-tars-parser',
+            'reference' => 'e4032b4a08ef1011eec2f6f22f25c104923d1fef',
             'type' => 'library',
             'install_path' => __DIR__ . '/../thunderer/shortcode',
             'aliases' => array(

vendor/composer/installed.php

@@ -203,7 +203,7 @@ This section discusses available shortcode parsers. Regardless of the parser tha
 There are four included parsers in this library:
 
 - `RegularParser` is the most powerful and correct parser available in this library. It contains the actual parser designed to handle all the issues with shortcodes like proper nesting or detecting invalid shortcode syntax. It is slightly slower than regex-based parser described below,
-- `TarsParser` produces exactly the same result as `RegularParser`, including proper nesting and invalid syntax detection, but it lexes every tag in a single regular expression pass and resolves nesting with a flat stack instead of a recursive token parser. This makes it several times faster than `RegularParser` and much lighter on memory, since it never builds a token array for the whole input. It is a good choice when you want `RegularParser`'s correctness without its cost,
+- `HybridParser` produces exactly the same result as `RegularParser`, including proper nesting and invalid syntax detection, but it lexes every tag in a single regular expression pass and resolves nesting with a flat stack instead of a recursive token parser. This makes it several times faster than `RegularParser` and much lighter on memory, since it never builds a token array for the whole input. It is a good choice when you want `RegularParser`'s correctness without its cost,
 - `RegexParser` uses a handcrafted regular expression dedicated to handle shortcode syntax as much as regex engine allows. It is fastest among the parsers included in this library, but it can't handle nesting properly, which means that nested shortcodes with the same name are also considered overlapping - (assume that shortcode `[c]` returns its content) string `[c]x[c]y[/c]z[/c]` will be interpreted as `xyz[/c]` (first closing tag was matched to first opening tag). This can be solved by aliasing handler name, because for example `[c]x[d]y[/d]z[/c]` will be processed correctly,
 - `WordpressParser` contains code copied from the latest currently available WordPress (4.3.1). It is also a regex-based parser, but the included regular expression is quite weak, it for example won't support BBCode syntax (`[name="param" /]`). This parser by default supports the shortcode name rule, but can break it when created with one of the named constructors (`createFromHandlers()` or `createFromNames()`) that change its behavior to catch only configured names. All of it is intentional to keep the compatibility with what WordPress is capable of if you need that compatibility.