Skip to content

Commit f165ff1

Browse files
committed
PR fixes
1 parent 423ce9c commit f165ff1

File tree

2 files changed

+20
-14
lines changed

2 files changed

+20
-14
lines changed

src/Action.php

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@ class Action
1919
* Initiate the given action.
2020
*
2121
* @param string $action
22+
* @param mixed ...$arguments
2223
*
2324
* @throws Throwable
2425
*
25-
* @return mixed|void
26+
* @return mixed
2627
*/
27-
public function act(string $action)
28+
public function act(string $action, ...$arguments)
2829
{
29-
$this->arguments = array_slice(func_get_args(), 1);
30+
$this->arguments = $arguments;
3031

3132
return $this->handle($action);
3233
}
@@ -36,15 +37,16 @@ public function act(string $action)
3637
*
3738
* @param $condition
3839
* @param string $action
40+
* @param mixed ...$arguments
3941
*
4042
* @throws Throwable
4143
*
4244
* @return mixed|void
4345
*/
44-
public function actWhen($condition, string $action)
46+
public function actWhen($condition, string $action, ...$arguments)
4547
{
4648
if ($condition) {
47-
$this->arguments = array_slice(func_get_args(), 2);
49+
$this->arguments = $arguments;
4850

4951
return $this->handle($action);
5052
}
@@ -55,12 +57,13 @@ public function actWhen($condition, string $action)
5557
*
5658
* @param $condition
5759
* @param string $action
60+
* @param mixed ...$arguments
5861
*
5962
* @throws Throwable
6063
*
6164
* @return mixed|void
6265
*/
63-
public function actUnless($condition, string $action)
66+
public function actUnless($condition, string $action, ...$arguments)
6467
{
6568
if (! $condition) {
6669
$this->arguments = array_slice(func_get_args(), 2);

src/helpers.php

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@
77
* Initiate the given action.
88
*
99
* @param string $action
10+
* @param mixed ...$arguments
1011
*
1112
* @throws Throwable
1213
*
1314
* @return mixed
1415
*/
15-
function act(string $action)
16+
function act(string $action, ...$arguments)
1617
{
17-
return app(Action::class)->act($action, ...array_slice(func_get_args(), 1));
18+
return app(Action::class)->act($action, ...$arguments);
1819
}
1920
}
2021

@@ -24,14 +25,15 @@ function act(string $action)
2425
*
2526
* @param $condition
2627
* @param string $action
28+
* @param mixed ...$arguments
2729
*
2830
* @throws Throwable
2931
*
30-
* @return mixed|void
32+
* @return mixed
3133
*/
32-
function act_when($condition, string $action)
34+
function act_when($condition, string $action, ...$arguments)
3335
{
34-
return app(Action::class)->actWhen($condition, $action, ...array_slice(func_get_args(), 2));
36+
return app(Action::class)->actWhen($condition, $action, ...$arguments);
3537
}
3638
}
3739

@@ -41,13 +43,14 @@ function act_when($condition, string $action)
4143
*
4244
* @param $condition
4345
* @param string $action
46+
* @param mixed ...$arguments
4447
*
4548
* @throws Throwable
4649
*
47-
* @return mixed|void
50+
* @return mixed
4851
*/
49-
function act_unless($condition, string $action)
52+
function act_unless($condition, string $action, ...$arguments)
5053
{
51-
return app(Action::class)->actUnless($condition, $action, ...array_slice(func_get_args(), 2));
54+
return app(Action::class)->actUnless($condition, $action, ...$arguments);
5255
}
5356
}

0 commit comments

Comments
 (0)