Remove conflict with HHVM

PHP-CS-Fixer · Nov 26, 2020 · eb73769 · eb73769
1 parent 9488546
commit eb73769
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/sca.yaml b/.github/workflows/sca.yaml
@@ -22,6 +22,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -77,15 +79,17 @@ jobs:
       - name: Find changed files (for pull request)
         if: ${{ github.event_name == 'pull_request' }}
         run: |
+          git diff origin/$GITHUB_BASE_REF --name-only --diff-filter=ACMRTUXB | grep -E "\.php$" || true
           echo 'CHANGED_PHP_FILES<<EOF' >> $GITHUB_ENV
-          git diff origin/$GITHUB_BASE_REF --name-only --diff-filter=ACMRTUXB | grep -E "\.php$" >> $GITHUB_ENV
+          git diff origin/$GITHUB_BASE_REF --name-only --diff-filter=ACMRTUXB | grep -E "\.php$" || true >> $GITHUB_ENV
           echo 'EOF' >> $GITHUB_ENV
 
       - name: Find changed files (for push)
         if: ${{ github.event_name != 'pull_request' }}
         run: |
+          git diff --name-only --diff-filter=ACMRTUXB HEAD~..HEAD | grep -E "\.php$" || true
           echo 'CHANGED_PHP_FILES<<EOF' >> $GITHUB_ENV
-          git diff --name-only --diff-filter=ACMRTUXB HEAD~..HEAD | grep -E "\.php$" >> $GITHUB_ENV
+          git diff --name-only --diff-filter=ACMRTUXB HEAD~..HEAD | grep -E "\.php$" || true >> $GITHUB_ENV
           echo 'EOF' >> $GITHUB_ENV
 
       - name: Validate changed files
@@ -106,5 +110,5 @@ jobs:
             grep -v tests/Test/IntegrationCaseFactoryInterface.php |
             grep -v tests/Test/InternalIntegrationCaseFactory.php |
             grep -v tests/Test/IsIdenticalConstraint.php |
-            grep -v tests/TestCase.php
+            grep -v tests/TestCase.php \
           && (echo "UNKNOWN FILES DETECTED" && exit 1) || echo "NO UNKNOWN FILES"
diff --git a/dev-tools/composer.json b/dev-tools/composer.json
@@ -12,9 +12,6 @@
         "phpstan/phpstan": "0.12.18",
         "phpstan/phpstan-phpunit": "^0.12"
     },
-    "conflict": {
-        "hhvm": "*"
-    },
     "config": {
         "optimize-autoloader": true,
         "sort-packages": true