Merge pull request #76 from grueneschweiz/laravel-10

Laravel 10

.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

.env.ci

@@ -7,7 +7,7 @@ APP_URL=http://localhost
 ADMIN_EMAIL=asdf@asdf.asdf
 CONFIG_BASE_PATH=config
 
-LOG_CHANNEL=null
+LOG_CHANNEL=single
 
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1

.github/workflows/tests.yml

@@ -12,28 +12,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: |
@@ -42,13 +42,13 @@ 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: run tests
         env:
           MAILCHIMP_APIKEY: ${{ secrets.MAILCHIMP_APIKEY }}
         run: >-
-          docker-compose 
+          docker compose 
           run 
           -u root:root
           -e MAILCHIMP_APIKEY=${MAILCHIMP_APIKEY}
@@ -61,14 +61,14 @@ jobs:
 
       - name: Show logs if tests failed
         if: ${{ failure() }}
-        run: cat storage/logs/laravel-*.log
+        run: cat storage/logs/laravel*.log
 
       - name: publish coverage report
         if: ${{ success() }}
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: >-
-          docker-compose 
+          docker compose 
           run
           -u root:root
           -e GITHUB_REF=${GITHUB_REF} 

app/Http/Kernel.php

@@ -50,7 +50,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,

app/Http/MailChimpClient.php

@@ -76,7 +76,7 @@ public function getSubscriber(string $email)
     {
         $id = self::calculateSubscriberId($email);
 
-        $get = $this->client->get("lists/{$this->listId}/members/$id");
+        $get = $this->client->get("lists/{$this->listId}/members/$id", [], 30);
         $this->validateResponseStatus('GET subscriber', $get);
         $this->validateResponseContent('GET subscriber', $get);
 

app/Providers/AuthServiceProvider.php

@@ -22,8 +22,6 @@ class AuthServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->registerPolicies();
-
         //
     }
 }

composer.json

@@ -13,14 +13,14 @@
     "ext-json": "*",
     "drewm/mailchimp-api": "^2.5",
     "guzzlehttp/guzzle": "^7.0.1",
-    "laravel/framework": "^9.0",
+    "laravel/framework": "^10.0",
     "symfony/yaml": "^5.2"
   },
   "require-dev": {
     "filp/whoops": "^2.5",
     "mockery/mockery": "^1.2",
-    "nunomaduro/collision": "^6.1",
-    "phpunit/phpunit": "^9.0"
+    "nunomaduro/collision": "^7.0",
+    "phpunit/phpunit": "^10.0"
   },
   "autoload": {
     "psr-4": {
@@ -57,6 +57,6 @@
     "sort-packages": true,
     "optimize-autoloader": true
   },
-  "minimum-stability": "dev",
+  "minimum-stability": "stable",
   "prefer-stable": true
 }