Skip to content

Commit 7ef0c65

Browse files
authored
Merge pull request #38 from Orbitale/php8
PHP 8 & Symfony 6
2 parents f129c59 + c097750 commit 7ef0c65

File tree

4 files changed

+29
-7
lines changed

4 files changed

+29
-7
lines changed

.github/workflows/php.yml

+19-4
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,31 @@ on: [push]
44

55
jobs:
66
build-test:
7-
runs-on: ${{ matrix.operating-system }}
7+
runs-on: ubuntu-latest
88

99
strategy:
1010
matrix:
11-
operating-system: [ ubuntu-latest ]
1211
php-version:
1312
- '7.2'
1413
- '7.3'
1514
- '7.4'
1615
- '8.0'
17-
name: PHP ${{ matrix.php-version }} on ${{ matrix.operating-system }}
16+
- '8.1'
17+
18+
symfony-version:
19+
- '5.3'
20+
- '5.4'
21+
- '6.0'
22+
23+
exclude:
24+
- php-version: 7.2
25+
symfony-version: 6.0
26+
- php-version: 7.3
27+
symfony-version: 6.0
28+
- php-version: 7.4
29+
symfony-version: 6.0
30+
31+
name: PHP ${{ matrix.php-version }} and Symfony ${{ matrix.symfony-version }}
1832
steps:
1933
- uses: actions/checkout@v2
2034

@@ -36,7 +50,8 @@ jobs:
3650

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

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# [v3.3.0](https://github.com/Orbitale/ImageMagickPHP/releases/tag/v3.3.0) - 15 Dec 2021
2+
3+
* Drop support for Symfony 4 (Please upgrade 😉)
4+
* Change minimum required Symfony version to 5.3 instead of 4.0|5.0
5+
* Test the package with more Symfony & PHP versions
6+
17
# [v3.2.1](https://github.com/Orbitale/ImageMagickPHP/releases/tag/v3.2.1) - 02 Jul 2021
28

39
* Add tests for the `-threshold` option.

Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
SHELL := /bin/bash
22

33
IMAGEMAGICK_DOCKER_IMAGE = orbitale-imphp
4+
PHP_BIN = php
45

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

2627
test: start ## Start Docker image for testing
2728
export IMAGEMAGICK_PATH="docker exec $(IMAGEMAGICK_DOCKER_IMAGE) `pwd`/docker_entrypoint.sh magick" && \
28-
vendor/bin/phpunit
29+
$(PHP_BIN) vendor/bin/phpunit
2930
$(MAKE) stop
3031
.PHONY: test
3132

@@ -44,6 +45,6 @@ imagemagick-docker:
4445
--workdir=`pwd` \
4546
--entrypoint="`pwd`/docker_entrypoint.sh" \
4647
dpokidov/imagemagick:latest \
47-
sleep 99999 \
48+
sleep 9999999 \
4849
>/dev/null
4950
.PHONY: imagemagick-docker

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"require": {
1616
"php": "^7.2|^8.0",
1717
"ext-mbstring": "*",
18-
"symfony/process": "^4.0|^5.0",
18+
"symfony/process": "^5.3|^6.0",
1919
"symfony/polyfill-php80": "^1.10"
2020
},
2121
"require-dev": {

0 commit comments

Comments
 (0)