Skip to content

Commit

Permalink
Merge pull request #38 from wcreateweb/create-key
Browse files Browse the repository at this point in the history
Rebase master on create-key branch
  • Loading branch information
rkoopmans authored Feb 12, 2025
2 parents 58652f9 + a2117ce commit 093e57b
Show file tree
Hide file tree
Showing 19 changed files with 280 additions and 1,050 deletions.
58 changes: 58 additions & 0 deletions .github/workflows/ci-cd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
---
name: PHP CI/CD

on: [push, pull_request]

permissions: {}
jobs:
Unit_tests:
runs-on: ${{ matrix.os }}
timeout-minutes: 10
strategy:
fail-fast: false
matrix:
php-version: [
"5.4",
"5.6",
"7.4",
"8.0",
"8.4",
]
os: [ubuntu-latest, macOS-latest, windows-latest]
steps:
- uses: shivammathur/setup-php@2.32.0
with:
php-version: ${{ matrix.php-version }}
tools: composer:v2
- uses: actions/checkout@v3
- name: Validate composer.json and composer.lock
run: composer validate --strict
- name: Install Dependencies
run: composer install --no-ansi --no-interaction --no-progress
- name: Run test suite
run: vendor/bin/phpunit
Integration_tests:
if: github.event_name == 'push'
runs-on: ${{ matrix.os }}
timeout-minutes: 10
needs: Unit_tests
strategy:
fail-fast: false
matrix:
php-version: [
"7.4",
"8.4",
]
os: [ubuntu-latest, macOS-latest, windows-latest]
steps:
- uses: shivammathur/setup-php@2.32.0
with:
php-version: ${{ matrix.php-version }}
tools: composer:v2
- uses: actions/checkout@v3
- name: Install Dependencies
run: composer install --no-ansi --no-interaction --no-progress
- name: Run test suite
env:
TINIFY_KEY: ${{ secrets.TINIFY_KEY }}
run: vendor/bin/phpunit --no-configuration test/integration.php
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
vendor
.phpunit.result.cache
composer.lock
11 changes: 11 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
## 1.6.2
* Remove deprecated curl constant (https://php.watch/versions/8.4/CURLOPT_BINARYTRANSFER-deprecated)

## 1.6.1
* Fixed string interpolation for php 8.2: https://wiki.php.net/rfc/deprecate_dollar_brace_string_interpolation

## 1.6.0
* Support to run the unittests on newer versions of PHP (5.5 +)
* Add API methods for converting/transcoding and transformation
* Add helper function for returning the compressed file extension

## 1.5.2
* Fail early if version of curl/openssl is too old.

Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
[<img src="https://travis-ci.org/tinify/tinify-php.svg?branch=master" alt="Build Status">](https://travis-ci.org/tinify/tinify-php)
[![MIT License](http://img.shields.io/badge/license-MIT-green.svg) ](https://github.com/tinify/tinify-php/blob/main/LICENSE)
[![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)
[![Packagist Version](https://img.shields.io/packagist/v/tinify/tinify)](https://packagist.org/packages/tinify/tinify)
[![Packagist PHP Version Support](https://img.shields.io/packagist/php-v/tinify/tinify)](https://packagist.org/packages/tinify/tinify)

# Tinify API client for PHP

Expand Down
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
},

"require-dev": {
"symfony/yaml": "~2.0",
"phpunit/phpunit": "~4.0"
"phpunit/phpunit": "^4.8 || ^5.7 || ^6.5 || ^7.5 || ^8.4 || ^9.3"
},

"autoload": {
Expand Down
Loading

0 comments on commit 093e57b

Please sign in to comment.