ci(config): Remove unused faker mappings and commented properties

guanguans · guanguans · commit fafbc2618bd5 · 2025-11-29T17:31:21.000+08:00
- Removed 'faker' mapping from the array for clarity.
- Commented out 'property-read' and 'property-write' replacements in phpdoc_no_alias_tag.
- These changes streamline the configuration and improve readability.

Signed-off-by: guanguans &lt;ityaozm@gmail.com&gt;
diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
@@ -20,11 +20,18 @@ jobs:
         env:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
       - name: Cache composer dependencies
         uses: actions/cache@v4
         with:
-          path: vendor
-          key: composer-${{ hashFiles('composer.lock') }}
+          path: ${{ steps.composer-cache.outputs.dir }}
+          # Use composer.json for key, if composer.lock is not committed.
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
 
       - name: Run composer install
         run: composer install --no-interaction --prefer-dist --ansi -v
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -27,11 +27,18 @@ jobs:
         env:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
       - name: Cache composer dependencies
         uses: actions/cache@v4
         with:
-          path: vendor
-          key: composer-${{ hashFiles('composer.lock') }}
+          path: ${{ steps.composer-cache.outputs.dir }}
+          # Use composer.json for key, if composer.lock is not committed.
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
 
       - name: Run composer install
         run: composer install --no-interaction --prefer-dist --ansi -v
diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml
@@ -26,11 +26,18 @@ jobs:
         env:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
       - name: Cache composer dependencies
         uses: actions/cache@v4
         with:
-          path: vendor
-          key: composer-${{ hashFiles('composer.lock') }}
+          path: ${{ steps.composer-cache.outputs.dir }}
+          # Use composer.json for key, if composer.lock is not committed.
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
 
       - name: Run composer install
         run: composer install --no-interaction --prefer-dist --ansi -v
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -216,6 +216,8 @@
         'phpdoc_no_alias_tag' => [
             'replacements' => [
                 'link' => 'see',
+                // 'property-read' => 'property',
+                // 'property-write' => 'property',
                 'type' => 'var',
             ],
         ],
diff --git a/baselines/loader.neon b/baselines/loader.neon
@@ -1,9 +1,10 @@
-# total 6 errors
+# total 7 errors
 
 includes:
     - assign.propertyType.neon
     - callable.nonCallable.neon
     - complexity.functionLike.neon
     - disallowed.function.neon
     - new.static.neon
+    - property.notFound.neon
     - typePerfect.narrowPublicClassMethodParamType.neon
diff --git a/baselines/property.notFound.neon b/baselines/property.notFound.neon
@@ -0,0 +1,8 @@
+# total 1 error
+
+parameters:
+    ignoreErrors:
+        -
+            message: '#^Access to an undefined property Composer\\IO\\IOInterface\:\:\$output\.$#'
+            count: 1
+            path: ../src/Support/ComposerScripts.php
diff --git a/composer.json b/composer.json
@@ -222,7 +222,6 @@
         "class-leak:check": "@class-leak check examples/ src/ --skip-type=\\Contracts\\Channel --skip-suffix=Channel --skip-path=Support/Rectors/",
         "composer-bump": [
             "@putenv:php",
-            "@putenv:xdebug-off",
             "@composer-config:disable-process-timeout",
             "@php composer-bump --highest-php-binary=$PHP85 --except-package=foo/bar --ansi"
         ],
diff --git a/monorepo-builder.php b/monorepo-builder.php
@@ -25,6 +25,8 @@
 use Symfony\Component\Process\PhpExecutableFinder;
 use Symfony\Component\Process\Process;
 use Symplify\MonorepoBuilder\Config\MBConfig;
+use Symplify\MonorepoBuilder\Contract\Git\TagResolverInterface;
+use Symplify\MonorepoBuilder\Git\BranchAwareTagResolver;
 use Symplify\MonorepoBuilder\Release\ReleaseWorker\AddTagToChangelogReleaseWorker;
 use Symplify\MonorepoBuilder\Release\ReleaseWorker\PushNextDevReleaseWorker;
 use Symplify\MonorepoBuilder\Release\ReleaseWorker\PushTagReleaseWorker;
@@ -39,6 +41,10 @@
     $mbConfig->defaultBranch('master');
     MBConfig::disableDefaultWorkers();
 
+    // $services = $mbConfig->services();
+    // $services->set(BranchAwareTagResolver::class);
+    // $services->alias(TagResolverInterface::class, BranchAwareTagResolver::class);
+
     /**
      * release workers - in order to execute.
      *
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -38,7 +38,7 @@ parameters:
     phpVersion: 80100
     level: max
     editorUrl: 'phpstorm://open?file=%%file%%&line=%%line%%'
-#    errorFormat: friendly
+    errorFormat: friendly
     friendly:
         lineBefore: 3
         lineAfter: 3
diff --git a/rector-soar-options.php b/rector-soar-options.php
@@ -24,7 +24,6 @@
     ])
     ->withPhpVersion(PhpVersion::PHP_81)
     ->withoutParallel()
-    // ->withImportNames(importNames: false)
     ->withImportNames(importDocBlockNames: false, importShortClasses: false)
     ->withRules([
         AddDocCommentForSoarOptionsRector::class,
diff --git a/rector.php b/rector.php
@@ -101,12 +101,13 @@
         PHPUnitSetList::PHPUNIT_100,
     ])
     ->withRules([
+        AddDocCommentForHasOptionsRector::class,
+        SortAssociativeArrayByKeyRector::class,
+
         ArraySpreadInsteadOfArrayMergeRector::class,
         JsonThrowOnErrorRector::class,
         StaticArrowFunctionRector::class,
         StaticClosureRector::class,
-        SortAssociativeArrayByKeyRector::class,
-        AddDocCommentForHasOptionsRector::class,
     ])
     ->withConfiguredRule(AddNoinspectionsDocCommentToDeclareRector::class, [
         'AnonymousFunctionStaticInspection',
@@ -133,6 +134,18 @@
     ->withConfiguredRule(StaticCallToFuncCallRector::class, [
         new StaticCallToFuncCall(Str::class, 'of', 'str'),
     ])
+    ->withConfiguredRule(
+        AnnotationToAttributeRector::class,
+        classes(static fn (string $class): bool => str_starts_with($class, 'PhpBench\Attributes'))
+            ->filter(static fn (ReflectionClass $reflectionClass): bool => $reflectionClass->isInstantiable())
+            ->map(static fn (ReflectionClass $reflectionClass): AnnotationToAttribute => new AnnotationToAttribute(
+                $reflectionClass->getShortName(),
+                $reflectionClass->getName(),
+                [],
+                true
+            ))
+            ->all(),
+    )
     ->withConfiguredRule(
         ChangeMethodVisibilityRector::class,
         classes(static fn (string $class, string $file): bool => str_starts_with($class, 'Guanguans\SoarPHP'))
@@ -156,12 +169,10 @@ classes(static fn (string $class, string $file): bool => str_starts_with($class,
         [
             'Pest\Faker\fake' => 'fake',
             'Pest\Faker\faker' => 'fake',
-            'faker' => 'fake',
             'test' => 'it',
         ] + array_reduce(
             [
                 'classes',
-                'escape_argument',
                 'str_snake',
             ],
             static function (array $carry, string $func): array {
@@ -173,18 +184,6 @@ static function (array $carry, string $func): array {
             []
         )
     )
-    ->withConfiguredRule(
-        AnnotationToAttributeRector::class,
-        classes(static fn (string $class): bool => str_starts_with($class, 'PhpBench\Attributes'))
-            ->filter(static fn (ReflectionClass $reflectionClass): bool => $reflectionClass->isInstantiable())
-            ->map(static fn (ReflectionClass $reflectionClass): AnnotationToAttribute => new AnnotationToAttribute(
-                $reflectionClass->getShortName(),
-                $reflectionClass->getName(),
-                [],
-                true
-            ))
-            ->all(),
-    )
     ->withSkip([
         ChangeOrIfContinueToMultiContinueRector::class,
         EncapsedStringsToSprintfRector::class,
diff --git a/src/Support/ComposerScripts.php b/src/Support/ComposerScripts.php
@@ -33,6 +33,8 @@
 /**
  * @internal
  *
+ * @property \Symfony\Component\Console\Output\ConsoleOutput $output
+ *
  * @method void configureIO(InputInterface $input, OutputInterface $output)
  */
 final class ComposerScripts
@@ -42,21 +44,21 @@ final class ComposerScripts
      *
      * @noinspection PhpUnused
      */
-    public static function checkSoarBinary(): int
+    public static function checkSoarBinary(Event $event): int
     {
-        // self::requireAutoload($event);
+        self::requireAutoload($event);
 
         foreach ((array) glob(__DIR__.'/../../bin/soar.*-*') as $file) {
             if (!is_executable($file)) {
-                self::makeSymfonyStyle()->error("The file [$file] is not executable.");
+                $event->getIO()->error("The file [$file] is not executable.");
 
                 exit(1);
             }
 
-            self::makeSymfonyStyle()->comment("<info>OK</info> $file");
+            $event->getIO()->warning("// OK $file");
         }
 
-        self::makeSymfonyStyle()->success('No errors');
+        $event->getIO()->info('No errors');
 
         return 0;
     }
@@ -75,7 +77,7 @@ public static function dumpSoarYamlConfig(Event $event): int
             Yaml::dump(self::resolveSoarConfig()->all(), 3, 2, Yaml::DUMP_EMPTY_ARRAY_AS_SEQUENCE)
         );
 
-        self::makeSymfonyStyle()->success('No errors');
+        $event->getIO()->info('No errors');
 
         return 0;
     }
@@ -116,7 +118,7 @@ public static function dumpSoarPHPConfig(Event $event): int
             )
         );
 
-        self::makeSymfonyStyle()->success('No errors');
+        $event->getIO()->info('No errors');
 
         return 0;
     }
@@ -240,9 +242,6 @@ static function (Collection $options, Collection $option): Collection {
             });
     }
 
-    /**
-     * @noinspection PhpUnused
-     */
     public static function makeRectorConfig(): RectorConfig
     {
         static $rectorConfig;
@@ -253,7 +252,7 @@ public static function makeRectorConfig(): RectorConfig
     /**
      * @see \Rector\Console\Style\SymfonyStyleFactory
      */
-    private static function makeSymfonyStyle(): SymfonyStyle
+    public static function makeSymfonyStyle(): SymfonyStyle
     {
         static $symfonyStyle;
 
@@ -283,6 +282,10 @@ private static function makeSymfonyStyle(): SymfonyStyle
     private static function requireAutoload(Event $event): void
     {
         require_once $event->getComposer()->getConfig()->get('vendor-dir').'/autoload.php';
+
+        (function (): void {
+            $this->output->setVerbosity(OutputInterface::VERBOSITY_DEBUG);
+        })->call($event->getIO());
     }
 
     /**
