[9.x] WIP: Add PHPSTAN workflow

.github/workflows/tests.yml → .github/workflows/continuous-integration.yml

@@ -1,4 +1,4 @@
-name: tests
+name: "Continuous Integration"
 
 on:
   push:
@@ -7,7 +7,7 @@ on:
     - cron: '0 0 * * *'
 
 jobs:
-  tests:
+  phpunit:
 
     runs-on: ubuntu-latest
     services:
@@ -19,8 +19,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.0, 8.1]
-        stability: [prefer-stable]
+        php: [ 8.0, 8.1 ]
+        stability: [ prefer-stable ]
 
     name: PHP ${{ matrix.php }} - STABILITY ${{ matrix.stability }}
 

.github/workflows/static-analysis.yml

@@ -0,0 +1,54 @@
+name: "Static Analysis"
+
+on:
+  push:
+    paths:
+      - .github/workflows/static-analysis.yml
+      - composer.*
+      - phpstan.neon.dist
+      - src/**
+      - tests/**
+
+  pull_request:
+    paths:
+      - .github/workflows/static-analysis.yml
+      - composer.*
+      - phpstan.neon.dist
+      - src/**
+      - tests/**
+
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  static-analysis-phpstan:
+
+    name: "Static Analysis with PHPStan"
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [8.1]
+        stability: [prefer-stable]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          tools: composer:v2
+          coverage: none
+
+      - name: Install dependencies
+        uses: nick-invision/retry@v1
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: COMPOSER_ROOT_VERSION=dev-master composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
+
+      - name: "Run a static analysis with phpstan/phpstan"
+        run: "vendor/bin/phpstan --error-format=checkstyle"

composer.json

@@ -22,6 +22,7 @@
     "require-dev": {
         "doctrine/dbal": "^3.3",
         "mockery/mockery": "^1.4.4",
+        "nunomaduro/larastan": "^2.1",
         "orchestra/testbench": "^7.0",
         "phpunit/phpunit": "^9.5.8"
     },

phpstan.neon.dist

@@ -0,0 +1,17 @@
+includes:
+    - ./vendor/nunomaduro/larastan/extension.neon
+
+parameters:
+
+    paths:
+        - src
+
+    level: max
+
+    ignoreErrors:
+        - '#Unsafe usage of new static\(\).#'
+
+    excludePaths:
+        - src/helper.php
+
+    checkMissingIterableValueType: false

src/Oci8/Auth/OracleUserProvider.php

@@ -3,6 +3,7 @@
 namespace Yajra\Oci8\Auth;
 
 use Illuminate\Auth\EloquentUserProvider;
+use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Support\Str;
 
 class OracleUserProvider extends EloquentUserProvider
@@ -13,10 +14,10 @@ class OracleUserProvider extends EloquentUserProvider
      * @param  array  $credentials
      * @return \Illuminate\Contracts\Auth\Authenticatable|null
      */
-    public function retrieveByCredentials(array $credentials)
+    public function retrieveByCredentials(array $credentials): ?Authenticatable
     {
         if (empty($credentials)) {
-            return;
+            return null;
         }
 
         // First we will add each credential element to the query as a where clause.
@@ -26,10 +27,16 @@ public function retrieveByCredentials(array $credentials)
 
         foreach ($credentials as $key => $value) {
             if (! Str::contains($key, 'password')) {
-                $query->whereRaw("upper({$key}) = upper(?)", [$value]);
+                $query->whereRaw("upper($key) = upper(?)", [$value]);
             }
         }
 
-        return $query->first();
+        $model = $query->first();
+
+        if (! $model instanceof Authenticatable) {
+            return null;
+        }
+
+        return $model;
     }
 }