Merge branch '3.2' into 4.0

coreshop · Dec 22, 2023 · 2e9bab9 · 2e9bab9
2 parents 974ea34 + 5428a25
commit 2e9bab9
Showing 5 changed files with 16 additions and 1 deletion.
diff --git a/src/CoreShop/Bundle/ClassDefinitionPatchBundle/DependencyInjection/Configuration.php b/src/CoreShop/Bundle/ClassDefinitionPatchBundle/DependencyInjection/Configuration.php
@@ -49,6 +49,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                                 ->children()
                                     ->scalarNode('after')->end()
                                     ->scalarNode('before')->end()
+                                    ->booleanNode('replace')->defaultTrue()->end()
                                     ->variableNode('definition')->end()
                                 ->end()
                             ->end()

diff --git a/.../ClassDefinitionPatchBundle/DependencyInjection/CoreShopClassDefinitionPatchExtension.php b/.../ClassDefinitionPatchBundle/DependencyInjection/CoreShopClassDefinitionPatchExtension.php
@@ -52,6 +52,7 @@ public function load(array $configs, ContainerBuilder $container): void
                         $field['after'] ?? null,
                         $field['before'] ?? null,
                         $field['definition'] ?? null,
+                        $field['replace'] ?? true,
                     ]),
                 );
 

diff --git a/src/CoreShop/Bundle/ClassDefinitionPatchBundle/PatchField.php b/src/CoreShop/Bundle/ClassDefinitionPatchBundle/PatchField.php
@@ -25,6 +25,7 @@ public function __construct(
         protected ?string $after,
         protected ?string $before,
         protected ?array $definition,
+        protected bool $replace = true,
     ) {
         if (null === $this->definition) {
             $this->definition = [];
@@ -52,4 +53,9 @@ public function getDefinition(): ?array
     {
         return $this->definition;
     }
+
+    public function isReplace(): bool
+    {
+        return $this->replace;
+    }
 }
diff --git a/src/CoreShop/Bundle/ClassDefinitionPatchBundle/PatchFieldInterface.php b/src/CoreShop/Bundle/ClassDefinitionPatchBundle/PatchFieldInterface.php
@@ -27,4 +27,6 @@ public function getAfter(): ?string;
     public function getBefore(): ?string;
 
     public function getDefinition(): ?array;
+
+    public function isReplace(): bool;
 }
diff --git a/src/CoreShop/Bundle/ClassDefinitionPatchBundle/Patcher.php b/src/CoreShop/Bundle/ClassDefinitionPatchBundle/Patcher.php
@@ -118,7 +118,12 @@ protected function patchWithClassUpdate(PatchInterface $patch): ClassUpdate
 
         foreach ($patch->getFields() as $field) {
             if ($classUpdater->hasField($field->getFieldName())) {
-                $classUpdater->replaceField($field->getFieldName(), $field->getDefinition());
+                if ($field->isReplace()) {
+                    $classUpdater->replaceField($field->getFieldName(), $field->getDefinition());
+                }
+                else {
+                    $classUpdater->replaceFieldProperties($field->getFieldName(), $field->getDefinition());
+                }
             } elseif ($field->getBefore()) {
                 $classUpdater->insertFieldBefore($field->getBefore(), $field->getDefinition());
             } elseif ($field->getAfter()) {