Skip to content

Commit fc6a139

Browse files
authored
Merge pull request #170 from php-http/ci-status
cleanup CI status
2 parents 191a0a1 + 771758b commit fc6a139

9 files changed

+31
-43
lines changed

.github/workflows/checks.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- master
77
pull_request:
88

9+
jobs:
910
roave-bc-check:
1011
name: Roave BC Check
1112
runs-on: ubuntu-latest
@@ -15,4 +16,4 @@ on:
1516
uses: actions/checkout@v2
1617

1718
- name: Roave BC Check
18-
uses: docker://nyholm/roave-bc-check-ga
19+
uses: "docker://nyholm/roave-bc-check-ga"

.github/workflows/ci.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: CI
22

33
on:
44
push:
5+
branches:
6+
- master
57
pull_request:
68

79
jobs:
@@ -25,13 +27,13 @@ jobs:
2527

2628
- name: Install PHP 7 dependencies
2729
run: composer update --prefer-dist --no-interaction --no-progress
28-
if: "matrix.php != '8.0'"
30+
if: "startsWith(matrix.php, '7.')"
2931

3032
- name: Install PHP 8 dependencies
3133
run: |
3234
composer require "phpdocumentor/reflection-docblock:^5.2@dev" --no-interaction --no-update
3335
composer update --prefer-dist --prefer-stable --no-interaction --no-progress --ignore-platform-req=php
34-
if: "matrix.php == '8.0'"
36+
if: "startsWith(matrix.php, '8.')"
3537

3638
- name: Execute tests
3739
run: composer test
@@ -41,7 +43,7 @@ jobs:
4143
runs-on: ubuntu-latest
4244
strategy:
4345
matrix:
44-
php: ['7.1', '7.2', '7.3', '7.4']
46+
php: ['7.1', '7.4', '8.0']
4547

4648
steps:
4749
- name: Checkout code

.github/workflows/static.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
phpstan:
1111
name: PHPStan
1212
runs-on: ubuntu-latest
13-
13+
1414
steps:
1515
- name: Checkout code
1616
uses: actions/checkout@v2
@@ -31,4 +31,4 @@ jobs:
3131
- name: PHP-CS-Fixer
3232
uses: docker://oskarstark/php-cs-fixer-ga
3333
with:
34-
args: --dry-run --diff-format udiff
34+
args: --dry-run

.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
.php_cs
2-
.php_cs.cache
1+
.php-cs-fixer.php
2+
.php-cs-fixer.cache
33
/build/
44
/composer.lock
55
/phpspec.yml

.php-cs-fixer.dist.php

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
3+
$finder = PhpCsFixer\Finder::create()
4+
->in(__DIR__.'/src')
5+
->name('*.php')
6+
;
7+
8+
$config = (new PhpCsFixer\Config())
9+
->setRiskyAllowed(true)
10+
->setRules([
11+
'@Symfony' => true,
12+
])
13+
->setFinder($finder)
14+
;
15+
16+
return $config;

.php_cs.dist

-16
This file was deleted.

.styleci.yml

-14
This file was deleted.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Latest Version](https://img.shields.io/github/release/php-http/httplug.svg?style=flat-square)](https://github.com/php-http/httplug/releases)
44
[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)
5-
[![Build Status](https://img.shields.io/travis/php-http/httplug/master.svg?style=flat-square)](https://travis-ci.org/php-http/httplug)
5+
[![Build Status](https://github.com/php-http/httplug/actions/workflows/ci.yml/badge.svg)](https://github.com/php-http/httplug/actions/workflows/ci.yml)
66
[![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/php-http/httplug.svg?style=flat-square)](https://scrutinizer-ci.com/g/php-http/httplug)
77
[![Quality Score](https://img.shields.io/scrutinizer/g/php-http/httplug.svg?style=flat-square)](https://scrutinizer-ci.com/g/php-http/httplug)
88
[![Total Downloads](https://img.shields.io/packagist/dt/php-http/httplug.svg?style=flat-square)](https://packagist.org/packages/php-http/httplug)

phpstan-baseline.neon

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
22
ignoreErrors:
33
-
4-
message: "#^Method Http\\\\Client\\\\Exception\\\\HttpException\\:\\:create\\(\\) has no return typehint specified\\.$#"
4+
message: "#^Method Http\\\\Client\\\\Exception\\\\HttpException\\:\\:create\\(\\) has no return type specified\\.$#"
55
count: 1
66
path: src/Exception/HttpException.php
77

@@ -11,12 +11,11 @@ parameters:
1111
path: src/Exception/HttpException.php
1212

1313
-
14-
message: "#^Method Http\\\\Client\\\\Exception\\\\NetworkException\\:\\:setRequest\\(\\) has no return typehint specified\\.$#"
14+
message: "#^Method Http\\\\Client\\\\Exception\\\\NetworkException\\:\\:setRequest\\(\\) has no return type specified\\.$#"
1515
count: 1
1616
path: src/Exception/NetworkException.php
1717

1818
-
19-
message: "#^Method Http\\\\Client\\\\Exception\\\\RequestException\\:\\:setRequest\\(\\) has no return typehint specified\\.$#"
19+
message: "#^Method Http\\\\Client\\\\Exception\\\\RequestException\\:\\:setRequest\\(\\) has no return type specified\\.$#"
2020
count: 1
2121
path: src/Exception/RequestException.php
22-

0 commit comments

Comments
 (0)