Skip to content
This repository was archived by the owner on Feb 8, 2024. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
],
"require": {
"php": "^7.1.3",
"symfony/options-resolver": "^4.0"
"curlyspoon/nested-options-resolver": "^1.0"
},
"require-dev": {
"laravel/lumen-framework": "^5.6",
Expand Down
31 changes: 17 additions & 14 deletions src/Elements/Element.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
namespace Curlyspoon\Core\Elements;

use Curlyspoon\Core\Contracts\Element as ElementContract;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Curlyspoon\NestedOptionsResolver\OptionsResolver;
use Symfony\Component\OptionsResolver\OptionsResolver as SymfonyOptionsResolver;

abstract class Element implements ElementContract
{
Expand Down Expand Up @@ -40,6 +41,13 @@ abstract class Element implements ElementContract
*/
protected $values = [];

/**
* @var array
*
* @see OptionsResolver::setNested()
*/
protected $nested = [];

/**
* @var array
*/
Expand Down Expand Up @@ -72,20 +80,15 @@ public function __toString(): string
return $this->toString();
}

protected function optionsResolver(): OptionsResolver
protected function optionsResolver(): SymfonyOptionsResolver
{
$resolver = new OptionsResolver();
$resolver->setDefaults($this->defaults);

$resolver->setRequired($this->required);

foreach ($this->types as $option => $types) {
$resolver->setAllowedTypes($option, $types);
}

foreach ($this->values as $option => $values) {
$resolver->setAllowedValues($option, $values);
}
$resolver = OptionsResolver::make([
'defaults' => $this->defaults,
'required' => $this->required,
'types' => $this->types,
'values' => $this->values,
'nested' => $this->nested,
]);

if (method_exists($this, 'configureOptions')) {
$this->configureOptions($resolver);
Expand Down