Merge pull request #89 from grueneschweiz/laravel-10

Laravel 10
grueneschweiz · Mar 19, 2024 · 452521b · 452521b
2 parents 810bbd6 + 3d17150
commit 452521b
Show file tree

Hide file tree

Showing 8 changed files with 790 additions and 859 deletions.
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1-apache
+FROM php:8.2-apache
 
 # update the repository sources list
 # and install basic dependencies
@@ -44,4 +44,4 @@ WORKDIR $APP_HOME
 RUN chown -R www-data:www-data $APP_HOME
 
 # run as www-data
-USER www-data:www-data
+USER www-data:www-data
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -16,28 +16,28 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: pull docker containers
-        run: docker-compose pull mysql
+        run: docker compose pull mysql
 
       - uses: satackey/action-docker-layer-caching@v0.0.11
         continue-on-error: true
 
       - name: build docker container
-        run: docker-compose build
+        run: docker compose build
 
       - name: PHP dependencies
-        run: docker-compose run -u root:root app composer install
+        run: docker compose run -u root:root app composer install
 
       - name: env
         run: cp .env.ci .env
 
       - name: laravel key
-        run: docker-compose run -u root:root app php artisan key:generate
+        run: docker compose run -u root:root app php artisan key:generate
 
       - name: start containers
-        run: docker-compose up -d mysql
+        run: docker compose up -d mysql
 
       - name: wait for mysql
         run: |
@@ -46,18 +46,18 @@ jobs:
           done
 
       - name: run migrations
-        run: docker-compose run -u root:root app php artisan migrate
+        run: docker compose run -u root:root app php artisan migrate
 
       - name: install passport
-        run: docker-compose run -u root:root app php artisan passport:install
+        run: docker compose run -u root:root app php artisan passport:install
 
       - name: run tests
         env:
           WEBLING_API_KEY: ${{ secrets.WEBLING_API_KEY }}
           WEBLING_FINANCE_ADMIN_API_KEY: ${{ secrets.WEBLING_FINANCE_ADMIN_API_KEY }}
           WEBLING_BASE_URL: ${{ secrets.WEBLING_BASE_URL }}
         run: >-
-          docker-compose 
+          docker compose 
           run 
           -u root:root
           -e WEBLING_API_KEY=${WEBLING_API_KEY} 

diff --git a/.gitignore b/.gitignore
@@ -26,4 +26,5 @@ Thumbs.db
 .project
 .buildpath
 /.settings
-/build
+/build
+.phpunit.cache
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -54,7 +54,7 @@ class Kernel extends HttpKernel
      *
      * @var array
      */
-    protected $routeMiddleware = [
+    protected $middlewareAliases = [
         'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,

diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
@@ -23,8 +23,6 @@ class AuthServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->registerPolicies();
-
-        Passport::routes();
+        //
     }
 }
diff --git a/composer.json b/composer.json
@@ -5,19 +5,19 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ext-json": "*",
-        "doctrine/dbal": "3.*",
-        "laravel/framework": "^9.0",
-        "laravel/passport": "^v10.0.0",
-        "symfony/yaml": "^6.1",
+        "doctrine/dbal": "^3.0",
+        "laravel/framework": "^10.0",
+        "laravel/passport": "^11.0",
+        "symfony/yaml": "^7.0",
         "usystems/webling-api-php": "^1.2"
     },
     "require-dev": {
         "filp/whoops": "^2.0",
         "mockery/mockery": "^1.0",
-        "nunomaduro/collision": "^6.1",
-        "phpunit/phpunit": "^9.0"
+        "nunomaduro/collision": "^7.0",
+        "phpunit/phpunit": "^10.0"
     },
     "autoload": {
         "psr-4": {
@@ -54,6 +54,6 @@
         "sort-packages": true,
         "optimize-autoloader": true
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "prefer-stable": true
 }