ci(config): Update config files

guanguans · guanguans · commit cc27437c0185 · 2025-12-02T15:01:44.000+08:00
diff --git a/.zhlintcaseignore b/.zhlintcaseignore
@@ -0,0 +1,5 @@
+# https://github.com/zhlint-project/zhlint#advanced-usage
+# https://github.com/zhlint-project/zhlint#setup-ignored-cases
+# 忽略短语
+
+Fatal error: ...Exit Code:
diff --git a/.zhlintignore b/.zhlintignore
@@ -0,0 +1,3 @@
+# https://github.com/zhlint-project/zhlint#advanced-usage
+# 忽略文件
+
diff --git a/.zhlintrc b/.zhlintrc
@@ -1,8 +1,9 @@
 {
     "preset": "default",
+    "caseIgnores": [
+        ":warning:"
+    ],
     "rules": {
-        "fullwidthPunctuation": "，。；？！“”‘’",
-        "spaceAfterHalfwidthPauseOrStop": false,
         "spaceOutsideHalfwidthBracket": false
     }
 }
diff --git a/README.md b/README.md
@@ -534,8 +534,8 @@ guanguans ALL=(ALL) NOPASSWD: /Users/guanguans/Documents/develop/soar-php/bin/so
 ```shell
 composer benchmark
 composer checks:required
-composer soar:usage-example-run
-composer soar:usage-example-serve
+composer soar:example-run
+composer soar:example-serve
 composer test
 ```
 
diff --git a/composer-bump b/composer-bump
@@ -95,7 +95,7 @@ class ComposerBump
     public function __invoke(): void
     {
         $this
-            ->updateComposerPackages()
+            // ->updateComposerPackages()
             ->updateOutdatedComposerPackages()
             ->updateComposerPackages()
             ->normalizeComposerJson()
@@ -109,7 +109,7 @@ class ComposerBump
     {
         $outdatedComposerJsonContents = json_encode(
             $this->outdatedDecodedComposerJson(),
-            \JSON_PRETTY_PRINT | \JSON_UNESCAPED_UNICODE | \JSON_UNESCAPED_SLASHES
+            \JSON_PRETTY_PRINT | \JSON_THROW_ON_ERROR | \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE
         ).\PHP_EOL;
 
         file_put_contents($this->composerJsonPath, $outdatedComposerJsonContents);
@@ -140,7 +140,6 @@ class ComposerBump
     /**
      * @noinspection LongLine
      * @noinspection D
-     * @noinspection PhpMultipleClassDeclarationsInspection
      *
      * @throws \JsonException
      */
@@ -163,12 +162,18 @@ class ComposerBump
                     continue;
                 }
 
-                if ($version = InstalledVersions::getVersion($package)) {
-                    $dependencyVersion = $this->dependencyVersionFor($version);
+                if (
+                    !Str::is($this->exceptVersions, $version = InstalledVersions::getVersion($package))
+                   && !Str::is($this->exceptVersions, $originalVersion = $this->dependencyVersionFor($version))
+                ) {
+                    $dependencyVersion = $originalVersion;
                 }
 
-                if (isset($outdatedComposerPackages[$package])) {
-                    $dependencyVersion = $outdatedComposerPackages[$package]['dependency_version'];
+                if (
+                    isset($outdatedComposerPackages[$package])
+                    && !Str::is($this->exceptVersions, $outdatedVersion = $outdatedComposerPackages[$package]['dependency_version'])
+                ) {
+                    $dependencyVersion = $outdatedVersion;
                 }
             }
         }
@@ -239,6 +244,7 @@ class ComposerBump
     {
         return implode(' ', [
             escapeshellarg($phpBinary ?? (new PhpExecutableFinder)->find()),
+            // '-d', escapeshellarg('error_reporting=E_ALL &~ E_DEPRECATED'),
             escapeshellarg((string) ($composerBinary ?? (new ExecutableFinder)->find('composer'))),
         ]);
     }
@@ -262,7 +268,10 @@ class ComposerBump
         ];
 
         $cwd ??= \dirname($this->composerJsonPath);
-        $env += ['COMPOSER_MEMORY_LIMIT' => -1];
+        $env += [
+            'COMPOSER_MEMORY_LIMIT' => -1,
+            'XDEBUG_MODE' => 'off',
+        ];
 
         $process = \is_string($command)
             ? Process::fromShellCommandline(implode(' ', [$command, ...$options]), $cwd, $env, $input, $timeout)
diff --git a/composer.json b/composer.json
@@ -214,7 +214,7 @@
             "@php-cs-fixer:fix-dry-run-stop-on-violation",
             "@soar:check-binary",
             "@soar:dump-config",
-            "@soar:usage-example-run",
+            "@soar:example-run",
             "@pest:bail",
             "@rector:process-dry-run",
             "@phpstan:analyse"
@@ -387,7 +387,7 @@
         "rector:process-dry-run": "@rector:process --dry-run",
         "rector:process-only": "@rector:process-clear-cache --only=Guanguans\\SoarPHP\\Support\\Rectors\\AddHasOptionsDocCommentRector",
         "rector:process-only-dry-run": "@rector:process-only --dry-run",
-        "rector:process-soar-options": "@rector:process-clear-cache --config=rector-soar-options.php",
+        "rector:process-soar-options": "@rector:process-clear-cache --config=rector-options.php",
         "rector:process-soar-options-dry-run": "@rector:process-soar-options --dry-run",
         "rector:setup-ci": "@rector setup-ci",
         "rule-doc-generator": [
@@ -432,13 +432,13 @@
         ],
         "soar:dump-php-config-prototype": "Guanguans\\SoarPHP\\Support\\ComposerScripts::dumpSoarPHPConfig",
         "soar:dump-yaml-config": "Guanguans\\SoarPHP\\Support\\ComposerScripts::dumpSoarYamlConfig",
-        "soar:usage-example-run": [
+        "soar:example-run": [
             "echo 'examples/example.php:\n'",
-            "@php examples/usage-example.php"
+            "@php examples/example.php"
         ],
-        "soar:usage-example-serve": [
+        "soar:example-serve": [
             "@composer-config:disable-process-timeout",
-            "@php -S localhost:8123 examples/usage-example.php"
+            "@php -S localhost:8123 examples/example.php"
         ],
         "testbench": "@php vendor/bin/testbench --ansi",
         "testbench:build": "@testbench workbench:build",
diff --git a/examples/blacklist.example b/examples/blacklist.example
diff --git a/examples/example.php b/examples/example.php
diff --git a/examples/options-example.php b/examples/options-example.php
@@ -17,7 +17,7 @@
 
 return [
     // Config file path
-    '-config' => __DIR__.'/soar-options.yaml',
+    '-config' => __DIR__.'/options.yaml',
 
     // TestDSN, 测试环境数据库配置, username:********@tcp(ip:port)/schema (default "tcp/information_schema?timeout=3s&charset=utf8")
     '-test-dsn' => [
@@ -75,7 +75,7 @@
     '-allow-online-as-test' => true,
 
     // 指定 blacklist 配置文件的位置，文件中的 SQL 不会被评审。一行一条SQL，可以是指纹，也可以是正则
-    '-blacklist' => __DIR__.'/soar.blacklist.example',
+    '-blacklist' => __DIR__.'/blacklist.example',
 
     // Explain, 是否开启Explain执行计划分析 (default true)
     '-explain' => true,
diff --git a/examples/options.php b/examples/options.php
diff --git a/examples/options.yaml b/examples/options.yaml
diff --git a/rector-options.php b/rector-options.php
@@ -20,7 +20,7 @@
 
 return RectorConfig::configure()
     ->withPaths([
-        __DIR__.'/examples/soar-options.php',
+        __DIR__.'/examples/options.php',
     ])
     ->withPhpVersion(PhpVersion::PHP_81)
     ->withoutParallel()
diff --git a/src/Support/ComposerScripts.php b/src/Support/ComposerScripts.php
@@ -73,7 +73,7 @@ public static function dumpSoarYamlConfig(Event $event): int
         self::requireAutoload($event);
 
         file_put_contents(
-            __DIR__.'/../../examples/soar-options.yaml',
+            __DIR__.'/../../examples/options.yaml',
             Yaml::dump(self::resolveSoarConfig()->all(), 3, 2, Yaml::DUMP_EMPTY_ARRAY_AS_SEQUENCE)
         );
 
@@ -92,7 +92,7 @@ public static function dumpSoarPHPConfig(Event $event): int
         self::requireAutoload($event);
 
         file_put_contents(
-            __DIR__.'/../../examples/soar-options.php',
+            __DIR__.'/../../examples/options.php',
             \sprintf(
                 <<<'PHP'
                     <?php
@@ -223,7 +223,7 @@ static function (Collection $options, Collection $option): Collection {
                 return $option;
             })
             ->tap(static function () use (&$rules): void {
-                $rules = array_keys(require __DIR__.'/../../examples/soar-options-example.php');
+                $rules = array_keys(require __DIR__.'/../../examples/options-example.php');
             })
             ->sortKeysUsing(static function (string $a, string $b) use ($rules): int {
                 if (!\in_array($a, $rules, true) && \in_array($b, $rules, true)) {
diff --git a/tests/Concerns/HasOptionsTest.php b/tests/Concerns/HasOptionsTest.php
@@ -90,7 +90,7 @@
 
 it('can normalize options', function (): void {
     $normalizedOptions = (fn (): array => $this->getNormalizedOptions())->call(Soar::make([
-        ...require __DIR__.'/../../examples/soar-options.php',
+        ...require __DIR__.'/../../examples/options.php',
         '-explain-format' => new class {
             public function __invoke(): string
             {
diff --git a/tests/Pest.php b/tests/Pest.php
@@ -118,7 +118,7 @@ function soar_options(): array
     static $options;
 
     return $options ??= array_filter(
-        require __DIR__.'/../examples/soar-options.php',
+        require __DIR__.'/../examples/options.php',
         fn (mixed $value): bool => null !== $value
     );
 }
@@ -127,5 +127,5 @@ function soar_options_example(): array
 {
     static $options;
 
-    return $options ??= require __DIR__.'/../examples/soar-options-example.php';
+    return $options ??= require __DIR__.'/../examples/options-example.php';
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# https://github.com/zhlint-project/zhlint#advanced-usage`
	`2`	`+# 忽略文件`
	`3`	`+`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"preset": "default",`
	`3`	`+ "caseIgnores": [`
	`4`	`+ ":warning:"`
	`5`	`+ ],`
`3`	`6`	`"rules": {`
`4`		`- "fullwidthPunctuation": "，。；？！“”‘’",`
`5`		`- "spaceAfterHalfwidthPauseOrStop": false,`
`6`	`7`	`"spaceOutsideHalfwidthBracket": false`
`7`	`8`	`}`
`8`	`9`	`}`