From 112e94561b1df90985493f8e0e65630bd70b8575 Mon Sep 17 00:00:00 2001
From: Nuno Maduro <enunomaduro@gmail.com>
Date: Thu, 23 Feb 2023 08:21:11 +0000
Subject: [PATCH] Adds type checking (#1640)

---
 .gitattributes                        |  1 +
 .github/workflows/static-analysis.yml | 41 +++++++++++++++++++++++++++
 composer.json                         |  1 +
 phpstan.neon.dist                     | 11 +++++++
 src/Guards/TokenGuard.php             |  2 +-
 5 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/static-analysis.yml
 create mode 100644 phpstan.neon.dist

diff --git a/.gitattributes b/.gitattributes
index efd7a3a8e..6c56d0f01 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -14,5 +14,6 @@
 .gitignore export-ignore
 .styleci.yml export-ignore
 CHANGELOG.md export-ignore
+phpstan.neon.dist export-ignore
 phpunit.xml.dist export-ignore
 UPGRADE.md
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
new file mode 100644
index 000000000..453d8a6a0
--- /dev/null
+++ b/.github/workflows/static-analysis.yml
@@ -0,0 +1,41 @@
+name: static analysis
+
+on:
+  push:
+    branches:
+      - master
+      - '*.x'
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  tests:
+    runs-on: ubuntu-22.04
+
+    strategy:
+      fail-fast: true
+
+    name: Static Analysis
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.2
+          tools: composer:v2
+          coverage: none
+
+      - name: Install dependencies
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress
+
+      - name: Execute type checking
+        run: vendor/bin/phpstan
diff --git a/composer.json b/composer.json
index 364339a7f..d7b2f0f83 100644
--- a/composer.json
+++ b/composer.json
@@ -35,6 +35,7 @@
     "require-dev": {
         "mockery/mockery": "^1.0",
         "orchestra/testbench": "^7.0|^8.0",
+        "phpstan/phpstan": "^1.10",
         "phpunit/phpunit": "^9.3"
     },
     "autoload": {
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
new file mode 100644
index 000000000..649776a4c
--- /dev/null
+++ b/phpstan.neon.dist
@@ -0,0 +1,11 @@
+parameters:
+  paths:
+    - config
+    - database
+    - routes
+    - src
+
+  level: 0
+
+  ignoreErrors:
+    - "#Unsafe usage of new static\\(\\)#"
diff --git a/src/Guards/TokenGuard.php b/src/Guards/TokenGuard.php
index 6798ca393..fe067e800 100644
--- a/src/Guards/TokenGuard.php
+++ b/src/Guards/TokenGuard.php
@@ -214,7 +214,7 @@ protected function authenticateViaBearerToken($request)
      * Authenticate and get the incoming PSR-7 request via the Bearer token.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Psr\Http\Message\ServerRequestInterface
+     * @return \Psr\Http\Message\ServerRequestInterface|null
      */
     protected function getPsrRequestViaBearerToken($request)
     {