Skip to content

Commit 0b13729

Browse files
anfischeranfischer
authored
Merge pull request #2 from quick-order/v2.7.5
Upgrade fork to resemble upstream at tag 2.7.5
2 parents 970912e + b11faa1 commit 0b13729

15 files changed

+116
-126
lines changed

‎.github/workflows/php-cs-fixer.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Check & fix styling
2+
3+
on: [push]
4+
5+
jobs:
6+
style:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- name: Checkout code
11+
uses: actions/checkout@v2
12+
13+
- name: Fix style
14+
uses: docker://oskarstark/php-cs-fixer-ga
15+
with:
16+
args: --config=.php_cs --allow-risky=yes
17+
18+
- name: Extract branch name
19+
shell: bash
20+
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
21+
id: extract_branch
22+
23+
- name: Commit changes
24+
uses: stefanzweifel/[email protected]
25+
with:
26+
commit_message: Fix styling
27+
branch: ${{ steps.extract_branch.outputs.branch }}
28+
env:
29+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/psalm.yml

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

‎.github/workflows/run-tests.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,24 @@ jobs:
77
runs-on: ${{ matrix.os }}
88
strategy:
99
matrix:
10-
php: [7.4]
11-
laravel: [7.*, 6.*]
10+
php: [8.0, 7.4]
11+
laravel: [8.*, 7.*]
1212
dependency-version: [prefer-lowest, prefer-stable]
13-
os: [ubuntu-latest, windows-latest]
13+
os: [ubuntu-latest]
1414
include:
15+
- laravel: 8.*
16+
testbench: 6.*
1517
- laravel: 7.*
1618
testbench: 5.*
17-
- laravel: 6.*
18-
testbench: 4.*
1919

2020
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
2121

2222
steps:
2323
- name: Checkout code
24-
uses: actions/checkout@v1
24+
uses: actions/checkout@v2
2525

2626
- name: Cache dependencies
27-
uses: actions/cache@v1
27+
uses: actions/cache@v2
2828
with:
2929
path: ~/.composer/cache/files
3030
key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ composer.lock
33
docs
44
vendor
55
coverage
6+
.php_cs.cache

‎.php_cs

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?php
2+
3+
$finder = Symfony\Component\Finder\Finder::create()
4+
->notPath('bootstrap/*')
5+
->notPath('storage/*')
6+
->notPath('vendor')
7+
->in([
8+
__DIR__ . '/src',
9+
__DIR__ . '/tests',
10+
])
11+
->name('*.php')
12+
->notName('*.blade.php')
13+
->ignoreDotFiles(true)
14+
->ignoreVCS(true);
15+
16+
return PhpCsFixer\Config::create()
17+
->setRules([
18+
'@PSR2' => true,
19+
'array_syntax' => ['syntax' => 'short'],
20+
'ordered_imports' => ['sortAlgorithm' => 'alpha'],
21+
'no_unused_imports' => true,
22+
'not_operator_with_successor_space' => true,
23+
'trailing_comma_in_multiline_array' => true,
24+
'phpdoc_scalar' => true,
25+
'unary_operator_spaces' => true,
26+
'binary_operator_spaces' => true,
27+
'blank_line_before_statement' => [
28+
'statements' => ['break', 'continue', 'declare', 'return', 'throw', 'try'],
29+
],
30+
'phpdoc_single_line_var_spacing' => true,
31+
'phpdoc_var_without_name' => true,
32+
'class_attributes_separation' => [
33+
'elements' => [
34+
'method', 'property',
35+
],
36+
],
37+
'method_argument_space' => [
38+
'on_multiline' => 'ensure_fully_multiline',
39+
'keep_multiple_spaces_after_comma' => true,
40+
]
41+
])
42+
->setFinder($finder);

‎.scrutinizer.yml

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

‎.styleci.yml

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

‎CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@
22

33
All notable changes to `laravel-webhook-client` will be documented in this file
44

5+
## 2.7.5 - 2021-01-08
6+
7+
- Fix php constraint
8+
9+
## 2.7.4 - 2020-11-28
10+
11+
- add support for PHP 8
12+
13+
## 2.7.3 - 2020-10-10
14+
15+
- fix docblock
16+
17+
## 2.7.2 - 2020-09-08
18+
19+
- add support for Laravel 8
20+
521
## 2.7.1 - 2020-04-30
622

723
- use default webhook response as fallback (#60)

‎README.md

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

33
[![Latest Version on Packagist](https://img.shields.io/packagist/v/spatie/laravel-webhook-client.svg?style=flat-square)](https://packagist.org/packages/spatie/laravel-webhook-client)
44
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/spatie/laravel-webhook-client/run-tests?label=tests)
5-
[![StyleCI](https://github.styleci.io/repos/191398424/shield?branch=master)](https://github.styleci.io/repos/191398424)
6-
[![Quality Score](https://img.shields.io/scrutinizer/g/spatie/laravel-webhook-client.svg?style=flat-square)](https://scrutinizer-ci.com/g/spatie/laravel-webhook-client)
75
[![Total Downloads](https://img.shields.io/packagist/dt/spatie/laravel-webhook-client.svg?style=flat-square)](https://packagist.org/packages/spatie/laravel-webhook-client)
86

97
A webhook is a way for an app to provide information to another app about a specific event. The way the two apps communicate is with a simple HTTP request.
@@ -14,9 +12,7 @@ If you need to send webhooks, take a look at our [laravel-webhook-server](https:
1412

1513
## Support us
1614

17-
Learn how to create a package like this one, by watching our premium video course:
18-
19-
[![Laravel Package training](https://spatie.be/github/package-training.jpg)](https://laravelpackage.training)
15+
[<img src="https://github-ads.s3.eu-central-1.amazonaws.com/laravel-webhook-client.jpg?t=1" width="419px" />](https://spatie.be/github-ad-click/laravel-webhook-client)
2016

2117
We invest a lot of resources into creating [best in class open source packages](https://spatie.be/open-source). You can support us by [buying one of our paid products](https://spatie.be/open-source/support-us).
2218

@@ -45,7 +41,7 @@ return [
4541
'configs' => [
4642
[
4743
/*
48-
* This package support multiple webhook receiving endpoints. If you only have
44+
* This package supports multiple webhook receiving endpoints. If you only have
4945
* one endpoint receiving webhooks, you can use 'default'.
5046
*/
5147
'name' => 'default',

‎composer.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,14 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.3",
20-
"illuminate/bus": "^6.0|^7.0|^8.0",
21-
"illuminate/database": "^6.0|^7.0|^8.0",
22-
"illuminate/support": "^6.0|^7.0|^8.0"
19+
"php": "^8.0|^7.4",
20+
"illuminate/bus": "^7.0|^8.0",
21+
"illuminate/database": "^7.0|^8.0",
22+
"illuminate/support": "^7.0|^8.0"
2323
},
2424
"require-dev": {
2525
"orchestra/testbench": "^5.0|^6.0",
26-
"phpunit/phpunit": "^7.0|^8.2|^9.0",
27-
"psalm/plugin-laravel": "^1.2",
28-
"vimeo/psalm": "^3.11"
26+
"phpunit/phpunit": "^9.3.8"
2927
},
3028
"autoload": {
3129
"psr-4": {

0 commit comments

Comments
 (0)