Skip to content

Commit

Permalink
Merge pull request #20 from utopia-php/fix-gif-resolutions
Browse files Browse the repository at this point in the history
Fix: GIF Resolutions
  • Loading branch information
TorstenDittmann authored May 11, 2022
2 parents 66223a7 + fb4d508 commit ca5f436
Show file tree
Hide file tree
Showing 14 changed files with 445 additions and 586 deletions.
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/bug.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ body:
label: "🐘 PHP Version"
description: "What version of PHP are you running?"
options:
- PHP 7.3.x
- PHP 7.4.x
- PHP 8.0.x
- Different version (specify in environment)
validations:
required: true
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dist: xenial
dist: focal

arch:
- amd64
Expand Down
42 changes: 0 additions & 42 deletions Dockerfile-php7

This file was deleted.

9 changes: 4 additions & 5 deletions Dockerfile-php8
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN composer update --ignore-platform-reqs --optimize-autoloader \
FROM php:8.0-cli-alpine as step1

## Last working commit https://github.com/Imagick/imagick/commit/35741750aa1cda2b7ac354bfa6128fa037e9cf32
ENV PHP_IMAGICK_VERSION=35741750aa1cda2b7ac354bfa6128fa037e9cf32
ENV PHP_IMAGICK_VERSION=3.7.0

RUN \
apk add --no-cache --virtual .deps \
Expand All @@ -24,12 +24,10 @@ RUN \
imagemagick \
imagemagick-dev


## Imagick Extension
RUN \
## Imagick Extension
git clone https://github.com/Imagick/imagick && \
git clone --depth 1 --branch $PHP_IMAGICK_VERSION https://github.com/imagick/imagick && \
cd imagick && \
git checkout $PHP_IMAGICK_VERSION && \
phpize && \
./configure && \
make && make install
Expand All @@ -48,6 +46,7 @@ RUN \
g++ \
&& apk add --no-cache \
libstdc++ \
libgomp \
imagemagick \
&& apk del .deps \
&& rm -rf /var/cache/apk/*
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ $image->save($target, 'png', 100);

## System Requirements

Utopia Image requires PHP 7.4 or later. We recommend using the latest PHP version whenever possible.
Utopia Image requires PHP 8.0 or later. We recommend using the latest PHP version whenever possible.

## Authors

Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
"psr-4": {"Utopia\\Image\\":"src/Image"}
},
"require": {
"php": ">=7.4",
"php": ">=8.0",
"ext-imagick": "*"
},
"require-dev": {
"phpunit/phpunit": "^9.3",
"vimeo/psalm": "4.0.1"
"vimeo/psalm": "4.13.1"
},
"minimum-stability": "dev"
}
Loading

0 comments on commit ca5f436

Please sign in to comment.