Fix PHPRedis hSet/Nx function signatures

.gitattributes

@@ -2,3 +2,5 @@
 *.stub linguist-language=PHP
 
 tests/PHPStan/Command/ErrorFormatter/data/WindowsNewlines.php eol=crlf
+
+.github/workflows/*.lock.yml linguist-generated=true merge=ours

.github/workflows/apiref-infra.yml

@@ -0,0 +1,96 @@
+# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
+
+name: "API Reference Infra"
+
+on:
+  workflow_dispatch:
+  pull_request:
+    paths:
+      - '.github/workflows/apiref-infra.yml'
+      - 'apigen/infra/**'
+  push:
+    branches:
+      - "2.2.x"
+    paths:
+      - '.github/workflows/apiref-infra.yml'
+      - 'apigen/infra/**'
+
+concurrency: apiref-infra
+
+jobs:
+  test:
+    name: "Test"
+    runs-on: "ubuntu-latest"
+    permissions:
+      contents: read
+
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
+        with:
+          egress-policy: audit
+
+      - name: "Checkout"
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+
+      - name: "Install Node"
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        with:
+          node-version: "22"
+          cache: "npm"
+          cache-dependency-path: apigen/infra/package-lock.json
+
+      - name: "Install dependencies"
+        working-directory: ./apigen/infra
+        run: "npm ci"
+
+      - name: "TypeScript check"
+        working-directory: ./apigen/infra
+        run: "npm run check"
+
+      - name: "Unit tests"
+        working-directory: ./apigen/infra
+        run: "npm test"
+
+      - name: "CDK synth"
+        working-directory: ./apigen/infra
+        run: "npx cdk synth --all --quiet"
+
+  deploy:
+    name: "Deploy"
+    runs-on: "ubuntu-latest"
+    needs: test
+    if: "github.event_name == 'push' && github.ref == 'refs/heads/2.2.x'"
+    permissions:
+      id-token: write
+      contents: read
+
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
+        with:
+          egress-policy: audit
+
+      - name: "Checkout"
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+
+      - name: "Install Node"
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        with:
+          node-version: "22"
+          cache: "npm"
+          cache-dependency-path: apigen/infra/package-lock.json
+
+      - name: "Install dependencies"
+        working-directory: ./apigen/infra
+        run: "npm ci"
+
+      - name: "Configure AWS credentials"
+        uses: aws-actions/configure-aws-credentials@d979d5b3a71173a29b74b5b88418bfda9437d885 # v6.1.1
+        with:
+          role-to-assume: ${{ vars.APIREF_INFRA_DEPLOY_ROLE_ARN }}
+          aws-region: us-east-1
+
+      - name: "CDK deploy"
+        working-directory: ./apigen/infra
+        run: "npx cdk deploy --all --require-approval never"

.github/workflows/apiref.yml

@@ -11,6 +11,7 @@ on:
       - 'src/**'
       - 'composer.lock'
       - 'apigen/**'
+      - '!apigen/infra/**'
       - '.github/workflows/apiref.yml'
 
 env:
@@ -64,43 +65,38 @@ jobs:
       - apigen
     if: github.repository_owner == 'phpstan'
     runs-on: "ubuntu-latest"
+    permissions:
+      id-token: write
+      contents: read
     steps:
       - name: Harden the runner (Audit all outbound calls)
         uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
         with:
           egress-policy: audit
 
-      - name: "Install Node"
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
-        with:
-          node-version: "16"
-
       - name: "Download docs"
         uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: docs
           path: docs
 
-      - name: "Sync with S3"
-        uses: jakejarvis/s3-sync-action@be0c4ab89158cac4278689ebedd8407dd5f35a83 # v0.5.1
+      - name: "Configure AWS credentials"
+        uses: aws-actions/configure-aws-credentials@d979d5b3a71173a29b74b5b88418bfda9437d885 # v6.1.1
         with:
-          args: --exclude '.git*/*' --follow-symlinks
-        env:
-          SOURCE_DIR: './docs'
-          DEST_DIR: ${{ github.ref_name }}
-          AWS_REGION: 'eu-west-1'
-          AWS_S3_BUCKET: "web-apiref.phpstan.org"
-          AWS_ACCESS_KEY_ID: ${{ secrets.APIREF_AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.APIREF_AWS_SECRET_ACCESS_KEY }}
+          role-to-assume: ${{ vars.APIREF_DEPLOY_ROLE_ARN }}
+          aws-region: us-east-1
+
+      - name: "Sync with S3"
+        run: |
+          aws s3 sync ./docs "s3://${{ vars.APIREF_BUCKET }}/${{ github.ref_name }}" \
+            --exclude '.git*/*' \
+            --follow-symlinks
 
       - name: "Invalidate CloudFront"
-        uses: chetan/invalidate-cloudfront-action@12d242edc7752fca9140c2034be28792ad22c5a8 # v2.4.1
-        env:
-          DISTRIBUTION: "E37G1C2KWNAPBD"
-          PATHS: '/${{ github.ref_name }}/*'
-          AWS_REGION: 'eu-west-1'
-          AWS_ACCESS_KEY_ID: ${{ secrets.APIREF_AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.APIREF_AWS_SECRET_ACCESS_KEY }}
+        run: |
+          aws cloudfront create-invalidation \
+            --distribution-id "${{ vars.APIREF_DISTRIBUTION_ID }}" \
+            --paths "/${{ github.ref_name }}/*"
 
       - uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # v3.0.0
         with:

.github/workflows/backward-compatibility.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   push:
     branches:
-      - "2.1.x"
+      - "2.2.x"
     paths:
       - 'src/**'
       - '.github/workflows/backward-compatibility.yml'

.github/workflows/bench.yml

@@ -8,7 +8,7 @@ on:
       - 'tests/bench/**'
   push:
     branches:
-      - "2.1.x"
+      - "2.2.x"
     paths:
       - 'src/**'
       - '.github/workflows/bench.yml'

.github/workflows/build-issue-bot.yml

@@ -9,7 +9,7 @@ on:
       - '.github/workflows/build-issue-bot.yml'
   push:
     branches:
-      - "2.1.x"
+      - "2.2.x"
     paths:
       - 'issue-bot/**'
       - '.github/workflows/build-issue-bot.yml'

.github/workflows/changelog-generator.yml

@@ -9,7 +9,7 @@ on:
       - '.github/workflows/changelog-generator.yml'
   push:
     branches:
-      - "2.1.x"
+      - "2.2.x"
     paths:
       - 'changelog-generator/**'
       - '.github/workflows/changelog-generator.yml'

.github/workflows/claude-update-config-parameters-docs-on-change.yml

@@ -0,0 +1,26 @@
+name: "Claude Update Config Parameters Docs On Change"
+
+on:
+  push:
+    branches:
+      - "2.2.x"
+    paths:
+      - '.github/workflows/claude-update-config-parameters-docs-on-change.yml'
+      - 'conf/parametersSchema.neon'
+
+jobs:
+  fix:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      actions: write
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
+        with:
+          egress-policy: audit
+
+      - name: Trigger Claude Update Config Parameters Docs
+        env:
+          GH_TOKEN: ${{ secrets.PHPSTAN_BOT_TOKEN }}
+        run: gh workflow run claude-update-config-parameters-docs.yml --repo phpstan-bot/phpstan-src

.github/workflows/claude-update-phpdoc-tags-docs-on-change.yml

@@ -0,0 +1,26 @@
+name: "Claude Update PHPDoc Tags Docs On Change"
+
+on:
+  push:
+    branches:
+      - "2.2.x"
+    paths:
+      - '.github/workflows/claude-update-phpdoc-tags-docs-on-change.yml'
+      - 'src/PhpDoc/PhpDocNodeResolver.php'
+
+jobs:
+  fix:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      actions: write
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
+        with:
+          egress-policy: audit
+
+      - name: Trigger Claude Update PHPDoc Tags Docs
+        env:
+          GH_TOKEN: ${{ secrets.PHPSTAN_BOT_TOKEN }}
+        run: gh workflow run claude-update-phpdoc-tags-docs.yml --repo phpstan-bot/phpstan-src

.github/workflows/claude-update-phpdoc-types-docs-on-change.yml

@@ -0,0 +1,26 @@
+name: "Claude Update PHPDoc Types Docs On Change"
+
+on:
+  push:
+    branches:
+      - "2.2.x"
+    paths:
+      - '.github/workflows/claude-update-phpdoc-types-docs-on-change.yml'
+      - 'src/PhpDoc/TypeNodeResolver.php'
+
+jobs:
+  fix:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      actions: write
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
+        with:
+          egress-policy: audit
+
+      - name: Trigger Claude Update PHPDoc Types Docs
+        env:
+          GH_TOKEN: ${{ secrets.PHPSTAN_BOT_TOKEN }}
+        run: gh workflow run claude-update-phpdoc-types-docs.yml --repo phpstan-bot/phpstan-src

.github/workflows/e2e-tests.yml

@@ -11,7 +11,7 @@ on:
       - 'issue-bot/**'
   push:
     branches:
-      - "2.1.x"
+      - "2.2.x"
     paths-ignore:
       - 'compiler/**'
       - 'apigen/**'
@@ -291,6 +291,12 @@ jobs:
               cd e2e/bug-11857
               composer install
               ../../bin/phpstan
+          - script: |
+              cd e2e/in-trait
+              OUTPUT=$(../bashunit -a exit_code "1" "../../bin/phpstan --error-format=raw")
+              ../bashunit -a contains 'FooTrait.php:10:Strict comparison using === between int<0, max> and false will always evaluate to false.' "$OUTPUT"
+              ../bashunit -a contains 'FooTrait.php (in context of class E2EInTrait\Bar):18:Strict comparison using === between E2EInTrait\Bar and null will always evaluate to false.' "$OUTPUT"
+              ../bashunit -a contains 'FooTrait.php (in context of class E2EInTrait\Foo):18:Strict comparison using === between E2EInTrait\Foo and null will always evaluate to false.' "$OUTPUT"
           - script: |
               cd e2e/result-cache-meta-extension
               composer install

.github/workflows/lint-workflows.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   push:
     branches:
-      - "2.1.x"
+      - "2.2.x"
 
 permissions: {}
 

.github/workflows/lint.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   push:
     branches:
-      - "2.1.x"
+      - "2.2.x"
 
 concurrency:
   group: lint-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches