Skip to content

Commit

Permalink
Finalised support for Saloon v3
Browse files Browse the repository at this point in the history
  • Loading branch information
Sammyjo20 committed Sep 22, 2023
1 parent 1d4d5b3 commit f8afc1c
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
## Saloon HTTP Sender

This is the Laravel HTTP client sender for Saloon, to install it run the following command
This is the Laravel HTTP client sender for Saloon v3, to install it run the following command

```php
composer require saloonphp/laravel-http-sender
composer require saloonphp/laravel-http-sender "^2.0"
```
> Requires Laravel 9+ and PHP 8.1+
### Documentation

[Click here to read the documentation](https://docs.saloon.dev/v/2)
[Click here to read the documentation](https://docs.saloon.dev/plugins/laravel-integration)
3 changes: 2 additions & 1 deletion .github/workflows/php-cs-fixer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ name: Code Style
on:
push:
branches:
- 'main'
- 'v1'
- 'v2'
pull_request:
branches:
- '*'
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ name: PHPStan
on:
push:
branches:
- 'main'
- 'v1'
- 'v2'
pull_request:
branches:
- '*'
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ name: tests
on:
push:
branches:
- 'main'
- 'v1'
- 'v2'
pull_request:
branches:
- '*'
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"homepage": "https://github.com/sammyjo20",
"require": {
"php": "^8.1",
"saloonphp/saloon": "^v3.0.0-beta.4",
"illuminate/http": "^9.52 || ^10.0"
"illuminate/http": "^9.52 || ^10.0",
"saloonphp/saloon": "^v3.0.0-beta.5"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.5",
Expand Down
2 changes: 1 addition & 1 deletion tests/Feature/Body/HasBodyTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
test('the default body is loaded', function () {
$request = new HasBodyRequest();

expect($request->body()->get())->toEqual('name: Sam');
expect($request->body()->all())->toEqual('name: Sam');
});

test('the http sender properly sends it', function () {
Expand Down
2 changes: 1 addition & 1 deletion tests/Feature/Body/HasMultipartBodyTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
test('the default body is loaded', function () {
$request = new HasMultipartBodyRequest();

expect($request->body()->get())->toEqual([
expect($request->body()->all())->toEqual([
'nickname' => new MultipartValue('nickname', 'Sam', 'user.txt', ['X-Saloon' => 'Yee-haw!']),
]);
});
Expand Down
2 changes: 1 addition & 1 deletion tests/Feature/Body/HasXmlBodyTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
test('the default body is loaded', function () {
$request = new HasXmlBodyRequest();

expect($request->body()->get())->toEqual('<p>Howdy</p>');
expect($request->body()->all())->toEqual('<p>Howdy</p>');
});

test('the content-type header is set in the pending request', function () {
Expand Down

0 comments on commit f8afc1c

Please sign in to comment.