Skip to content

Commit 8287a83

Browse files
authored
Feature | Add Macroable Trait To Request & Connector Classes (#526)
* Feature | Add Macroable Trait To Request & Connector Classes * 🪄 Code Style Fixes * Updated to actions v6 * Baseline errors
1 parent 4c5875e commit 8287a83

6 files changed

Lines changed: 32 additions & 4 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
lint:
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v6
2525

2626
- name: Setup PHP
2727
uses: shivammathur/setup-php@v2

.github/workflows/phpstan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
name: phpstan
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v6
2323

2424
- name: Setup PHP
2525
uses: shivammathur/setup-php@v2

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
steps:
3333
- name: Checkout code
34-
uses: actions/checkout@v4
34+
uses: actions/checkout@v6
3535

3636
- name: Setup PHP
3737
uses: shivammathur/setup-php@v2

phpstan-baseline.neon

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,18 @@ parameters:
1212
count: 1
1313
path: src/Http/Connector.php
1414

15+
-
16+
message: '#^Parameter \#1 \$callback of function call_user_func_array expects callable\(\)\: mixed, \(callable\(\)\: mixed\)\|object given\.$#'
17+
identifier: argument.type
18+
count: 2
19+
path: src/Http/Connector.php
20+
21+
-
22+
message: '#^Parameter \#1 \$object of method ReflectionMethod\:\:invoke\(\) expects object\|null, class\-string\|object given\.$#'
23+
identifier: argument.type
24+
count: 1
25+
path: src/Http/Connector.php
26+
1527
-
1628
message: '#^Parameter \#1 \$response of method Saloon\\Http\\PendingRequest\:\:executeResponsePipeline\(\) expects Saloon\\Http\\Response, GuzzleHttp\\Promise\\PromiseInterface\|Saloon\\Http\\Response given\.$#'
1729
identifier: argument.type
@@ -54,6 +66,18 @@ parameters:
5466
count: 1
5567
path: src/Http/PendingRequest.php
5668

69+
-
70+
message: '#^Parameter \#1 \$callback of function call_user_func_array expects callable\(\)\: mixed, \(callable\(\)\: mixed\)\|object given\.$#'
71+
identifier: argument.type
72+
count: 2
73+
path: src/Http/Request.php
74+
75+
-
76+
message: '#^Parameter \#1 \$object of method ReflectionMethod\:\:invoke\(\) expects object\|null, class\-string\|object given\.$#'
77+
identifier: argument.type
78+
count: 1
79+
path: src/Http/Request.php
80+
5781
-
5882
message: '#^Parameter \#1 \$callback of function call_user_func_array expects callable\(\)\: mixed, \(callable\(\)\: mixed\)\|object given\.$#'
5983
identifier: argument.type

src/Http/Connector.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
use Saloon\Traits\Bootable;
88
use Saloon\Traits\Makeable;
9+
use Saloon\Traits\Macroable;
910
use Saloon\Traits\HasDebugging;
1011
use Saloon\Traits\Conditionable;
1112
use Saloon\Traits\HasMockClient;
@@ -29,10 +30,11 @@ abstract class Connector
2930
use HasMockClient;
3031
use SendsRequests;
3132
use Conditionable;
33+
use HasDebugging;
34+
use Macroable;
3235
use Bootable;
3336
use Makeable;
3437
use HasTries;
35-
use HasDebugging;
3638

3739
/**
3840
* Define the base URL of the API.

src/Http/Request.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Saloon\Enums\Method;
99
use Saloon\Traits\Bootable;
1010
use Saloon\Traits\Makeable;
11+
use Saloon\Traits\Macroable;
1112
use Saloon\Traits\HasDebugging;
1213
use Saloon\Traits\Conditionable;
1314
use Saloon\Traits\HasMockClient;
@@ -30,6 +31,7 @@ abstract class Request
3031
use HasMockClient;
3132
use Conditionable;
3233
use HasDebugging;
34+
use Macroable;
3335
use HasTries;
3436
use Bootable;
3537
use Makeable;

0 commit comments

Comments
 (0)