Skip to content

Commit 093e57b

Browse files
authored
Merge pull request #38 from wcreateweb/create-key
Rebase master on create-key branch
2 parents 58652f9 + a2117ce commit 093e57b

19 files changed

+280
-1050
lines changed

.github/workflows/ci-cd.yaml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
---
2+
name: PHP CI/CD
3+
4+
on: [push, pull_request]
5+
6+
permissions: {}
7+
jobs:
8+
Unit_tests:
9+
runs-on: ${{ matrix.os }}
10+
timeout-minutes: 10
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
php-version: [
15+
"5.4",
16+
"5.6",
17+
"7.4",
18+
"8.0",
19+
"8.4",
20+
]
21+
os: [ubuntu-latest, macOS-latest, windows-latest]
22+
steps:
23+
- uses: shivammathur/[email protected]
24+
with:
25+
php-version: ${{ matrix.php-version }}
26+
tools: composer:v2
27+
- uses: actions/checkout@v3
28+
- name: Validate composer.json and composer.lock
29+
run: composer validate --strict
30+
- name: Install Dependencies
31+
run: composer install --no-ansi --no-interaction --no-progress
32+
- name: Run test suite
33+
run: vendor/bin/phpunit
34+
Integration_tests:
35+
if: github.event_name == 'push'
36+
runs-on: ${{ matrix.os }}
37+
timeout-minutes: 10
38+
needs: Unit_tests
39+
strategy:
40+
fail-fast: false
41+
matrix:
42+
php-version: [
43+
"7.4",
44+
"8.4",
45+
]
46+
os: [ubuntu-latest, macOS-latest, windows-latest]
47+
steps:
48+
- uses: shivammathur/[email protected]
49+
with:
50+
php-version: ${{ matrix.php-version }}
51+
tools: composer:v2
52+
- uses: actions/checkout@v3
53+
- name: Install Dependencies
54+
run: composer install --no-ansi --no-interaction --no-progress
55+
- name: Run test suite
56+
env:
57+
TINIFY_KEY: ${{ secrets.TINIFY_KEY }}
58+
run: vendor/bin/phpunit --no-configuration test/integration.php

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
vendor
2+
.phpunit.result.cache
3+
composer.lock

CHANGES.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## 1.6.2
2+
* Remove deprecated curl constant (https://php.watch/versions/8.4/CURLOPT_BINARYTRANSFER-deprecated)
3+
4+
## 1.6.1
5+
* Fixed string interpolation for php 8.2: https://wiki.php.net/rfc/deprecate_dollar_brace_string_interpolation
6+
7+
## 1.6.0
8+
* Support to run the unittests on newer versions of PHP (5.5 +)
9+
* Add API methods for converting/transcoding and transformation
10+
* Add helper function for returning the compressed file extension
11+
112
## 1.5.2
213
* Fail early if version of curl/openssl is too old.
314

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
[<img src="https://travis-ci.org/tinify/tinify-php.svg?branch=master" alt="Build Status">](https://travis-ci.org/tinify/tinify-php)
1+
[![MIT License](http://img.shields.io/badge/license-MIT-green.svg) ](https://github.com/tinify/tinify-php/blob/main/LICENSE)
2+
[![CI_CD](https://github.com/tinify/tinify-php/actions/workflows/ci-cd.yaml/badge.svg?branch=master)](https://github.com/tinify/tinify-php/actions/workflows/ci-cd.yaml)
3+
[![Packagist Version](https://img.shields.io/packagist/v/tinify/tinify)](https://packagist.org/packages/tinify/tinify)
4+
[![Packagist PHP Version Support](https://img.shields.io/packagist/php-v/tinify/tinify)](https://packagist.org/packages/tinify/tinify)
25

36
# Tinify API client for PHP
47

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
},
3131

3232
"require-dev": {
33-
"symfony/yaml": "~2.0",
34-
"phpunit/phpunit": "~4.0"
33+
"phpunit/phpunit": "^4.8 || ^5.7 || ^6.5 || ^7.5 || ^8.4 || ^9.3"
3534
},
3635

3736
"autoload": {

0 commit comments

Comments
 (0)