fix code after merge

php-etl · Oct 30, 2023 · 3d3b395 · 3d3b395
1 parent c2e0bce
commit 3d3b395
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/Plugin/Filtering/Builder/Reject.php b/src/Plugin/Filtering/Builder/Reject.php
@@ -70,9 +70,9 @@ private function buildExclusions(Exclusion ...$exclusions): array
                                 new Node\Expr\Variable('input'),
                                 new Node\Expr\Yield_(
                                     new Node\Expr\New_(
-                                        $exclusion->reason ? new Node\Name\FullyQualified(RejectionWithReasonResultBucket::class) : new Node\Name\FullyQualified(RejectionResultBucket::class),
+                                        null !== $exclusion->reason ? new Node\Name\FullyQualified(RejectionWithReasonResultBucket::class) : new Node\Name\FullyQualified(RejectionResultBucket::class),
                                         [
-                                            null !== $this->rejection_serializer ? new Node\Arg($this->rejection_serializer) : new Node\Arg(new Node\Expr\Variable('input')),
+                                            null !== $exclusion->rejectionSerializer ? new Node\Arg($exclusion->rejectionSerializer) : new Node\Arg(new Node\Expr\Variable('input')),
                                             $exclusion->reason ? new Node\Arg($exclusion->reason) : new Node\Arg(
                                                 new Node\Expr\ConstFetch(
                                                     new Node\Name(null)

diff --git a/src/Plugin/Filtering/DTO/Exclusion.php b/src/Plugin/Filtering/DTO/Exclusion.php
@@ -10,6 +10,7 @@ class Exclusion
 {
     public function __construct(
         public Expr $when,
-        public ?Expr $reason = null
+        public ?Expr $reason = null,
+        public ?Expr $rejectionSerializer = null
     ){}
 }
diff --git a/src/Plugin/Filtering/Factory/Reject.php b/src/Plugin/Filtering/Factory/Reject.php
@@ -73,11 +73,9 @@ public function compile(array $config): Repository\Reject
                 new Filtering\DTO\Exclusion(
                     compileExpression($interpreter, $condition['when']),
                     compileValueWhenExpression($interpreter, $condition['reason']) ?: null,
+                    compileExpression($interpreter, $condition['rejection_serializer']) ?: null
                 ),
             );
-            if (\array_key_exists('rejection_serializer', $condition)) {
-                $builder->withRejectionSerializer(compileExpression($interpreter, $condition['rejection_serializer']));
-            }
         }
 
         return $repository;