support newer 8.3+, minor fixes

.github/workflows/phpunit.yml

@@ -19,21 +19,20 @@ on:
 env:
   ALL_DRIVERS: "gd gmagick imagick"
   IMAGINE_TEST_WEBSERVERURL: http://localhost:8013
-  # Uncomment the following line to save test files as artifacts
-  #IMAGINE_TEST_KEEP_TEMPFILES: yes
-
+
 jobs:
-  ubuntu:
+  test:
     name: PHP ${{ matrix.php-version }} - ${{ matrix.extensions }} (Ubuntu)
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         php-version:
-          - "5.3"
-          - "5.4"
+          - "8.3"
+          - "8.4"
         extensions:
           - gd,imagick
+          - gd,gmagick
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -42,6 +41,7 @@ jobs:
           extensions: exif,${{ matrix.extensions }}
           tools: composer:v2
           coverage: none
+
       - name: Inspect environment
         id: inspect
         run: |
@@ -53,128 +53,27 @@ jobs:
             fi
             echo ''
           done
-          echo "::set-output name=excluded-groups::$EXCLUDED_GROUPS"
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install composer dependencies
-        run: composer update --ansi --no-interaction
-      - name: Start test web server
-        uses: Eun/http-server-action@v1
-        with:
-          directory: ${{ github.workspace }}/tests
-          port: 8013
-      - name: PHPUnit
-        run: composer run test --ansi --no-interaction -- --exclude-group "${{ steps.inspect.outputs.excluded-groups }}" --stop-on-error --stop-on-failure
-      - name: Save tests temporary files
-        if: always() && env.IMAGINE_TEST_KEEP_TEMPFILES == 'yes'
-        uses: actions/upload-artifact@v2
-        with:
-          name: ubuntu-${{ matrix.php-version }}-${{ matrix.extensions }}
-          path: tests/tmp/
-          retention-days: 1
-
-  windows:
-    name: PHP ${{ matrix.php-version }} - ${{ matrix.extensions }} (Windows)
-    runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        php-version:
-          - "5.6"
-          - "7.4"
-        extensions:
-          - gd,imagick
-    steps:
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          extensions: exif,${{ matrix.extensions }}
-          tools: composer:v2
-          coverage: none
-      - name: Inspect environment
-        id: inspect
-        run: |
-          $EXCLUDED_GROUPS='always-skipped'
-          foreach ($DRIVER in $Env:ALL_DRIVERS.split()) {
-            Write-Output "### CHECKING $DRIVER"
-            php --ri $DRIVER
-            if ($LASTEXITCODE -ne 0) {
-                $EXCLUDED_GROUPS="$EXCLUDED_GROUPS,$DRIVER"
-                $Global:LASTEXITCODE = 0
-            }
-            Write-Output ''
-          }
-          Write-Output "::set-output name=excluded-groups::$EXCLUDED_GROUPS"
+          echo "excluded-groups=$EXCLUDED_GROUPS" >> $GITHUB_OUTPUT
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+
       - name: Install composer dependencies
         run: composer update --ansi --no-interaction
+
       - name: Start test web server
         uses: Eun/http-server-action@v1
         with:
           directory: ${{ github.workspace }}/tests
           port: 8013
-      - name: PHPUnit
-        run: composer run test --ansi --no-interaction -- --exclude-group "${{ steps.inspect.outputs.excluded-groups }}"
-      - name: Save tests temporary files
-        if: always() && env.IMAGINE_TEST_KEEP_TEMPFILES == 'yes'
-        uses: actions/upload-artifact@v2
-        with:
-          name: windows-${{ matrix.php-version }}-${{ matrix.extensions }}
-          path: tests/tmp/
-          retention-days: 1
 
-  docker:
-    name: PHP ${{ matrix.php-version }} - ${{ matrix.image-suffix }} (Docker)
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        php-version:
-          - "5.5"
-          - "5.6"
-          - "7.0"
-          - "7.1"
-          - "7.2"
-          - "7.3"
-          - "7.4"
-          - "8.0"
-          - "8.1"
-        image-suffix:
-          - gd-gmagick
-          - gd-imagick
-    container: ghcr.io/php-imagine/test:${{ matrix.php-version }}-${{ matrix.image-suffix }}
-    steps:
-      - name: Inspect environment
-        id: inspect
-        run: |
-          EXCLUDED_GROUPS=always-skipped
-          for DRIVER in $ALL_DRIVERS; do
-            echo "### CHECKING $DRIVER"
-            if ! php --ri $DRIVER; then
-                EXCLUDED_GROUPS="$EXCLUDED_GROUPS,$DRIVER"
-            fi
-            echo ''
-          done
-          echo "::set-output name=excluded-groups::$EXCLUDED_GROUPS"
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install composer dependencies
-        run: composer update --ansi --no-interaction
-      - name: Start test web server
-        id: start-webserver
-        run: |
-          cd ./tests
-          php -n -S 0.0.0.0:8013 &
-          cd - >/dev/null
       - name: PHPUnit
-        run: composer run test --ansi --no-interaction -- --exclude-group "${{ steps.inspect.outputs.excluded-groups }}"
+        run: composer run test --ansi --no-interaction -- --exclude-group "${{ steps.inspect.outputs.excluded-groups }}" --stop-on-error --stop-on-failure
+
       - name: Save tests temporary files
         if: always() && env.IMAGINE_TEST_KEEP_TEMPFILES == 'yes'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: docker-${{ matrix.php-version }}-${{ matrix.image-suffix }}
+          name: ubuntu-${{ matrix.php-version }}-${{ matrix.extensions }}
           path: tests/tmp/
           retention-days: 1

.php-cs-fixer.dist.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This document has been generated with
  * https://mlocati.github.io/php-cs-fixer-configurator/#version:3.1.0|configurator

Dockerfile

@@ -0,0 +1,33 @@
+ARG PHP_VERSION=8.3
+FROM php:${PHP_VERSION}-cli
+
+ARG DEBIAN_FRONTEND=noninteractive
+ARG IMAGE_DRIVER=imagick
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    libpng-dev \
+    libjpeg-dev \
+    libfreetype6-dev \
+    libwebp-dev \
+    libmagickwand-dev \
+    libgraphicsmagick1-dev \
+    imagemagick \
+    git \
+    unzip \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN docker-php-ext-configure gd \
+        --with-freetype \
+        --with-jpeg \
+        --with-webp \
+    && docker-php-ext-install -j$(nproc) gd exif
+
+RUN if [ "$IMAGE_DRIVER" = "imagick" ]; then \
+        pecl install imagick && docker-php-ext-enable imagick; \
+    elif [ "$IMAGE_DRIVER" = "gmagick" ]; then \
+        pecl install gmagick-2.0.6RC1 && docker-php-ext-enable gmagick; \
+    fi
+
+COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
+
+WORKDIR /app

composer.json

@@ -17,10 +17,10 @@
         }
     ],
     "require": {
-        "php": ">=5.3.2"
+        "php": ">=8.3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8 || ^5.7 || ^6.5 || ^7.5 || ^8.4 || ^9.3"
+        "phpunit/phpunit": "^9.6"
     },
     "suggest": {
         "ext-exif": "to read EXIF metadata",
@@ -56,6 +56,6 @@
         ]
     },
     "scripts": {
-        "test": "phpunit --verbose"
+        "test": "phpunit"
     }
 }

docker-compose.yml

@@ -0,0 +1,53 @@
+services:
+  php83-imagick:
+    build:
+      context: .
+      args:
+        PHP_VERSION: "8.3"
+        IMAGE_DRIVER: "imagick"
+    volumes:
+      - .:/app
+    working_dir: /app
+
+  php83-gmagick:
+    build:
+      context: .
+      args:
+        PHP_VERSION: "8.3"
+        IMAGE_DRIVER: "gmagick"
+    volumes:
+      - .:/app
+    working_dir: /app
+
+  php84-imagick:
+    build:
+      context: .
+      args:
+        PHP_VERSION: "8.4"
+        IMAGE_DRIVER: "imagick"
+    volumes:
+      - .:/app
+    working_dir: /app
+
+  php84-gmagick:
+    build:
+      context: .
+      args:
+        PHP_VERSION: "8.4"
+        IMAGE_DRIVER: "gmagick"
+    volumes:
+      - .:/app
+    working_dir: /app
+
+  php85-imagick:
+    build:
+      context: .
+      args:
+        PHP_VERSION: "8.5"
+        IMAGE_DRIVER: "imagick"
+    volumes:
+      - .:/app
+    working_dir: /app
+
+  # Note: Gmagick 2.0.6RC1 does not compile on PHP 8.5
+  # php85-gmagick is intentionally omitted

phpunit.xml.dist

@@ -1,31 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
          bootstrap="tests/bootstrap.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-    <testsuites>
-        <testsuite name="Imagine Test Suite">
-            <directory>./tests/tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src/</directory>
-            <exclude>
-                <directory>./tests/fixtures</directory>
-                <directory>./tests/tmp</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+         colors="true"
+         stopOnFailure="false">
+  <coverage>
+    <include>
+      <directory>./src/</directory>
+    </include>
+    <exclude>
+      <directory>./tests/fixtures</directory>
+      <directory>./tests/tmp</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <ini name="error_reporting" value="-1"/>
+  </php>
+  <testsuites>
+    <testsuite name="Imagine Test Suite">
+      <directory>./tests/tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

run-tests.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+
+LOG_DIR="/tmp"
+
+# Default test matrix
+# Note: gmagick doesn't compile on PHP 8.5, so it's excluded
+DEFAULT_SERVICES="php83-imagick php83-gmagick php84-imagick php84-gmagick php85-imagick"
+SERVICES="${1:-$DEFAULT_SERVICES}"
+
+echo "=== Imagine PHP Compatibility Tests ===" | tee "${LOG_DIR}/imagine-tests.log"
+echo "Services: ${SERVICES}" | tee -a "${LOG_DIR}/imagine-tests.log"
+echo "" | tee -a "${LOG_DIR}/imagine-tests.log"
+
+PASSED=0
+FAILED=0
+RESULTS=""
+
+for SERVICE in ${SERVICES}; do
+    LOG_FILE="${LOG_DIR}/imagine-${SERVICE}.log"
+    echo "=== Testing ${SERVICE} ===" | tee -a "${LOG_DIR}/imagine-tests.log"
+
+    # Build the image first
+    docker-compose build "${SERVICE}" 2>&1 | tee "${LOG_FILE}.build"
+    if [ ${PIPESTATUS[0]} -ne 0 ]; then
+        RESULTS="${RESULTS}\n${SERVICE}: BUILD FAILED"
+        echo "${SERVICE}: BUILD FAILED" | tee -a "${LOG_DIR}/imagine-tests.log"
+        FAILED=$((FAILED + 1))
+        echo "" | tee -a "${LOG_DIR}/imagine-tests.log"
+        continue
+    fi
+
+    # Run tests
+    docker-compose run --rm "${SERVICE}" sh -c \
+        "php -v && composer install --quiet && composer run test -- --exclude-group always-skipped" 2>&1 | tee "${LOG_FILE}"
+    if [ ${PIPESTATUS[0]} -eq 0 ]; then
+        RESULTS="${RESULTS}\n${SERVICE}: PASSED"
+        echo "${SERVICE}: PASSED" | tee -a "${LOG_DIR}/imagine-tests.log"
+        PASSED=$((PASSED + 1))
+    else
+        RESULTS="${RESULTS}\n${SERVICE}: FAILED"
+        echo "${SERVICE}: FAILED" | tee -a "${LOG_DIR}/imagine-tests.log"
+        FAILED=$((FAILED + 1))
+    fi
+    echo "" | tee -a "${LOG_DIR}/imagine-tests.log"
+done
+
+echo "=== Summary ===" | tee -a "${LOG_DIR}/imagine-tests.log"
+echo -e "${RESULTS}" | tee -a "${LOG_DIR}/imagine-tests.log"
+echo "" | tee -a "${LOG_DIR}/imagine-tests.log"
+echo "Passed: ${PASSED}, Failed: ${FAILED}" | tee -a "${LOG_DIR}/imagine-tests.log"
+echo "=== Done ===" | tee -a "${LOG_DIR}/imagine-tests.log"
+echo "Logs available at: ${LOG_DIR}/imagine-*.log"
+
+# Exit with failure if any tests failed
+[ ${FAILED} -eq 0 ]