Merge pull request #107 from krekas/laravel10

Upgrade to Laravel 10

.github/workflows/laravel.yml

@@ -2,34 +2,33 @@ name: Laravel
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
   laravel-tests:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: shivammathur/setup-php@15c43e89cdef867065b0213be354c2841860869e
+      - uses: shivammathur/setup-php@15c43e89cdef867065b0213be354c2841860869e
-      with:
+        with:
-        php-version: '8.0'
+          php-version: "8.1"
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
-    - name: Copy .env
+      - name: Copy .env
-      run: php -r "file_exists('.env') || copy('.env.example', '.env');"
+        run: php -r "file_exists('.env') || copy('.env.example', '.env');"
-    - name: Install Dependencies
+      - name: Install Dependencies
-      run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+        run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
-    - name: Generate key
+      - name: Generate key
-      run: php artisan key:generate
+        run: php artisan key:generate
-    - name: Directory Permissions
+      - name: Directory Permissions
-      run: chmod -R 777 storage bootstrap/cache
+        run: chmod -R 777 storage bootstrap/cache
-    - name: Create Database
+      - name: Create Database
-      run: |
+        run: |
-        mkdir -p database
+          mkdir -p database
-        touch database/database.sqlite
+          touch database/database.sqlite
-    - name: Execute tests (Unit and Feature tests) via PHPUnit
+      - name: Execute tests (Unit and Feature tests) via PHPUnit
-      env:
+        env:
-        DB_CONNECTION: sqlite
+          DB_CONNECTION: sqlite
-        DB_DATABASE: database/database.sqlite
+          DB_DATABASE: database/database.sqlite
-      run: vendor/bin/phpunit
+        run: vendor/bin/phpunit

app/Http/Kernel.php

@@ -16,7 +16,6 @@ class Kernel extends HttpKernel
     protected $middleware = [
         // \App\Http\Middleware\TrustHosts::class,
         \App\Http\Middleware\TrustProxies::class,
-        \Fruitcake\Cors\HandleCors::class,
         \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,

composer.json

@@ -5,22 +5,20 @@
     "keywords": ["framework", "laravel"],
     "license": "MIT",
     "require": {
-        "php": "^7.3|^8.0",
+        "php": "^8.1",
-        "fruitcake/laravel-cors": "^2.0",
+        "guzzlehttp/guzzle": "^7.2",
-        "guzzlehttp/guzzle": "^7.0.1",
+        "laravel/framework": "^10.0",
-        "intervention/image": "^2.7",
+        "laravel/sanctum": "^3.2",
-        "laravel/framework": "^8.65",
+        "laravel/tinker": "^2.8"
-        "laravel/sanctum": "^2.11",
-        "laravel/tinker": "^2.5",
-        "spatie/laravel-medialibrary": "^9.9"
     },
     "require-dev": {
-        "facade/ignition": "^2.5",
         "fakerphp/faker": "^1.9.1",
-        "laravel/sail": "^1.0.1",
+        "laravel/pint": "^1.0",
+        "laravel/sail": "^1.18",
         "mockery/mockery": "^1.4.4",
-        "nunomaduro/collision": "^5.10",
+        "nunomaduro/collision": "^7.0",
-        "phpunit/phpunit": "^9.5.10"
+        "phpunit/phpunit": "^10.0",
+        "spatie/laravel-ignition": "^2.0"
     },
     "autoload": {
         "psr-4": {