-
-
Notifications
You must be signed in to change notification settings - Fork 50
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 callable field #321
Open
Florian-Merle
wants to merge
4
commits into
Sylius:1.14
Choose a base branch
from
Florian-Merle:callback-field
base: 1.14
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
add callable field #321
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
parameters: | ||
ignoreErrors: | ||
- | ||
message: "#^Dead catch \\- Throwable is never thrown in the try block\\.$#" | ||
count: 1 | ||
path: src/Component/FieldTypes/CallableFieldType.php |
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 |
---|---|---|
@@ -0,0 +1,25 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of the Sylius package. | ||
* | ||
* (c) Sylius Sp. z o.o. | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
*/ | ||
|
||
declare(strict_types=1); | ||
|
||
namespace Sylius\Bundle\GridBundle\Builder\Field; | ||
|
||
final class CallableField | ||
{ | ||
public static function create(string $name, callable $callable, bool $htmlspecialchars = true): FieldInterface | ||
{ | ||
return Field::create($name, 'callable') | ||
->setOption('callable', $callable) | ||
->setOption('htmlspecialchars', $htmlspecialchars) | ||
; | ||
} | ||
} |
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,63 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of the Sylius package. | ||
* | ||
* (c) Sylius Sp. z o.o. | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
*/ | ||
|
||
declare(strict_types=1); | ||
|
||
namespace Sylius\Bundle\GridBundle\Parser; | ||
|
||
final class OptionsParser implements OptionsParserInterface | ||
{ | ||
public function parseOptions(array $parameters): array | ||
{ | ||
return array_map( | ||
/** | ||
* @param mixed $parameter | ||
* | ||
* @return mixed | ||
*/ | ||
function ($parameter) { | ||
if (is_array($parameter)) { | ||
return $this->parseOptions($parameter); | ||
} | ||
|
||
return $this->parseOption($parameter); | ||
}, | ||
$parameters, | ||
); | ||
} | ||
|
||
/** | ||
* @param mixed $parameter | ||
* | ||
* @return mixed | ||
*/ | ||
private function parseOption($parameter) | ||
{ | ||
if (!is_string($parameter)) { | ||
return $parameter; | ||
} | ||
|
||
if (0 === strpos($parameter, 'callable:')) { | ||
return $this->parseOptionCallable(substr($parameter, 9)); | ||
} | ||
|
||
return $parameter; | ||
} | ||
|
||
private function parseOptionCallable(string $callable): \Closure | ||
{ | ||
if (!is_callable($callable)) { | ||
throw new \RuntimeException(\sprintf('%s is not a callable.', $callable)); | ||
} | ||
|
||
return $callable(...); | ||
} | ||
} |
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,19 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of the Sylius package. | ||
* | ||
* (c) Sylius Sp. z o.o. | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
*/ | ||
|
||
declare(strict_types=1); | ||
|
||
namespace Sylius\Bundle\GridBundle\Parser; | ||
|
||
interface OptionsParserInterface | ||
{ | ||
public function parseOptions(array $parameters): array; | ||
} |
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 |
---|---|---|
|
@@ -128,5 +128,8 @@ | |
<tag name="maker.command" /> | ||
</service> | ||
<service id="Sylius\Bundle\GridBundle\Maker\MakeGrid" alias="sylius.grid.maker" /> | ||
|
||
<service id="sylius.grid.options_parser" class="Sylius\Bundle\GridBundle\Parser\OptionsParser" /> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @GSadee Since the SyliusResourceBundle has already a service with a similar id ( |
||
<service id="Sylius\Bundle\GridBundle\Parser\OptionsParserInterface" alias="sylius.grid.options_parser" /> | ||
</services> | ||
</container> |
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
Oops, something went wrong.
Oops, something went wrong.
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.
To match existing documentation, please add YAML example as well.
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.
I did not include documentation for the YAML format because I believe it's impossible to define a callback field in this format.
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.
Feature is not complete then and cannot be merged until YAML support will be dropped.
Here is example on how callback can be implemented with non-php config format.
https://symfony.com/doc/current/reference/constraints/Callback.html#external-callbacks-and-closures
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.
I think we can do it. The repository can be a callback in YAML.
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.
I reworked the feature and introduced a new way to define callbacks, inspired by Loic's comment:
This approach allows string callables to be defined directly in YAML.
When configuring grids using PHP, both string and array callables are supported.
When configuring grids using service definitions, everything is supported: string callables, array callables, and closures.
I’ve documented this change here: SyliusGridBundle PR #321.
To implement this, I copied the
OptionParser
class from the ResourceBundle, slimming it down to only what’s necessary for this feature (handling callbacks). See the original class: OptionsParser in ResourceBundle.Since the resource bundle is not a required dependencie, I think this is fine to copy the class. However having two
OptionParser
might not be ideal. Please let me know what you think about it.