Drop PHP 7.4 support, add PHP 8.5 support, drop Laravel < 11 support

.docker/php74/Dockerfile → .docker/php85/Dockerfile

@@ -1,7 +1,7 @@
 # ----------------------
 # The FPM base container
 # ----------------------
-FROM php:7.4-cli-alpine AS dev
+FROM php:8.5-cli-alpine AS dev
 
 RUN apk add --no-cache --virtual .build-deps \
     $PHPIZE_DEPS

.github/workflows/tests.yaml

@@ -12,18 +12,10 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [8.0, 8.1, 8.2, 8.3, 8.4]
-        laravel: ['9.*', '10.*', '11.*', '12.*']
+        php: [8.2, 8.3, 8.4, 8.5]
+        laravel: ['11.*', '12.*']
         dependency-version: [prefer-lowest, prefer-stable]
         exclude:
-          - laravel: 9.*
-            php: 8.2
-          - laravel: 9.*
-            php: 8.3
-          - laravel: 9.*
-            php: 8.4
-          - laravel: 10.*
-            php: 8.0
           - laravel: 11.*
             php: 8.0
           - laravel: 11.*
@@ -33,10 +25,6 @@ jobs:
           - laravel: 12.*
             php: 8.1
         include:
-          - laravel: 9.*
-            testbench: 7.*
-          - laravel: 10.*
-            testbench: 8.*
           - laravel: 11.*
             testbench: 9.*
           - laravel: 12.*

.gitignore

@@ -1,8 +1,8 @@
 /.docker-volume-clickhouse
 /.idea
+/.phpunit.cache
 /vendor
 .DS_STORE
-.phpunit.result.cache
 composer.phar
 composer.lock
 coverage.xml

composer.json

@@ -29,16 +29,16 @@
         "docs": "https://github.com/cybercog/laravel-clickhouse"
     },
     "require": {
-        "php": "^7.4|^8.0",
-        "illuminate/console": "^8.0|^9.0|^10.1.3|^11.0|^12.0",
-        "illuminate/contracts": "^8.0|^9.0|^10.1.3|^11.0|^12.0",
-        "illuminate/filesystem": "^8.0|^9.0|^10.1.3|^11.0|^12.0",
-        "illuminate/support": "^8.0|^9.0|^10.1.3|^11.0|^12.0",
+        "php": "^8.2",
+        "illuminate/console": "^11.0|^12.0",
+        "illuminate/contracts": "^11.0|^12.0",
+        "illuminate/filesystem": "^11.0|^12.0",
+        "illuminate/support": "^11.0|^12.0",
         "smi2/phpclickhouse": "^1.5.3"
     },
     "require-dev": {
-        "orchestra/testbench": "^7.0|^8.0|^9.0|^10.0",
-        "phpunit/phpunit": "^9.6|^10.5|^11.5"
+        "orchestra/testbench": "^9.0|^10.0",
+        "phpunit/phpunit": "^11.5"
     },
     "autoload": {
         "psr-4": {

docker-compose.yml

@@ -1,16 +1,5 @@
 version: "3.9"
 services:
-  php74:
-    container_name: laravel-clickhouse-lib-74
-    image: laravel-clickhouse-lib-74
-    build:
-      context: ./
-      dockerfile: ./.docker/php74/Dockerfile
-    tty: true
-    working_dir: /app
-    volumes:
-      - ./:/app
-
   php82:
     container_name: laravel-clickhouse-lib-82
     image: laravel-clickhouse-lib-82
@@ -44,6 +33,17 @@ services:
     volumes:
       - ./:/app
 
+  php85:
+    container_name: laravel-clickhouse-lib-85
+    image: laravel-clickhouse-lib-85
+    build:
+      context: ./
+      dockerfile: ./.docker/php85/Dockerfile
+    tty: true
+    working_dir: /app
+    volumes:
+      - ./:/app
+
   clickhouse:
     container_name: laravel-clickhouse-clickhouse
     image: yandex/clickhouse-server:21.8-alpine

phpunit.xml.dist

@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         stopOnFailure="true"
+<phpunit
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
+  bootstrap="vendor/autoload.php"
+  colors="true"
+  stopOnFailure="true"
+  cacheDirectory=".phpunit.cache"
 >
-    <testsuites>
-        <testsuite name="Unit">
-            <directory suffix="Test.php">./tests</directory>
-            <exclude>./tests/assets</exclude>
-            <exclude>./tests/Asserts</exclude>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
-    <php>
-        <server name="APP_ENV" value="testing"/>
-        <server name="CLICKHOUSE_HOST" value="clickhouse"/>
-        <server name="CLICKHOUSE_PORT" value="8123"/>
-        <server name="CLICKHOUSE_USER" value="test"/>
-        <server name="CLICKHOUSE_PASSWORD" value=""/>
-        <server name="CLICKHOUSE_DATABASE" value="default"/>
-    </php>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
+  <testsuites>
+    <testsuite name="Unit">
+      <directory suffix="Test.php">./tests</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <server name="APP_ENV" value="testing"/>
+    <server name="CLICKHOUSE_HOST" value="clickhouse"/>
+    <server name="CLICKHOUSE_PORT" value="8123"/>
+    <server name="CLICKHOUSE_USER" value="test"/>
+    <server name="CLICKHOUSE_PASSWORD" value=""/>
+    <server name="CLICKHOUSE_DATABASE" value="default"/>
+  </php>
 </phpunit>