-
-
Notifications
You must be signed in to change notification settings - Fork 129
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add support for AsPipeline concern #304
Open
stevenmaguire
wants to merge
9
commits into
lorisleiva:main
Choose a base branch
from
stevenmaguire:sm-add-pipeline-decorator
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
ea22de3
Remove trailing whitespace on empty lines
stevenmaguire 15b77de
Add support for AsPipeline concern
stevenmaguire 5da4c16
Remove superflous else condition
stevenmaguire 044569e
Add backup handling logic in PipelineDecorator if asPipeline method i…
stevenmaguire 8db4150
Update code style in the name of elegance
stevenmaguire 6aa97e6
Remove possible dead code path
stevenmaguire af9f9c5
Move pipeline closure resolution logic to decorator and expand test c…
stevenmaguire 96a9a19
Remove superfluous code from tests
stevenmaguire 4d936c0
Remover superflous label from test conditions
stevenmaguire File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,4 +10,5 @@ trait AsAction | |
use AsJob; | ||
use AsCommand; | ||
use AsFake; | ||
use AsPipeline; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
<?php | ||
|
||
namespace Lorisleiva\Actions\Concerns; | ||
|
||
trait AsPipeline | ||
{ | ||
// | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
<?php | ||
|
||
namespace Lorisleiva\Actions\Decorators; | ||
|
||
use Closure; | ||
use Exception; | ||
use Lorisleiva\Actions\Concerns\DecorateActions; | ||
|
||
class PipelineDecorator | ||
{ | ||
use DecorateActions; | ||
|
||
public function __construct($action) | ||
{ | ||
$this->setAction($action); | ||
} | ||
|
||
public function __invoke(mixed ...$arguments): mixed | ||
{ | ||
return $this->handleFromAnyMethod(...$arguments); | ||
} | ||
|
||
public function handle(mixed ...$arguments): mixed | ||
{ | ||
return $this->handleFromAnyMethod(...$arguments); | ||
} | ||
|
||
/** | ||
* Typical pipeline behavior expects two things: | ||
* | ||
* 1) The pipe class to expect a single incoming parameter (along with | ||
* a closure) and single return value. | ||
* 2) The pipe class to be aware of the next closure and determine what | ||
* should be passed into the next pipe. | ||
* | ||
* Because of these expectations, this behavior is asserting two opinions: | ||
* | ||
* 1) Regardless of the number of parameters provided to the asPipeline | ||
* method implemented here, only the first will be supplied to the | ||
* invoked Action. | ||
* 2) If the invoked Action does not return anything, then the next | ||
* closure will be supplied the same parameter. However, if the | ||
* invoked action does return a non-null value, that value will | ||
* be supplied to the next closure. | ||
*/ | ||
protected function handleFromAnyMethod(mixed ...$arguments): mixed | ||
{ | ||
$passable = array_shift($arguments); | ||
$closure = array_pop($arguments); | ||
$returned = null; | ||
|
||
if ($this->hasMethod('asPipeline')) { | ||
$returned = $this->callMethod('asPipeline', [$passable]); | ||
} elseif ($this->hasMethod('handle')) { | ||
$returned = $this->callMethod('handle', [$passable]); | ||
} | ||
|
||
return $closure($returned ?? $passable); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
<?php | ||
|
||
namespace Lorisleiva\Actions\DesignPatterns; | ||
|
||
use Illuminate\Pipeline\Pipeline; | ||
use Lorisleiva\Actions\BacktraceFrame; | ||
use Lorisleiva\Actions\Concerns\AsPipeline; | ||
use Lorisleiva\Actions\Decorators\PipelineDecorator; | ||
use Lorisleiva\Actions\DesignPatterns\DesignPattern; | ||
|
||
class PipelineDesignPattern extends DesignPattern | ||
{ | ||
public function getTrait(): string | ||
{ | ||
return AsPipeline::class; | ||
} | ||
|
||
public function recognizeFrame(BacktraceFrame $frame): bool | ||
{ | ||
return $frame->matches(Pipeline::class, 'Illuminate\Pipeline\{closure}'); | ||
} | ||
|
||
public function decorate($instance, BacktraceFrame $frame) | ||
{ | ||
return app(PipelineDecorator::class, ['action' => $instance]); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,210 @@ | ||
<?php | ||
|
||
namespace Lorisleiva\Actions\Tests; | ||
|
||
use ArgumentCountError; | ||
use Closure; | ||
use Illuminate\Support\Facades\Pipeline; | ||
use Lorisleiva\Actions\Concerns\AsAction; | ||
use Lorisleiva\Actions\Concerns\AsPipeline; | ||
|
||
class AsPipelinePassable | ||
{ | ||
public function __construct(public int $count = 0) | ||
{ | ||
// | ||
} | ||
|
||
public function increment() | ||
{ | ||
$this->count++; | ||
} | ||
} | ||
|
||
class AsPipelineExplicitTest | ||
{ | ||
use AsPipeline; | ||
|
||
public function handle(AsPipelinePassable $passable): void | ||
{ | ||
$passable->increment(); | ||
} | ||
|
||
public function asPipeline(AsPipelinePassable $passable): AsPipelinePassable | ||
{ | ||
$this->handle($passable); | ||
|
||
return $passable; | ||
} | ||
} | ||
|
||
class AsPipelineImplicitTest | ||
{ | ||
use AsAction; | ||
|
||
public function handle(AsPipelinePassable $passable): void | ||
{ | ||
$passable->increment(); | ||
} | ||
|
||
public function asPipeline(AsPipelinePassable $passable): AsPipelinePassable | ||
{ | ||
$this->handle($passable); | ||
|
||
return $passable; | ||
} | ||
} | ||
|
||
class AsPipelineMultipleParamTest | ||
{ | ||
use AsAction; | ||
|
||
public function handle(AsPipelinePassable $passable): void | ||
{ | ||
$passable->increment(); | ||
} | ||
|
||
public function asPipeline(AsPipelinePassable $passable, int $foo): AsPipelinePassable | ||
{ | ||
$this->handle($passable); | ||
|
||
return $passable; | ||
} | ||
} | ||
|
||
class AsPipelineSingleParamHandleOnlyTest | ||
{ | ||
use AsAction; | ||
|
||
public function handle(AsPipelinePassable $passable): void | ||
{ | ||
$passable->increment(); | ||
} | ||
} | ||
|
||
class AsPipelineMultipleParamHandleOnlyTest | ||
{ | ||
use AsAction; | ||
|
||
public function handle(AsPipelinePassable $passable, int $foo): void | ||
{ | ||
$passable->increment(); | ||
} | ||
} | ||
|
||
class AsPipelineWithoutHandleOrAsPipeline | ||
{ | ||
use AsAction; | ||
} | ||
|
||
function getAnonymous() { | ||
return function (AsPipelinePassable $p, $next) { | ||
$p->increment(); | ||
|
||
return $next($p); | ||
}; | ||
} | ||
|
||
function getPassable() { | ||
return new AsPipelinePassable; | ||
} | ||
|
||
it('can run as a pipe in a pipeline, with explicit trait', function () { | ||
$anonymous = getAnonymous(); | ||
$passable = Pipeline::send(getPassable()) | ||
->through([ | ||
AsPipelineExplicitTest::class, | ||
$anonymous, | ||
AsPipelineExplicitTest::class, | ||
$anonymous, | ||
]) | ||
->thenReturn(); | ||
|
||
expect(is_object($passable))->toBe(true); | ||
expect($passable->count)->toBe(4); | ||
}); | ||
|
||
it('can run as a pipe in a pipeline, with implicit trait', function () { | ||
$anonymous = getAnonymous(); | ||
$passable = Pipeline::send(getPassable()) | ||
->through([ | ||
AsPipelineImplicitTest::class, | ||
$anonymous, | ||
AsPipelineImplicitTest::class, | ||
$anonymous, | ||
]) | ||
->thenReturn(); | ||
|
||
expect(is_object($passable))->toBe(true); | ||
expect($passable->count)->toBe(4); | ||
}); | ||
|
||
it('can run as a pipe in a pipeline, without an explicit asPipeline method', function () { | ||
$anonymous = getAnonymous(); | ||
$passable = Pipeline::send(getPassable()) | ||
->through([ | ||
AsPipelineSingleParamHandleOnlyTest::class, | ||
$anonymous, | ||
AsPipelineSingleParamHandleOnlyTest::class, | ||
$anonymous, | ||
]) | ||
->thenReturn(); | ||
|
||
expect(is_object($passable))->toBe(true); | ||
expect($passable->count)->toBe(4); | ||
}); | ||
|
||
it('can run as a noop/passthrough pipe in a pipeline, without a handle or asPipeline method', function () { | ||
$anonymous = getAnonymous(); | ||
$passable = Pipeline::send(getPassable()) | ||
->through([ | ||
AsPipelineWithoutHandleOrAsPipeline::class, | ||
$anonymous, | ||
AsPipelineWithoutHandleOrAsPipeline::class, | ||
$anonymous, | ||
]) | ||
->thenReturn(); | ||
|
||
expect(is_object($passable))->toBe(true); | ||
expect($passable->count)->toBe(2); | ||
}); | ||
|
||
it('can run with an arbitrary via method configured on Pipeline', function () { | ||
$anonymous = getAnonymous(); | ||
$passable = Pipeline::send(getPassable()) | ||
->via('foobar') | ||
->through([ | ||
AsPipelineImplicitTest::class, | ||
$anonymous, | ||
AsPipelineImplicitTest::class, | ||
$anonymous, | ||
]) | ||
->thenReturn(); | ||
|
||
expect(is_object($passable))->toBe(true); | ||
expect($passable->count)->toBe(4); | ||
}); | ||
|
||
it('cannot run as a pipe in a pipeline, with an explicit asPipeline method expecting multiple non-optional params', function () { | ||
$anonymous = getAnonymous(); | ||
$passable = Pipeline::send(getPassable()) | ||
->through([ | ||
AsPipelineMultipleParamTest::class, | ||
$anonymous, | ||
AsPipelineMultipleParamTest::class, | ||
$anonymous, | ||
]) | ||
->thenReturn(); | ||
})->throws(ArgumentCountError::class, 'Too few arguments to function Lorisleiva\Actions\Tests\AsPipelineMultipleParamTest::asPipeline(), 1 passed and exactly 2 expected'); | ||
|
||
it('cannot run as a pipe in a pipeline, without an explicit asPipeline method and multiple non-optional handle params', function () { | ||
$anonymous = getAnonymous(); | ||
$passable = Pipeline::send(getPassable()) | ||
->through([ | ||
AsPipelineMultipleParamHandleOnlyTest::class, | ||
$anonymous, | ||
AsPipelineMultipleParamHandleOnlyTest::class, | ||
$anonymous, | ||
]) | ||
->thenReturn(); | ||
})->throws(ArgumentCountError::class, 'Too few arguments to function Lorisleiva\Actions\Tests\AsPipelineMultipleParamHandleOnlyTest::handle(), 1 passed and exactly 2 expected'); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
100% personal preference here but I'd prefer:
Here to remove the
else