Merge pull request #525 from web-auth/temp-gergji

Merge up 4.7.x to 4.8.x
web-auth · Nov 17, 2023 · ed683a4 · ed683a4
2 parents 58b0ae8 + 6a4dcc3
commit ed683a4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml
@@ -88,12 +88,6 @@ jobs:
       - name: "Fix code coverage paths"
         run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' coverage.xml
 
-      - name: "SonarCloud Scan"
-        uses: "sonarsource/sonarcloud-github-action@master"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-
   js_tests:
     name: "2️⃣ JS tests"
     needs:
@@ -193,6 +187,12 @@ jobs:
         run: |
           vendor/bin/deptrac analyse --fail-on-uncovered --no-cache
 
+      - name: "SonarCloud Scan"
+        uses: "sonarsource/sonarcloud-github-action@master"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+
   mutation_testing:
     name: "5️⃣ Mutation Testing"
     needs:

diff --git a/src/webauthn/src/AuthenticatorSelectionCriteria.php b/src/webauthn/src/AuthenticatorSelectionCriteria.php
@@ -77,7 +77,8 @@ public function __construct(
         );
 
         $this->requireResidentKey = $requireResidentKey ?? $residentKey === self::RESIDENT_KEY_REQUIREMENT_REQUIRED;
-        $this->residentKey = $residentKey !== null ? $this->residentKey : ($requireResidentKey === true ? self::RESIDENT_KEY_REQUIREMENT_REQUIRED : self::RESIDENT_KEY_REQUIREMENT_PREFERRED);
+        $requireResidentKey = $requireResidentKey === true ? self::RESIDENT_KEY_REQUIREMENT_REQUIRED : self::RESIDENT_KEY_REQUIREMENT_PREFERRED;
+        $this->residentKey = $residentKey ?? $requireResidentKey;
     }
 
     public static function create(