diff --git a/.github/workflows/phan.yml b/.github/workflows/phan.yml
index 7bda007cef9..c45d0f90d72 100644
--- a/.github/workflows/phan.yml
+++ b/.github/workflows/phan.yml
@@ -53,8 +53,8 @@ jobs:
 
       - name: Get changed PHP files
         id: files
+        # shellcheck disable=2086
         run: |
-          # shellcheck disable=2086
           git fetch origin ${{ github.base_ref }}
           FILES=$(git diff --name-only origin/${{ github.base_ref }}...HEAD | grep '\.php$' || true)
           PHP_FILES=$(echo "$FILES" | grep '\.php$' || true)
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
index b465ed73739..15f2f731f30 100644
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -70,13 +70,14 @@ jobs:
         id: files
         # shellcheck disable=SC2086
         run: |
+          # shellcheck disable=SC2086
           git fetch origin ${{ github.base_ref }}
-          FILES=$(git diff --name-only origin/${{ github.base_ref }}...HEAD | grep '\.php$' || true)
+          FILES=$(git diff --name-only "origin/${{ github.base_ref }}...HEAD" | grep '\.php$' || true)
           {
             echo "files<<EOF"
             echo "$FILES"
             echo "EOF"
-          } >> $GITHUB_OUTPUT
+          } > "$GITHUB_OUTPUT"
 
       # Run PHPStan
       - name: Run PHPStan