Skip to content

Commit 7b79c6b

Browse files
committed
php 8, replaced travis with github actions
1 parent b8aa0af commit 7b79c6b

File tree

4 files changed

+87
-29
lines changed

4 files changed

+87
-29
lines changed

.github/workflows/main.yaml

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
name: "testing"
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
qa:
11+
name: Quality assurance
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v2
17+
18+
- name: Validate composer.json and composer.lock
19+
run: composer validate
20+
21+
- name: Cache Composer packages
22+
id: composer-cache
23+
uses: actions/cache@v2
24+
with:
25+
path: vendor
26+
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
27+
restore-keys: |
28+
${{ runner.os }}-php-
29+
30+
- name: Install dependencies
31+
if: steps.composer-cache.outputs.cache-hit != 'true'
32+
run: composer install --prefer-dist --no-progress --no-suggest
33+
34+
- name: Coding Standard
35+
run: composer run-script cs
36+
37+
tests:
38+
name: Tests
39+
runs-on: ubuntu-latest
40+
41+
strategy:
42+
matrix:
43+
php:
44+
- 7.2
45+
- 7.3
46+
- 7.4
47+
composer-args: [ "" ]
48+
include:
49+
- php: 8.0
50+
composer-args: --ignore-platform-reqs
51+
fail-fast: false
52+
53+
steps:
54+
- name: Checkout
55+
uses: actions/checkout@v2
56+
57+
- name: Install PHP
58+
uses: shivammathur/setup-php@v2
59+
with:
60+
php-version: ${{ matrix.php }}
61+
62+
- name: Cache PHP dependencies
63+
uses: actions/cache@v2
64+
with:
65+
path: vendor
66+
key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
67+
restore-keys: ${{ runner.os }}-php-${{ matrix.php }}-composer-
68+
69+
- name: Install dependencies
70+
run: composer install --prefer-dist --no-progress --no-suggest ${{ matrix.composer-args }}
71+
72+
- name: Tests
73+
run: composer test
74+
75+
- name: Tests coverage
76+
run: composer coverage

.travis.yml

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

README.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
[![Latest Version on Packagist][ico-version]][link-packagist]
44
[![Software License][ico-license]](LICENSE)
5-
[![Build Status][ico-travis]][link-travis]
6-
[![Quality Score][ico-scrutinizer]][link-scrutinizer]
5+
![Testing][ico-ga]
76
[![Total Downloads][ico-downloads]][link-downloads]
87
[![SensioLabs Insight][ico-sensiolabs]][link-sensiolabs]
98

@@ -68,13 +67,11 @@ The MIT License (MIT). Please see [LICENSE](LICENSE) for more information.
6867

6968
[ico-version]: https://img.shields.io/packagist/v/middlewares/geolocation.svg?style=flat-square
7069
[ico-license]: https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square
71-
[ico-travis]: https://img.shields.io/travis/middlewares/geolocation/master.svg?style=flat-square
72-
[ico-scrutinizer]: https://img.shields.io/scrutinizer/g/middlewares/geolocation.svg?style=flat-square
70+
[ico-ga]: https://github.com/middlewares/geolocation/workflows/testing/badge.svg
7371
[ico-downloads]: https://img.shields.io/packagist/dt/middlewares/geolocation.svg?style=flat-square
7472
[ico-sensiolabs]: https://img.shields.io/sensiolabs/i/b6c8bd3a-b3da-45ec-b2ac-9d27ae390b1b.svg?style=flat-square
7573

7674
[link-packagist]: https://packagist.org/packages/middlewares/geolocation
77-
[link-travis]: https://travis-ci.org/middlewares/geolocation
7875
[link-scrutinizer]: https://scrutinizer-ci.com/g/middlewares/geolocation
7976
[link-downloads]: https://packagist.org/packages/middlewares/geolocation
8077
[link-sensiolabs]: https://insight.sensiolabs.com/projects/b6c8bd3a-b3da-45ec-b2ac-9d27ae390b1b

composer.json

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@
1818
"issues": "https://github.com/middlewares/geolocation/issues"
1919
},
2020
"require": {
21-
"php": "^7.0",
21+
"php": "^7.2 || ^8.0",
2222
"willdurand/geocoder": "^4.0",
2323
"php-http/message": "^1.6",
2424
"psr/http-server-middleware": "^1.0"
2525
},
2626
"require-dev": {
27-
"phpunit/phpunit": "^6.0|^7.0",
27+
"phpunit/phpunit": "^8|^9",
2828
"zendframework/zend-diactoros": "^1.3",
2929
"friendsofphp/php-cs-fixer": "^2.0",
3030
"squizlabs/php_codesniffer": "^3.0",
3131
"middlewares/utils": "^2.1",
3232
"eloquent/phony-phpunit": "^3.0|^4.0",
3333
"php-http/guzzle6-adapter": "^1.1",
3434
"geocoder-php/free-geoip-provider": "^4.1",
35-
"phpstan/phpstan": "^0.9.2|^0.10.3"
35+
"phpstan/phpstan": "^0.12"
3636
},
3737
"autoload": {
3838
"psr-4": {
@@ -45,12 +45,11 @@
4545
}
4646
},
4747
"scripts": {
48-
"test": [
49-
"phpunit --coverage-text",
50-
"phpcs"
51-
],
52-
"cs-fix": "php-cs-fixer fix .",
53-
"coverage": "phpunit --coverage-html=coverage",
54-
"analyse": "phpstan analyse --no-progress --level 7 src"
48+
"cs": "phpcs",
49+
"cs-fix": "php-cs-fixer fix",
50+
"phpstan": "phpstan analyse",
51+
"test": "phpunit",
52+
"coverage": "phpunit --coverage-text",
53+
"coverage-html": "phpunit --coverage-html=coverage"
5554
}
5655
}

0 commit comments

Comments
 (0)