Skip to content

Commit 7c25b6a

Browse files
Merge pull request #12 from JellyBellyDev/enhancement/php74
feat(engine): refactoring library to minor php version 7.4
2 parents 8b2ed3a + 095e9f8 commit 7c25b6a

16 files changed

+106
-139
lines changed

.docker/php71/Dockerfile

Lines changed: 0 additions & 34 deletions
This file was deleted.

.docker/php74/Dockerfile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
FROM php:7.4-cli
2+
3+
ENV DEBIAN_FRONTEND noninteractive
4+
5+
RUN apt-get update && \
6+
apt-get install -y --no-install-recommends --allow-unauthenticated --no-upgrade \
7+
git && \
8+
apt-get clean && \
9+
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/
10+
11+
COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/bin/
12+
13+
RUN install-php-extensions gd exif xdebug
14+
15+
COPY --from=composer /usr/bin/composer /usr/bin/composer

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ language: php
22
sudo: false
33

44
php:
5-
- 7.1
6-
- 7.2
7-
- 7.3
85
- 7.4
96

107
cache:

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# CHANGELOG
22

3+
## v3.0.0
4+
⚠ BREAKING CHANGES
5+
- Refactoring library to minor php version `7.4`
6+
37
## v2.0.0
48
⚠ BREAKING CHANGES
59
- Refactoring library to minor php version `7.1`

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014 Andrea Giannantonio
3+
Copyright (c) 2014-2020 Andrea Giannantonio
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

README.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ PHP library to fix image orientation by exif data with thanks to method [exif_re
1212

1313
## Image Example
1414

15-
| Input | Output |
16-
|--- |--- |
17-
| ![after](images/input_landscape_3.jpg) | ![output](images/output_landscape_3.jpg) |
15+
![after](images/after_and_before.png)
1816

1917

2018
## How to install
@@ -46,20 +44,20 @@ Dependencies are managed through composer:
4644

4745
```
4846
$ docker-compose up --build -d
49-
$ docker-compose run php71 composer install
47+
$ docker-compose run php74 composer install
5048
```
5149

5250

5351
### Run phpunit:
5452

5553
```
56-
$ docker-compose run php71 composer test
54+
$ docker-compose run php74 composer test
5755
```
5856

5957

6058
### Run php-cs-fixer
6159
``` bash
62-
docker-compose run php71 composer cs-fixer
60+
docker-compose run php74 composer cs-fixer
6361
```
6462

6563

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
}
3232
},
3333
"require": {
34-
"php": "^7.1",
34+
"php": "^7.4",
3535
"ext-gd": "*",
3636
"ext-exif": "*"
3737
},
3838
"require-dev": {
39-
"phpunit/phpunit": "^7.5",
39+
"phpunit/phpunit": "^9.4",
4040
"friendsofphp/php-cs-fixer": "^2.16"
4141
},
4242
"scripts": {

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
version: '3.1'
22
services:
33

4-
php71:
5-
build: .docker/php71
4+
php74:
5+
build: .docker/php74
66
working_dir: /application
77
volumes:
88
- .:/application:cached

images/after_and_before.png

1.58 MB
Loading

images/input_landscape_3.jpg

-138 KB
Binary file not shown.

0 commit comments

Comments
 (0)