Merge branch 'update'

Author: lkrms

.phive/phars.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="php-cs-fixer" version="^3.0" installed="3.74.0" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.0" installed="3.75.0" location="./tools/php-cs-fixer" copy="true"/>
   <phar name="box" version="^4.0" installed="4.6.6" location="./tools/box" copy="true"/>
 </phive>

composer.json

@@ -18,14 +18,14 @@
         "ext-mbstring": "*",
         "ext-tokenizer": "*",
         "composer-runtime-api": "^2.2",
-        "salient/cli": "^0.99",
-        "salient/collections": "^0.99",
-        "salient/console": "^0.99",
-        "salient/contracts": "^0.99",
-        "salient/core": "^0.99",
-        "salient/phpdoc": "^0.99",
-        "salient/polyfills": "^0.99",
-        "salient/utils": "^0.99",
+        "salient/cli": "0.99.79",
+        "salient/collections": "0.99.79",
+        "salient/console": "0.99.79",
+        "salient/contracts": "0.99.79",
+        "salient/core": "0.99.79",
+        "salient/phpdoc": "0.99.79",
+        "salient/polyfills": "0.99.79",
+        "salient/utils": "0.99.79",
         "sebastian/diff": "^4 || ^5"
     },
     "require-dev": {
@@ -36,9 +36,9 @@
         "phpstan/phpstan-deprecation-rules": "^2",
         "phpstan/phpstan-phpunit": "^2",
         "phpunit/phpunit": "^9",
-        "salient/phpstan": "^0.99",
-        "salient/sli": "^0.99",
-        "salient/testing": "^0.99"
+        "salient/phpstan": "0.99.79",
+        "salient/sli": "0.99.79",
+        "salient/testing": "0.99.79"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -54,6 +54,10 @@ public static function needsSortedTokens(): bool
      * from both delimiters, the remaining content is trimmed, and a space is
      * added between delimiters and adjacent content.
      *
+     * Region markers recognised by VS Code, including C++-style comments like
+     * `//region`, are converted to shell-style `#region` or `#endregion`
+     * comments if necessary, otherwise they are not modified.
+     *
      * Shell-style comments (`#`) are converted to C++-style comments (`//`).
      *
      * In C++-style comments (`//`), a space is added between the delimiter and
@@ -106,10 +110,20 @@ public function processTokens(array $tokens): void
             }
 
             if ($token->Flags & Flag::ONELINE_COMMENT) {
-                if ($type === Flag::SHELL_COMMENT) {
-                    $text = '//' . substr($text, 1);
+                if (
+                    $token->wasFirstOnLine()
+                    && Regex::match('`^(?:#|//)(?:end)?region\b`', $text)
+                ) {
+                    if ($type === Flag::CPP_COMMENT) {
+                        $text = '#' . substr($text, 2);
+                        $token->setText($text);
+                    }
+                } else {
+                    if ($type === Flag::SHELL_COMMENT) {
+                        $text = '//' . substr($text, 1);
+                    }
+                    $token->setText(Regex::replace('#^//(?=\S)#', '// ', $text));
                 }
-                $token->setText(Regex::replace('#^//(?=\S)#', '// ', $text));
                 continue;
             }
 

docs/Rules.md

@@ -0,0 +1,13 @@
+<?php
+return function (App $app) {
+    $app->add(SessionMiddleware::class);
+
+    #region Twig
+
+    // Create Twig
+    $twig = Twig::create(__DIR__ . '/../templates', ['cache' => false]);
+    // Add Twig-View Middleware
+    $app->add(TwigMiddleware::create($app, $twig));
+
+    #endregion Twig
+};