Merge pull request #135 from Hi-Folks/features/134-laravel9

Upgrade to Laravel 9, Tailwindcss 3 and DaisyUI 2

.github/workflows/auto-generated-workflow.yml

@@ -30,7 +30,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: [ '7.4','8.0', '8.1' ]
+        php-versions: [ '8.0', '8.1' ]
         dependency-stability: [ 'prefer-stable' ]
 
     name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}

.github/workflows/check-php81.yml

@@ -101,6 +101,4 @@ jobs:
         run: |
           vendor/bin/phpcs --standard=PSR12 app
 
-      - name: Execute Code Static Analysis (PSALM)
-        run: |
-          vendor/bin/psalm
+

.github/workflows/codequality-wildcardbranch.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: [ '8.1', '8.0','7.4' ]
+        php-versions: [ '8.1', '8.0' ]
         dependency-stability: [ prefer-stable ]
 
     name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}

.github/workflows/psalm-sarif.yml

@@ -4,8 +4,7 @@ name: Code Scanning - GitHub integration
 on:
   push:
     branches:
-      - main
-      - develop
+      - tests/**
 
 jobs:
   laravel-tests:
@@ -14,7 +13,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: [ '8.0','7.4' ]
+        php-versions: [ '8.0' ]
         dependency-stability: [ prefer-stable ]
 
     name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}

.github/workflows/schedule-psalm.yaml

@@ -4,9 +4,7 @@ name: Scheduled Psalm and security
 on:
   push:
     branches:
-      - main
-      - develop
-      - features/**
+      - tests/**
 
 jobs:
   laravel-tests:

.github/workflows/test-codequality-phpversions.yml

@@ -31,7 +31,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: [ '8.0','7.4' ]
+        php-versions: [ '8.1', '8.0' ]
         dependency-stability: [ prefer-stable ]
 
     name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}

.github/workflows/test-dependency-stability.yml

@@ -31,7 +31,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: [ '8.0','7.4' ]
+        php-versions: [ '8.1', '8.0' ]
         dependency-stability: [ 'prefer-none','prefer-stable','prefer-lowest' ]
 
     name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}

.github/workflows/test.yml

@@ -31,7 +31,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: [ '8.0','7.4' ]
+        php-versions: [ '8.0' ]
         dependency-stability: [ prefer-stable ]
 
     name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.6.0 - WIP
+- upgrade to Laravel 9 framework
+
 ## 0.5.2 - 2022-04-12
 - added laravel 9 mapping for testbench, thanks to @dkemper
 - improve dark/light mode

Makefile

@@ -23,7 +23,7 @@ phpfix: ## Fix some warnings from phpcs
 	vendor/bin/phpcbf --standard=PSR12  app
 	git commit -m "Auto Fix PSR12 Style" .
 
-allcheck: phpcs phpstan psalm test ## it performs all check (phpcs, phpstan, tests)
+allcheck: phpcs phpstan test ## it performs all check (phpcs, phpstan, tests)
 
 push: allcheck ## It performs all check and then git push on the current branch
 	git push origin HEAD

app/Http/Middleware/TrustProxies.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Middleware;
 
-use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 use Illuminate\Http\Request;
 
 class TrustProxies extends Middleware
@@ -19,5 +19,10 @@ class TrustProxies extends Middleware
      *
      * @var int
      */
-    protected $headers = Request::HEADER_X_FORWARDED_ALL;
+    protected $headers =
+        Request::HEADER_X_FORWARDED_FOR |
+        Request::HEADER_X_FORWARDED_HOST |
+        Request::HEADER_X_FORWARDED_PORT |
+        Request::HEADER_X_FORWARDED_PROTO |
+        Request::HEADER_X_FORWARDED_AWS_ELB;
 }

app/Models/Configuration.php

@@ -10,7 +10,7 @@ class Configuration extends Model
     use HasFactory;
 
     /**
-     * @var string[]
+     * @var array<string, string>
      */
     protected $casts = [
         'configuration' => 'object',

app/Models/User.php

@@ -26,7 +26,7 @@ class User extends Authenticatable
     /**
      * The attributes that should be hidden for arrays.
      *
-     * @var array<string>
+     * @var array<int, string>
      */
     protected $hidden = [
         'password',

app/Objects/ReportExecution.php

@@ -7,7 +7,11 @@
 
 class ReportExecution
 {
+    /**
+     * @var Collection<string, mixed>
+     */
     private Collection $result;
+
     private int $idx = -1;
 
     public const LINE_TYPE_ERROR   = 'error';

app/Providers/AuthServiceProvider.php

@@ -10,7 +10,7 @@ class AuthServiceProvider extends ServiceProvider
     /**
      * The policy mappings for the application.
      *
-     * @var array<string, string>
+     * @var array<class-string, class-string>
      */
     protected $policies = [
         // 'App\Models\Model' => 'App\Policies\ModelPolicy',