Merge branch '4.x'

vimeo · Jul 7, 2022 · 285740a · 285740a
2 parents 6d45003 + 6e27c23
commit 285740a
Show file tree

Hide file tree

Showing 81 changed files with 1,900 additions and 480 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/build-phar.yml b/.github/workflows/build-phar.yml
@@ -15,7 +15,7 @@ jobs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
     steps:
       - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v3.4.0
+        uses: fkirc/skip-duplicate-actions@v4.0.0
         with:
           concurrent_skipping: always
           cancel_others: true
@@ -35,7 +35,7 @@ jobs:
           tools: composer:v2
           coverage: none
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Get Composer Cache Directories
         id: composer-cache
@@ -44,7 +44,7 @@ jobs:
           echo "::set-output name=vcs_cache::$(composer config cache-vcs-dir)"
 
       - name: Cache composer cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ${{ steps.composer-cache.outputs.files_cache }}

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,6 +1,9 @@
 name: Run unit tests
 
 on: [push, pull_request]
+permissions:
+  contents: read
+
 jobs:
   lint:
     name: Check PHP syntax
@@ -13,7 +16,7 @@ jobs:
           tools: composer:v2
           coverage: none
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Get Composer Cache Directories
         id: composer-cache
@@ -22,7 +25,7 @@ jobs:
           echo "::set-output name=vcs_cache::$(composer config cache-vcs-dir)"
 
       - name: Cache composer cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ${{ steps.composer-cache.outputs.files_cache }}
@@ -32,13 +35,15 @@ jobs:
             ${{ runner.os }}-composer-
 
       - name: Run composer install
-        run: composer install -o --ignore-platform-reqs
+        run: composer install -o
         env:
           COMPOSER_ROOT_VERSION: dev-master
 
       - run: |
           git ls-files | grep \\\.php$ | grep -v ^dictionaries/scripts/* | ./vendor/bin/parallel-lint --stdin
   chunk-matrix:
+    permissions:
+      contents: none
     name: Generate Chunk Matrix
 
     runs-on: ubuntu-latest
@@ -78,13 +83,13 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.1'
           ini-values: zend.assertions=1, assert.exception=1
           tools: composer:v2
           coverage: none
           extensions: none, curl, dom, filter, json, libxml, mbstring, openssl, pcre, phar, reflection, simplexml, spl, tokenizer, xml, xmlwriter
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Get Composer Cache Directories
         id: composer-cache
@@ -93,7 +98,7 @@ jobs:
           echo "::set-output name=vcs_cache::$(composer config cache-vcs-dir)"
 
       - name: Cache composer cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ${{ steps.composer-cache.outputs.files_cache }}

diff --git a/.github/workflows/pr-labels.yml b/.github/workflows/pr-labels.yml
@@ -6,7 +6,7 @@ jobs:
   label:
     runs-on: ubuntu-latest
     steps:
-      - uses: mheap/github-action-required-labels@v1
+      - uses: mheap/github-action-required-labels@v2
         with:
           mode: minimum
           count: 1

diff --git a/.github/workflows/shepherd.yml b/.github/workflows/shepherd.yml
@@ -2,15 +2,18 @@ name: Run Shepherd
 
 on: [push, pull_request]
 
+permissions:
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.4'
+        php-version: '8.0'
 
     - name: Install dependencies
       run: composer install --prefer-dist --no-progress --no-suggest

diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
@@ -2,8 +2,13 @@ name: Run unit tests on Windows
 
 on: [push, pull_request]
 
+permissions:
+  contents: read
+
 jobs:
   chunk-matrix:
+    permissions:
+      contents: none
     name: Generate Chunk Matrix
 
     runs-on: ubuntu-latest
@@ -54,7 +59,7 @@ jobs:
           coverage: none
           extensions: none, curl, dom, filter, json, libxml, mbstring, openssl, pcre, phar, reflection, simplexml, spl, tokenizer, xml, xmlwriter
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Get Composer Cache Directories
         id: composer-cache
@@ -63,7 +68,7 @@ jobs:
           echo "::set-output name=vcs_cache::$(composer config cache-vcs-dir)"
 
       - name: Cache composer cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ${{ steps.composer-cache.outputs.files_cache }}

diff --git a/composer.json b/composer.json
@@ -109,6 +109,7 @@
         "lint": "parallel-lint ./src ./tests",
         "phpunit": "paratest --runner=WrapperRunner",
         "phpunit-std": "phpunit",
+        "verify-callmap": "phpunit tests/Internal/Codebase/InternalCallMapHandlerTest.php",
         "psalm": "@php ./psalm --find-dead-code",
         "tests": [
             "@lint",