Fix linter warnings

auth0 · Jan 9, 2024 · ba56f67 · ba56f67
1 parent 2821db4
commit ba56f67
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 41 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -35,7 +35,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.merge_commit_sha || github.ref }}
+          ref: ${{ github.event.pull_request.head.sha || github.sha || github.ref }}
 
       - id: set-matrix
         run: echo "matrix=$(jq -c . < ./.github/workflows/matrix.json)" >> $GITHUB_OUTPUT
@@ -52,7 +52,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.merge_commit_sha || github.ref }}
+          ref: ${{ github.event.pull_request.head.sha || github.sha || github.ref }}
 
       - uses: ./.github/actions/setup
         with:
@@ -70,7 +70,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.merge_commit_sha || github.ref }}
+          ref: ${{ github.event.pull_request.head.sha || github.sha || github.ref }}
 
       - uses: ./.github/actions/setup
         with:
@@ -86,47 +86,45 @@ jobs:
       #     directory: ./coverage/
       #     flags: unittestsvalidate
 
-  # TODO: Fix PHPStan tests
-  # phpstan:
-  #   name: PHPStan
-  #   needs: [configure, prepare]
-  #   runs-on: ubuntu-latest
+  phpstan:
+    name: PHPStan
+    needs: [configure, prepare]
+    runs-on: ubuntu-latest
 
-  #   strategy:
-  #     fail-fast: false
-  #     matrix: ${{ fromJson(needs.configure.outputs.matrix) }}
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.configure.outputs.matrix) }}
 
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #       with:
-  #         ref: ${{ github.event.pull_request.merge_commit_sha || github.ref }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha || github.ref }}
 
-  #     - uses: ./.github/actions/setup
-  #       with:
-  #         php: ${{ matrix.php }}
+      - uses: ./.github/actions/setup
+        with:
+          php: ${{ matrix.php }}
 
-  #     - run: composer phpstan
+      - run: composer phpstan
 
-  # TODO: Fix Psalm tests
-  # psalm:
-  #   name: Psalm
-  #   needs: [configure, prepare]
-  #   runs-on: ubuntu-latest
+  psalm:
+    name: Psalm
+    needs: [configure, prepare]
+    runs-on: ubuntu-latest
 
-  #   strategy:
-  #     fail-fast: false
-  #     matrix: ${{ fromJson(needs.configure.outputs.matrix) }}
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.configure.outputs.matrix) }}
 
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #       with:
-  #         ref: ${{ github.event.pull_request.merge_commit_sha || github.ref }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha || github.ref }}
 
-  #     - uses: ./.github/actions/setup
-  #       with:
-  #         php: ${{ matrix.php }}
+      - uses: ./.github/actions/setup
+        with:
+          php: ${{ matrix.php }}
 
-  #     - run: composer psalm
+      - run: composer psalm
 
   rector:
     name: Rector
@@ -136,7 +134,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.merge_commit_sha || github.ref }}
+          ref: ${{ github.event.pull_request.head.sha || github.sha || github.ref }}
 
       - uses: ./.github/actions/setup
         with:
@@ -152,7 +150,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.merge_commit_sha || github.ref }}
+          ref: ${{ github.event.pull_request.head.sha || github.sha || github.ref }}
 
       - uses: ./.github/actions/setup
         with:
@@ -168,7 +166,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.merge_commit_sha || github.ref }}
+          ref: ${{ github.event.pull_request.head.sha || github.sha || github.ref }}
 
       - uses: ./.github/actions/setup
         with:
@@ -184,7 +182,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.merge_commit_sha || github.ref }}
+          ref: ${{ github.event.pull_request.head.sha || github.sha || github.ref }}
 
       - uses: ./.github/actions/setup
         with:

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -20,6 +20,7 @@ parameters:
         - '#Casting to string something that(.*) already string.#'
         - '#\$object_or_class of function method_exists expects object\|string, (.*) given.#'
         - '#Property (.*) is never read, only written.#'
+        - '#Constructor of class (.*) has an unused parameter (.*).#'
         - '#Call to function is_string\(\) with string will always evaluate to true.$#'
         -
             message: '#Parameter \#3 \$(.*) of function openssl_verify expects (.*), (.*) given.#'

diff --git a/src/Controllers/AuthenticationController.php b/src/Controllers/AuthenticationController.php
@@ -24,7 +24,7 @@ public function __construct(
         private RouterInterface $router,
         ContainerInterface $container,
     ) {
-        $this->setContainer($container);
+        $this->container = $container;
     }
 
     /**

diff --git a/src/Controllers/BackchannelLogoutController.php b/src/Controllers/BackchannelLogoutController.php
@@ -18,8 +18,9 @@ final class BackchannelLogoutController extends AbstractController implements Au
 {
     public function __construct(
         private Authenticator $authenticator,
-        protected ContainerInterface $container,
+        ContainerInterface $container,
     ) {
+        $this->container = $container;
     }
 
     /**