Add Laravel 11 support (#258)

.docker/php/Dockerfile → .docker/php/php81/Dockerfile

@@ -1,7 +1,10 @@
 # ----------------------
 # The FPM base container
 # ----------------------
-FROM php:8.1-fpm-alpine AS dev
+FROM php:8.1-cli-alpine AS dev
+
+RUN apk add --no-cache --virtual .build-deps \
+    $PHPIZE_DEPS
 
 # Cleanup apk cache and temp files
 RUN rm -rf /var/cache/apk/* /tmp/*

.docker/php/php82/Dockerfile

@@ -0,0 +1,22 @@
+# ----------------------
+# The FPM base container
+# ----------------------
+FROM php:8.2-cli-alpine AS dev
+
+RUN apk add --no-cache --virtual .build-deps \
+    $PHPIZE_DEPS
+
+# Cleanup apk cache and temp files
+RUN rm -rf /var/cache/apk/* /tmp/*
+
+# ----------------------
+# Composer install step
+# ----------------------
+
+# Get latest Composer
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+
+# ----------------------
+# The FPM production container
+# ----------------------
+FROM dev

.docker/php/php83/Dockerfile

@@ -0,0 +1,22 @@
+# ----------------------
+# The FPM base container
+# ----------------------
+FROM php:8.3-cli-alpine AS dev
+
+RUN apk add --no-cache --virtual .build-deps \
+    $PHPIZE_DEPS
+
+# Cleanup apk cache and temp files
+RUN rm -rf /var/cache/apk/* /tmp/*
+
+# ----------------------
+# Composer install step
+# ----------------------
+
+# Get latest Composer
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+
+# ----------------------
+# The FPM production container
+# ----------------------
+FROM dev

.github/workflows/tests.yml

@@ -1,27 +1,38 @@
 name: tests
 
-on: [ push, pull_request ]
+on:
+  - push
+  - pull_request
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
+
     strategy:
       fail-fast: true
       matrix:
-        os: [ ubuntu-latest ]
-        php: [ 8.0, 8.1, 8.2 ]
-        laravel: [ 9.*, 10.* ]
-        dependency-version: [ prefer-lowest, prefer-stable ]
+        os: [ubuntu-latest]
+        php: [8.0, 8.1, 8.2, 8.3]
+        laravel: ['9.*', '10.*', '11.*']
+        dependency-version: [prefer-lowest, prefer-stable]
         exclude:
           - laravel: 9.*
             php: 8.2
+          - laravel: 9.*
+            php: 8.3
           - laravel: 10.*
             php: 8.0
+          - laravel: 11.*
+            php: 8.0
+          - laravel: 11.*
+            php: 8.1
         include:
           - laravel: 9.*
             testbench: 7.*
           - laravel: 10.*
             testbench: 8.*
+          - laravel: 11.*
+            testbench: 9.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 

CHANGELOG.md

@@ -6,6 +6,7 @@ All notable changes to `laravel-love` will be documented in this file.
 
 ### Added
 
+- ([#258]) Added Laravel 11 support
 - ([#240]) Added `getReactionsBy` method to Reacter Facade
 - ([#240]) Added `getReactionsBy` method to Reacter Model
 
@@ -593,6 +594,7 @@ Follow [upgrade instructions](UPGRADING.md#from-v5-to-v6) to migrate database to
 [1.1.1]: https://github.com/cybercog/laravel-love/compare/1.1.0...1.1.1
 [1.1.0]: https://github.com/cybercog/laravel-love/compare/1.0.0...1.1.0
 
+[#258]: https://github.com/cybercog/laravel-love/pull/258
 [#252]: https://github.com/cybercog/laravel-love/pull/252
 [#248]: https://github.com/cybercog/laravel-love/pull/248
 [#247]: https://github.com/cybercog/laravel-love/pull/247

composer.json

@@ -47,14 +47,14 @@
     },
     "require": {
         "php": "^8.0",
-        "illuminate/database": "^9.0|^10.1.3",
-        "illuminate/support": "^9.0|^10.1.3"
+        "illuminate/database": "^9.0|^10.1.3|^11.0",
+        "illuminate/support": "^9.0|^10.1.3|^11.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
-        "orchestra/testbench": "^7.0|^8.0",
+        "orchestra/testbench": "^7.0|^8.0|^9.0",
         "phpstan/phpstan": "^1.9",
-        "phpunit/phpunit": "^9.6"
+        "phpunit/phpunit": "^9.6|^10.5"
     },
     "autoload": {
         "psr-4": {
@@ -84,5 +84,5 @@
         }
     },
     "minimum-stability": "dev",
-    "prefer-stable" : true
+    "prefer-stable": true
 }

docker-compose.yaml

@@ -1,35 +1,34 @@
 version: "3.9"
 services:
-  app:
-    container_name: laravel-love-app
-    image: laravel-love-app
+  php81:
+    container_name: laravel-love-lib-81
+    image: laravel-love-lib-81
     build:
       context: ./
-      dockerfile: ./.docker/php/Dockerfile
-    restart: unless-stopped
+      dockerfile: ./.docker/php/php81/Dockerfile
+    tty: true
     working_dir: /app
     volumes:
       - ./:/app
-      - ./.docker/php/www.conf:/usr/local/etc/php-fpm.d/www.conf:ro
-    networks:
-      - laravel-love
 
-  nginx:
-    container_name: laravel-love-nginx
-    image: nginx:1.21-alpine
-    restart: unless-stopped
-    depends_on:
-      - app
-    ports:
-      - "80:80"
-    environment:
-      VIRTUAL_HOST: app.laravel-love.localhost
+  php82:
+    container_name: laravel-love-lib-82
+    image: laravel-love-lib-82
+    build:
+      context: ./
+      dockerfile: ./.docker/php/php82/Dockerfile
+    tty: true
+    working_dir: /app
     volumes:
-      - ./.docker/nginx/app.laravel-love.80.conf:/etc/nginx/conf.d/app.laravel-love.80.conf:ro
-      - ./public:/app/public:ro
-    networks:
-      - laravel-love
+      - ./:/app
 
-networks:
-  laravel-love:
-    driver: bridge
+  php83:
+    container_name: laravel-love-lib-83
+    image: laravel-love-lib-83
+    build:
+      context: ./
+      dockerfile: ./.docker/php/php83/Dockerfile
+    tty: true
+    working_dir: /app
+    volumes:
+      - ./:/app

phpunit.xml.dist

@@ -12,7 +12,7 @@
         >
     <testsuites>
         <testsuite name="Package Test Suite">
-            <directory suffix=".php">tests/</directory>
+            <directory suffix=".php">tests/Unit/</directory>
         </testsuite>
     </testsuites>
     <php>