Merge branch 'codeigniter4projects-develop' into develop

CodeIgniter-Chinese · Oct 24, 2023 · 20c3873 · 20c3873
2 parents 5600043 + e748db0
commit 20c3873
Show file tree

Hide file tree

Showing 37 changed files with 981 additions and 1,262 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -1,15 +1,15 @@
-name: 'Deploy to Production'
+name: "Deploy to Production"
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   deploy:
-    name: 'Deploy to Production'
+    name: "Deploy to Production"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: master
 
@@ -68,4 +68,4 @@ jobs:
             echo $'Set up Links\n'
             cd $RELEASE_DIR
             sudo ln -nsf $RELEASE_DIR/$RELEASE "../current"
-            sudo service php7.4-fpm reload
+            sudo service php8.1-fpm reload
diff --git a/.github/workflows/deptrac.yml b/.github/workflows/deptrac.yml
@@ -19,54 +19,5 @@ on:
       - '.github/workflows/deptrac.yml'
 
 jobs:
-  build:
-    name: Dependency Tracing
-    runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Set up PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.1'
-          tools: phive
-          extensions: intl, json, mbstring, xml
-          coverage: none
-        env:
-          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Get composer cache directory
-        run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v3
-        with:
-          path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-      - name: Create Deptrac cache directory
-        run: mkdir -p build/
-
-      - name: Cache Deptrac results
-        uses: actions/cache@v3
-        with:
-          path: build
-          key: ${{ runner.os }}-deptrac-${{ github.sha }}
-          restore-keys: ${{ runner.os }}-deptrac-
-
-      - name: Install dependencies
-        run: |
-          if [ -f composer.lock ]; then
-            composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
-          else
-            composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader
-          fi
-
-      - name: Trace dependencies
-        run: |
-          sudo phive --no-progress install --global --trust-gpg-keys B8F640134AB1782E,A98E898BB53EB748 qossmic/deptrac
-          deptrac analyze --cache-file=build/deptrac.cache
+  deptrac:
+    uses: codeigniter4/.github/.github/workflows/deptrac.yml@main
diff --git a/.github/workflows/infection.yml b/.github/workflows/infection.yml
@@ -9,14 +9,14 @@ on:
       - 'composer.*'
       - 'phpunit*'
       - '.github/workflows/infection.yml'
-  push:
-    branches:
-      - develop
-    paths:
-      - '**.php'
-      - 'composer.*'
-      - 'phpunit*'
-      - '.github/workflows/infection.yml'
+  workflow_call:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
 
 jobs:
   main:
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
@@ -36,7 +36,7 @@ jobs:
           extensions: intl, json, mbstring, gd, xml, sqlite3
           coverage: xdebug
         env:
-          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up problem matchers for PHPUnit
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
@@ -62,12 +62,9 @@ jobs:
             composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader
           fi
 
-      - name: Test with PHPUnit
-        run: vendor/bin/phpunit --teamcity
-        env:
-          GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Mutate with Infection
+      - name: Run Infection for added files only
         run: |
           git fetch --depth=1 origin develop
-          infection --threads=2 --skip-initial-tests --coverage=build/phpunit --git-diff-base=origin/develop --git-diff-filter=AM --logger-github --ignore-msi-with-no-mutations
+          infection --threads=max --git-diff-lines --git-diff-base=origin/develop --ignore-msi-with-no-mutations --only-covered --logger-github
+        env:
+          GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/phpcpd.yml b/.github/workflows/phpcpd.yml
@@ -15,22 +15,7 @@ on:
       - '.github/workflows/phpcpd.yml'
 
 jobs:
-  build:
-    name: Code Copy-Paste Detection
-    runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.1'
-          tools: phpcpd
-          extensions: dom, mbstring
-          coverage: none
-
-      - name: Detect duplicate code
-        run: phpcpd app/ tests/
+  phpcpd:
+    uses: codeigniter4/.github/.github/workflows/phpcpd.yml@main
+    with:
+      dirs: "app/ tests/"
diff --git a/.github/workflows/phpcsfixer.yml b/.github/workflows/phpcsfixer.yml
@@ -13,25 +13,37 @@ on:
     paths:
       - '**.php'
       - '.github/workflows/phpcsfixer.yml'
+  workflow_call:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
 
 jobs:
   build:
-    name: Coding Standards
+    name: PHP ${{ matrix.php-versions }} Coding Standards
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    strategy:
+      fail-fast: false
+      matrix:
+        php-versions: ['8.1']
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: ${{ matrix.php-versions }}
           extensions: json, tokenizer
           coverage: none
         env:
-          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get composer cache directory
         run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV

diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -17,6 +17,14 @@ on:
       - 'composer.*'
       - 'phpstan*'
       - '.github/workflows/phpstan.yml'
+  workflow_call:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
 
 jobs:
   build:
@@ -26,11 +34,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.4', '8.0', '8.1']
+        php-versions: ['8.1']
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -40,7 +48,7 @@ jobs:
           extensions: intl, json, mbstring, xml
           coverage: none
         env:
-          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get composer cache directory
         run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -25,11 +25,11 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     strategy:
       matrix:
-        php-versions: ['7.4', '8.0', '8.1']
+        php-versions: ['8.1']
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
@@ -39,7 +39,7 @@ jobs:
           extensions: intl, json, mbstring, gd, xdebug, xml, sqlite3
           coverage: xdebug
         env:
-          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get composer cache directory
         run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
@@ -66,7 +66,7 @@ jobs:
           TACHYCARDIA_MONITOR_GA: enabled
           GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - if: matrix.php-versions == '8.0'
+      - if: matrix.php-versions == '8.1'
         name: Run Coveralls
         continue-on-error: true
         run: |

diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -19,52 +19,5 @@ on:
       - '.github/workflows/psalm.yml'
 
 jobs:
-  build:
-    name: Psalm Analysis
-    runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.1'
-          tools: phpstan, phpunit
-          extensions: intl, json, mbstring, xml
-          coverage: none
-        env:
-          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Get composer cache directory
-        run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v3
-        with:
-          path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-      - name: Create Psalm cache directory
-        run: mkdir -p build/psalm
-
-      - name: Cache Psalm results
-        uses: actions/cache@v3
-        with:
-          path: build/psalm
-          key: ${{ runner.os }}-psalm-${{ github.sha }}
-          restore-keys: ${{ runner.os }}-psalm-
-
-      - name: Install dependencies
-        run: |
-          if [ -f composer.lock ]; then
-            composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
-          else
-            composer update --no-progress --no-interaction --prefer-dist --optimize-autoloader
-          fi
-
-      - name: Run Psalm analysis
-        run: vendor/bin/psalm
+  psalm:
+    uses: codeigniter4/.github/.github/workflows/psalm.yml@main
diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml
@@ -17,6 +17,14 @@ on:
       - 'composer.*'
       - 'rector.php'
       - '.github/workflows/rector.yml'
+  workflow_call:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
 
 jobs:
   build:
@@ -26,11 +34,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.4', '8.0', '8.1']
+        php-versions: ['8.1']
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
@@ -40,7 +48,7 @@ jobs:
           extensions: intl, json, mbstring, xml
           coverage: none
         env:
-          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Get composer cache directory
         run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
@@ -61,6 +69,4 @@ jobs:
           fi
 
       - name: Analyze for refactoring
-        run: |
-          composer global require --dev rector/rector:^0.15.1
-          rector process --dry-run --no-progress-bar
+        run: vendor/bin/rector process --dry-run --no-progress-bar