8000 [Workflow] Introduce concept of SupportStrategyInterface by andesk · Pull Request #20751 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Workflow] Introduce concept of SupportStrategyInterface #20751

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.

Sign up for GitHub

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

Closed
wants to merge 13 commits into from
Closed

[Workflow] Introduce concept of SupportStrategyInterface #20751

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6421c10
[Workflow] Introduce concept of SupprtStrategyInterface to allow othe…
andesk Dec 4, 2016
bfd3611
[Workflow] Refactoring to resolve BC break and adding deprecated warning
andesk Dec 5, 2016
c0cbc85
[Workflow] Moving and tagging legacy unit tests
andesk Dec 6, 2016
fa448af
[Workflow] Some CS fixes
andesk Dec 10, 2016
19fb676
[Workflow] Removing some docblocks
andesk Dec 10, 2016
faddc97
Merge remote-tracking branch 'upstream/3.2' into 3.2
andesk Dec 10, 2016
a115bdd
Merge remote-tracking branch 'upstream/3.2' into 3.2
andesk Dec 14, 2016
d22fe01
[Workflow] fixing service definition of workflow registry in framewor…
andesk Dec 14, 2016
047a2e7
[Workflow] fixing code style mostly, removing exception
andesk Dec 17, 2016
a34e4af
[Workflow] tiny cs fix in docblock...
andesk Dec 17, 2016
1e65b12
[Workflow] removing deprecated test case for removed InvalidArgumentE…
andesk Dec 17, 2016
f4e0d62
Merge remote-tracking branch 'upstream/3.2' into 3.2
andesk Dec 17, 2016
2d11004
[Workflow] Some more adaptions after code review comments, not finish…
andesk Jan 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[Workflow] Removing some docblocks
  • Loading branch information
@andesk
andesk committed Dec 10, 2016
commit 19fb676c72972c67cee64a25bd4090f0b7bf3d70
9 changes: 0 additions & 9 deletions src/Symfony/Component/Workflow/Event/Event.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,16 @@ public function __construct($subject, Marking $marking, Transition $transition)
$this->transition = $transition;
}

/**
* @return Marking
*/
public function getMarking()
{
return $this->marking;
}

/**
* @return object
*/
public function getSubject()
{
return $this->subject;
}

/**
* @return Transition
*/
public function getTransition()
{
return $this->transition;
Expand Down
6 changes: 0 additions & 6 deletions src/Symfony/Component/Workflow/Event/GuardEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,11 @@ class GuardEvent extends Event
{
private $blocked = false;

/**
* @return bool
*/
public function isBlocked()
{
return $this->blocked;
}

/**
* @param bool $blocked
*/
public function setBlocked($blocked)
{
$this->blocked = (bool) $blocked;
Expand Down
8 changes: 0 additions & 8 deletions src/Symfony/Component/Workflow/Registry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,6 @@ public function get($subject, $workflowName = null)
return $matched;
}

/**
* @param Workflow $workflow
* @param string|SupportStrategyInterface $supportStrategy
* @param object $subject
* @param null|string $workflowName
*
* @return bool
*/
private function supports(Workflow $workflow, $supportStrategy, $subject, $workflowName)
{
if (is_string($supportStrategy) && !$subject instanceof $supportStrategy) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a comment before this line:

// Keep BC. To be removed in 4.0

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than dealing with BC here, I would convert the string to a SupportStrategy when setting it instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So @stof , you mean that inside the add() method I would create a ClassInstanceSupportStrategy in the deprecation case?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should I still add a BC comment somewhere? ping @lyrixx ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The two conditions could then be simplified to:

if (!$supportStrategy->supports($workflow, $subject)) {
    return false;
}

Expand Down
0