Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,31 @@ on: [push]

jobs:
build-test:
runs-on: ${{ matrix.operating-system }}
runs-on: ubuntu-latest

strategy:
matrix:
operating-system: [ ubuntu-latest ]
php-version:
- '7.2'
- '7.3'
- '7.4'
- '8.0'
name: PHP ${{ matrix.php-version }} on ${{ matrix.operating-system }}
- '8.1'

symfony-version:
- '5.3'
- '5.4'
- '6.0'

exclude:
- php-version: 7.2
symfony-version: 6.0
- php-version: 7.3
symfony-version: 6.0
- php-version: 7.4
symfony-version: 6.0

name: PHP ${{ matrix.php-version }} and Symfony ${{ matrix.symfony-version }}
steps:
- uses: actions/checkout@v2

Expand All @@ -36,7 +50,8 @@ jobs:

- name: Setup
run: |
make install
sed -i composer.json -e 's/\^5\.3\(.[0-9]\+\)\?[|]\^6\.0/${{ matrix.symfony-version }}.*/g'
make install start

- name: Test
run: |
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# [v3.3.0](https://github.com/Orbitale/ImageMagickPHP/releases/tag/v3.3.0) - 15 Dec 2021

* Drop support for Symfony 4 (Please upgrade 😉)
* Change minimum required Symfony version to 5.3 instead of 4.0|5.0
* Test the package with more Symfony & PHP versions

# [v3.2.1](https://github.com/Orbitale/ImageMagickPHP/releases/tag/v3.2.1) - 02 Jul 2021

* Add tests for the `-threshold` option.
Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
SHELL := /bin/bash

IMAGEMAGICK_DOCKER_IMAGE = orbitale-imphp
PHP_BIN = php

# Helper vars
_TITLE := "\033[32m[%s]\033[0m %s\n"
Expand All @@ -25,7 +26,7 @@ stop: ## Stop testing Docker image

test: start ## Start Docker image for testing
export IMAGEMAGICK_PATH="docker exec $(IMAGEMAGICK_DOCKER_IMAGE) `pwd`/docker_entrypoint.sh magick" && \
vendor/bin/phpunit
$(PHP_BIN) vendor/bin/phpunit
$(MAKE) stop
.PHONY: test

Expand All @@ -44,6 +45,6 @@ imagemagick-docker:
--workdir=`pwd` \
--entrypoint="`pwd`/docker_entrypoint.sh" \
dpokidov/imagemagick:latest \
sleep 99999 \
sleep 9999999 \
>/dev/null
.PHONY: imagemagick-docker
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"require": {
"php": "^7.2|^8.0",
"ext-mbstring": "*",
"symfony/process": "^4.0|^5.0",
"symfony/process": "^5.3|^6.0",
"symfony/polyfill-php80": "^1.10"
},
"require-dev": {
Expand Down