Skip to content

Commit 48fe299

Browse files
authored
Merge branch 'master' into feature/autocolor
2 parents 3a4e004 + 1a81fea commit 48fe299

File tree

9 files changed

+78
-2681
lines changed

9 files changed

+78
-2681
lines changed

.github/workflows/test.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Test Suite
2+
3+
on:
4+
- pull_request
5+
6+
permissions:
7+
contents: read
8+
9+
jobs:
10+
run-tests:
11+
concurrency:
12+
group: tests-${{ github.ref }}-${{ matrix.php-versions }}
13+
cancel-in-progress: true
14+
15+
strategy:
16+
matrix:
17+
php-versions: ['7.3', '7.4', '8.0', '8.1', '8.2']
18+
19+
runs-on: ubuntu-latest
20+
21+
steps:
22+
- uses: shivammathur/setup-php@v2
23+
with:
24+
php-version: ${{ matrix.php-versions }}
25+
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, mysql, intl, gd, exif, iconv, imagick
26+
coverage: pcov
27+
28+
- uses: actions/checkout@v3
29+
with:
30+
fetch-depth: 2
31+
32+
- name: Validate composer.json and composer.lock
33+
run: composer validate --strict
34+
35+
- name: Cache Composer packages
36+
id: composer-cache
37+
uses: actions/cache@v3
38+
with:
39+
path: vendor
40+
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
41+
restore-keys: |
42+
${{ runner.os }}-php-
43+
44+
- name: Install dependencies
45+
run: composer install --prefer-dist --no-progress
46+
47+
- name: Run tests
48+
run: php -d pcov.enabled=1 -d memory_limit=4G vendor/bin/phpunit --coverage-clover=build/logs/clover.xml tests
49+
50+
- name: Upload Coverage
51+
env:
52+
OTTERWISE_TOKEN: ${{ secrets.OTTERWISE_TOKEN }}
53+
run: bash <(curl -s https://raw.githubusercontent.com/getOtterWise/bash-uploader/main/uploader.sh)

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@ out
44
gen
55
vendor
66
.gitignore
7-
build
7+
build
8+
composer.lock
9+
.phpunit.result.cache

.travis.yml

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

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
Ever seen those avatars (basically everywhere) that has your initials — mine would be LR; Lasse Rafn — well this package allows you to generate those, in a simple manner.
33

44
<p align="center">
5-
<img src="https://apricot.dk/github/php-initial-avatar-generator.jpg" alt="Banner" />
5+
<img src="https://ui-avatars.com/assets/promo-new.png" alt="Banner" />
66
</p>
77

88
<p align="center">
9-
<a href="https://travis-ci.org/LasseRafn/php-initial-avatar-generator"><img src="https://img.shields.io/travis/LasseRafn/php-initial-avatar-generator.svg?style=flat-square" alt="Build Status"></a>
10-
<a href="https://coveralls.io/github/LasseRafn/php-initial-avatar-generator"><img src="https://img.shields.io/coveralls/LasseRafn/php-initial-avatar-generator.svg?style=flat-square" alt="Coverage"></a>
9+
<a href="https://github.com/LasseRafn/php-initial-avatar-generator/actions/workflows/test.yml"><img src="https://github.com/LasseRafn/php-initial-avatar-generator/actions/workflows/test.yml/badge.svg" alt="Build Status"></a>
10+
<a href="https://otterwise.app/github/lasserafn/php-initial-avatar-generator"><img src="https://img.shields.io/endpoint?url=https%3A%2F%2Fotterwise.app%2Fbadge%2Fgithub%2Flasserafn%2Fphp-initial-avatar-generator%2F6db6fcbb-95a6-446a-b5a1-15d7b1809dca" alt="OtterWise Coverage"></a>
1111
<a href="https://styleci.io/repos/78973710"><img src="https://styleci.io/repos/78973710/shield?branch=master" alt="StyleCI Status"></a>
1212
<a href="https://packagist.org/packages/LasseRafn/php-initial-avatar-generator"><img src="https://img.shields.io/packagist/dt/LasseRafn/php-initial-avatar-generator.svg?style=flat-square" alt="Total Downloads"></a>
1313
<a href="https://packagist.org/packages/LasseRafn/php-initial-avatar-generator"><img src="https://img.shields.io/packagist/v/LasseRafn/php-initial-avatar-generator.svg?style=flat-square" alt="Latest Stable Version"></a>

composer.json

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,16 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.0|^7.1|^7.2|^7.3|^7.4",
19+
"php": "^7.0|^7.1|^7.2|^7.3|^7.4|^8.0|^8.1|^8.2",
2020
"ext-json": "*",
2121
"intervention/image": "^2.3",
2222
"lasserafn/php-initials": "^3.0",
23-
"lasserafn/php-string-script-language": "^0.1.0",
23+
"lasserafn/php-string-script-language": "^0.4",
2424
"meyfa/php-svg": "^0.9.0",
2525
"overtrue/pinyin": "^4.0"
2626
},
2727
"require-dev": {
28-
"doctrine/instantiator": "1.0.*",
29-
"phpunit/phpunit": "^6.5",
30-
"satooshi/php-coveralls": "^1.0"
28+
"phpunit/phpunit": "^8.5"
3129
},
3230
"autoload": {
3331
"psr-4": {
@@ -40,9 +38,6 @@
4038
}
4139
},
4240
"config": {
43-
"sort-packages": true,
44-
"platform": {
45-
"php": "7.0"
46-
}
41+
"sort-packages": true
4742
}
4843
}

0 commit comments

Comments
 (0)