Skip to content
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

Class patches array #2496

Merged
merged 3 commits into from
Jan 12, 2024
Merged
Changes from 2 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
Original file line number Diff line number Diff line change
@@ -36,13 +36,25 @@ public function getConfigTreeBuilder(): TreeBuilder
->useAttributeAsKey('class_name')
->arrayPrototype()
->children()
->scalarNode('interface')->end()
->arrayNode('interface')
->beforeNormalization()->
castToArray()->end()
->scalarPrototype()->end()
->end()
->scalarNode('parent_class')->end()
->scalarNode('group')->end()
->scalarNode('description')->end()
->scalarNode('listing_parent_class')->end()
->scalarNode('use_traits')->end()
->scalarNode('listing_use_traits')->end()
->arrayNode('use_traits')
->beforeNormalization()->
castToArray()->end()
->scalarPrototype()->end()
->end()
->arrayNode('listing_use_traits')
->beforeNormalization()->
castToArray()->end()
->scalarPrototype()->end()
->end()
->arrayNode('fields')
->useAttributeAsKey('field_name')
->arrayPrototype()
25 changes: 19 additions & 6 deletions src/CoreShop/Bundle/ClassDefinitionPatchBundle/Patch.php
Original file line number Diff line number Diff line change
@@ -20,25 +20,38 @@

class Patch implements PatchInterface
{
private ?array $interface = null;
private ?array $useTraits = null;
private ?array $listingUseTraits = null;

public function __construct(
protected string $className,
protected ?string $interface,
string|array|null $interface,
protected ?string $parentClass,
protected ?string $group,
protected ?string $description,
protected ?string $listingParentClass,
protected ?string $useTraits,
protected ?string $listingUseTraits,
string|array|null $useTraits,
string|array|null $listingUseTraits,
protected ?array $fields,
) {
if (is_string($interface)) {
$this->interface = [$interface];
}
if (is_string($useTraits)) {
$this->useTraits = [$useTraits];
}
if (is_string($listingUseTraits)) {
$this->listingUseTraits = [$listingUseTraits];
}
}

public function getClassName(): string
{
return $this->className;
}

public function getInterface(): ?string
public function getInterface(): ?array
{
return $this->interface;
}
@@ -63,12 +76,12 @@ public function getListingParentClass(): ?string
return $this->listingParentClass;
}

public function getUseTraits(): ?string
public function getUseTraits(): ?array
{
return $this->useTraits;
}

public function getListingUseTraits(): ?string
public function getListingUseTraits(): ?array
{
return $this->listingUseTraits;
}
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ interface PatchInterface
{
public function getClassName(): string;

public function getInterface(): ?string;
public function getInterface(): ?array;

public function getParentClass(): ?string;

@@ -32,9 +32,9 @@ public function getDescription(): ?string;

public function getListingParentClass(): ?string;

public function getUseTraits(): ?string;
public function getUseTraits(): ?array;

public function getListingUseTraits(): ?string;
public function getListingUseTraits(): ?array;

/**
* @return PatchField[]|null
9 changes: 4 additions & 5 deletions src/CoreShop/Bundle/ClassDefinitionPatchBundle/Patcher.php
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@ protected function patchWithClassUpdate(PatchInterface $patch): ClassUpdate
}

if (null !== $patch->getInterface()) {
$interfaces = $classUpdater->getProperty('implementsInterfaces');
$interfaces = implode(',', $classUpdater->getProperty('implementsInterfaces'));

if (null === $interfaces || !str_contains($interfaces, $patch->getInterface())) {
if (!$interfaces) {
@@ -89,7 +89,7 @@ protected function patchWithClassUpdate(PatchInterface $patch): ClassUpdate
}

if (null !== $patch->getUseTraits()) {
$traits = $classUpdater->getProperty('useTraits');
$traits = implode(',', $classUpdater->getProperty('useTraits'));

if (null === $traits || !str_contains($traits, $patch->getUseTraits())) {
if (!$traits) {
@@ -103,7 +103,7 @@ protected function patchWithClassUpdate(PatchInterface $patch): ClassUpdate
}

if (null !== $patch->getListingParentClass()) {
$traits = $classUpdater->getProperty('listingParentClass');
$traits = implode(',', $classUpdater->getProperty('listingParentClass'));

if (null === $traits || !str_contains($traits, $patch->getListingUseTraits())) {
if (!$traits) {
@@ -120,8 +120,7 @@ protected function patchWithClassUpdate(PatchInterface $patch): ClassUpdate
if ($classUpdater->hasField($field->getFieldName())) {
if ($field->isReplace()) {
$classUpdater->replaceField($field->getFieldName(), $field->getDefinition());
}
else {
} else {
$classUpdater->replaceFieldProperties($field->getFieldName(), $field->getDefinition());
}
} elseif ($field->getBefore()) {