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.

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

Class patches array #2496

Merged
merged 3 commits into from
Jan 12, 2024
Merged

Class patches array #2496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
822e4c8
[Patches] allow array for interfaces, traits and listing-traits
dpfaffenbauer Dec 27, 2023
e07df20
[Patches] allow array for interfaces, traits and listing-traits
dpfaffenbauer Dec 27, 2023
e940e75
[ClassDefinitionPatch] fix use of array for traits, interfaces and li…
dpfaffenbauer Jan 9, 2024
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
1 change: 1 addition & 0 deletions psalm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@
<referencedMethod name="Symfony\Component\Config\Definition\Builder\NodeDefinition::integerNode" />
<referencedMethod name="Symfony\Component\Config\Definition\Builder\NodeDefinition::scalarNode" />
<referencedMethod name="Symfony\Component\Config\Definition\Builder\NodeDefinition::variableNode" />
<referencedMethod name="Symfony\Component\Config\Definition\Builder\NodeDefinition::scalarPrototype" />
<referencedMethod name="Symfony\Component\Config\Definition\Builder\NodeParentInterface::end" />
</errorLevel>
</PossiblyUndefinedMethod>
Expand Down
18 changes: 15 additions & 3 deletions src/CoreShop/Bundle/ClassDefinitionPatchBundle/DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
25 changes: 19 additions & 6 deletions src/CoreShop/Bundle/ClassDefinitionPatchBundle/Patch.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions src/CoreShop/Bundle/ClassDefinitionPatchBundle/PatchInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ interface PatchInterface
{
public function getClassName(): string;

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

public function getParentClass(): ?string;

Expand All @@ -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
Expand Down
57 changes: 32 additions & 25 deletions src/CoreShop/Bundle/ClassDefinitionPatchBundle/Patcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,51 +77,58 @@ protected function patchWithClassUpdate(PatchInterface $patch): ClassUpdate
if (null !== $patch->getInterface()) {
$interfaces = $classUpdater->getProperty('implementsInterfaces');

if (null === $interfaces || !str_contains($interfaces, $patch->getInterface())) {
if (!$interfaces) {
$interfaces = $patch->getInterface();
} else {
$interfaces .= sprintf(',%s', $patch->getInterface());
}
foreach ($patch->getInterface() as $patchInterface) {
if (null === $interfaces || !str_contains($interfaces, $patchInterface)) {
if (!$interfaces) {
$interfaces = $patchInterface;
} else {
$interfaces .= sprintf(',%s', $patchInterface);
}

$classUpdater->setProperty('implementsInterfaces', $interfaces);
}
}

$classUpdater->setProperty('implementsInterfaces', $interfaces);
}

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

if (null === $traits || !str_contains($traits, $patch->getUseTraits())) {
if (!$traits) {
$traits = $patch->getUseTraits();
} else {
$traits .= sprintf(',%s', $patch->getUseTraits());
}
foreach ($patch->getUseTraits() as $patchTrait) {
if (null === $traits || !str_contains($traits, $patchTrait)) {
if (!$traits) {
$traits = $patchTrait;
} else {
$traits .= sprintf(',%s', $patchTrait);
}

$classUpdater->setProperty('useTraits', $traits);
}
}

$classUpdater->setProperty('useTraits', $traits);
}

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

if (null === $traits || !str_contains($traits, $patch->getListingUseTraits())) {
if (!$traits) {
$traits = $patch->getListingUseTraits();
} else {
$traits .= sprintf(',%s', $patch->getListingUseTraits());
$traits = $classUpdater->getProperty('listingUseTraits');

foreach ($patch->getListingUseTraits() as $patchListingUseTrait) {
if (null === $traits || !str_contains($traits, $patchListingUseTrait)) {
if (!$traits) {
$traits = $patchListingUseTrait;
} else {
$traits .= sprintf(',%s', $patchListingUseTrait);
}
}

$classUpdater->setProperty('listingParentClass', $traits);
}

$classUpdater->setProperty('listingUseTraits', $traits);
}

foreach ($patch->getFields() as $field) {
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()) {
Expand Down