Remove workflow (#281)

* Remove auto cs-fix * Remove other workflow * Apply cs fix
mineadmin · Jun 17, 2024 · a7ba21f · a7ba21f
1 parent 0190b54
commit a7ba21f
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 97 deletions.
diff --git a/.github/workflows/crontab-cs-fixer.yml b/.github/workflows/crontab-cs-fixer.yml
diff --git a/.github/workflows/generator-changelog.yml b/.github/workflows/generator-changelog.yml
diff --git a/.github/workflows/pull-request-cs-fixer.yml b/.github/workflows/pull-request-cs-fixer.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,7 +5,31 @@ on:
   schedule:
     - cron: '0 2 * * *'
 jobs:
+  cs-fix:
+    name: PHP CS Fix on PHP${{ matrix.php }} ${{ matrix.swoole }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ ubuntu-latest ]
+        php: [ '8.1' ]
+        swoole: [ 'swoole' ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.1'
+          tools: php-cs-fixer
+          extensions: redis, pdo, pdo_mysql, bcmath, ${{ matrix.swoole }}
+      - name: Setup Packages
+        run: composer update -oW
+      - name: Run CS Fix
+        run: |
+          vendor/bin/php-cs-fixer fix app --dry-run --diff
+          vendor/bin/php-cs-fixer fix api --dry-run --diff
   tests:
+    needs: cs-fix
     name: Test on PHP${{ matrix.php-version }} Swoole-${{ matrix.sw-version }}
     runs-on: "${{ matrix.os }}"
     strategy:

diff --git a/app/System/Mapper/SystemAppMapper.php b/app/System/Mapper/SystemAppMapper.php
@@ -93,7 +93,7 @@ public function getAppAndInterfaceList(string $appId): array
         }
         $systemApiGroupMapper = container()->get(SystemApiGroupMapper::class);
         $data['apiGroup'] = $systemApiGroupMapper->get(function ($query) use ($groupIds) {
-            /**
+            /*
              * @var Builder $query
              */
             return $query->whereIn('id', array_unique($groupIds));

diff --git a/app/System/Mapper/SystemUserMapper.php b/app/System/Mapper/SystemUserMapper.php
@@ -184,7 +184,7 @@ public function handleSearch(Builder $query, array $params): Builder
             $isAll = $params['showDeptAll'] ?? false;
 
             $query->with(['depts' => function ($query) use ($isAll) {
-                /**
+                /*
                  *  @var Builder $query
                  */
                 $query->where('status', SystemDept::ENABLE);