Skip to content

Commit 6f31bcf

Browse files
committed
[Studio] fix behat tests
1 parent b417155 commit 6f31bcf

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

src/CoreShop/Component/Rule/Model/Action.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
use CoreShop\Component\Resource\Model\ResourceInterface;
2121
use CoreShop\Component\Resource\Model\SetValuesTrait;
2222
use Doctrine\Common\Collections\Collection;
23+
use CoreShop\Component\Rule\Model\ActionInterface;
24+
use CoreShop\Component\Rule\Model\ConditionInterface;
2325

2426
/**
2527
* @psalm-suppress MissingConstructor
@@ -90,7 +92,9 @@ public function setConfiguration(array $configuration)
9092
private function normalizeConfiguration(array $configuration): array
9193
{
9294
foreach ($configuration as $key => $value) {
93-
if ($value instanceof Collection) {
95+
if ($value instanceof ConditionInterface || $value instanceof ActionInterface) {
96+
continue;
97+
} elseif ($value instanceof Collection) {
9498
$configuration[$key] = $this->normalizeConfiguration($value->toArray());
9599
} elseif ($value instanceof ResourceInterface) {
96100
$configuration[$key] = $value->getId();

src/CoreShop/Component/Rule/Model/Condition.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
use CoreShop\Component\Resource\Model\ResourceInterface;
2121
use CoreShop\Component\Resource\Model\SetValuesTrait;
2222
use Doctrine\Common\Collections\Collection;
23+
use CoreShop\Component\Rule\Model\ActionInterface;
24+
use CoreShop\Component\Rule\Model\ConditionInterface;
2325

2426
/**
2527
* @psalm-suppress MissingConstructor
@@ -90,7 +92,9 @@ public function setConfiguration(array $configuration)
9092
private function normalizeConfiguration(array $configuration): array
9193
{
9294
foreach ($configuration as $key => $value) {
93-
if ($value instanceof Collection) {
95+
if ($value instanceof ConditionInterface || $value instanceof ActionInterface) {
96+
continue;
97+
} elseif ($value instanceof Collection) {
9498
$configuration[$key] = $this->normalizeConfiguration($value->toArray());
9599
} elseif ($value instanceof ResourceInterface) {
96100
$configuration[$key] = $value->getId();

0 commit comments

Comments
 (0)