Variadic function args.

Author: bobthecow

src/RuleBuilder.php

@@ -56,23 +56,21 @@ public function registerOperatorNamespace(string $namespace): self
     /**
      * Create a logical AND operator proposition.
      *
-     * @param Proposition $prop      Initial Proposition
-     * @param Proposition $prop2,... Optional unlimited number of additional Propositions
+     * @param Proposition ...$props One or more Propositions
      */
-    public function logicalAnd(Proposition $prop, Proposition $prop2 = null): Operator\LogicalAnd
+    public function logicalAnd(Proposition ...$props): Operator\LogicalAnd
     {
-        return new Operator\LogicalAnd(\func_get_args());
+        return new Operator\LogicalAnd($props);
     }
 
     /**
      * Create a logical OR operator proposition.
      *
-     * @param Proposition $prop      Initial Proposition
-     * @param Proposition $prop2,... Optional unlimited number of additional Propositions
+     * @param Proposition ...$props One or more Propositions
      */
-    public function logicalOr(Proposition $prop, Proposition $prop2 = null): Operator\LogicalOr
+    public function logicalOr(Proposition ...$props): Operator\LogicalOr
     {
-        return new Operator\LogicalOr(\func_get_args());
+        return new Operator\LogicalOr($props);
     }
 
     /**
@@ -88,12 +86,11 @@ public function logicalNot(Proposition $prop): Operator\LogicalNot
     /**
      * Create a logical XOR operator proposition.
      *
-     * @param Proposition $prop      Initial Proposition
-     * @param Proposition $prop2,... Optional unlimited number of additional Propositions
+     * @param Proposition ...$props One or more Propositions
      */
-    public function logicalXor(Proposition $prop, Proposition $prop2 = null): Operator\LogicalXor
+    public function logicalXor(Proposition ...$props): Operator\LogicalXor
     {
-        return new Operator\LogicalXor(\func_get_args());
+        return new Operator\LogicalXor($props);
     }
 
     /**

src/RuleBuilder/Variable.php

@@ -227,24 +227,24 @@ public function notSameAs($variable): Operator\NotSameAs
         return new Operator\NotSameAs($this, $this->asVariable($variable));
     }
 
-    public function union($variable): self
+    public function union(...$variables): self
     {
-        return $this->applySetOperator('Union', \func_get_args());
+        return $this->applySetOperator('Union', $variables);
     }
 
-    public function intersect($variable): self
+    public function intersect(...$variables): self
     {
-        return $this->applySetOperator('Intersect', \func_get_args());
+        return $this->applySetOperator('Intersect', $variables);
     }
 
-    public function complement($variable): self
+    public function complement(...$variables): self
     {
-        return $this->applySetOperator('Complement', \func_get_args());
+        return $this->applySetOperator('Complement', $variables);
     }
 
-    public function symmetricDifference($variable): self
+    public function symmetricDifference(...$variables): self
     {
-        return $this->applySetOperator('SymmetricDifference', \func_get_args());
+        return $this->applySetOperator('SymmetricDifference', $variables);
     }
 
     public function min(): self

src/Set.php

@@ -93,14 +93,14 @@ public function setContains(Value $value): bool
      *
      * Returns a Set which is the union of this Set with all passed Sets.
      *
-     * @param Value $set,...
+     * @param Value ...$sets One or more Sets
      */
-    public function union(Value $set): self
+    public function union(Value ...$sets): self
     {
         $union = $this->value;
 
         /** @var Value $arg */
-        foreach (\func_get_args() as $arg) {
+        foreach ($sets as $arg) {
             /** @var array $convertedArg */
             $convertedArg = $arg->getSet()->getValue();
             $union = \array_merge($union, \array_diff($convertedArg, $union));
@@ -114,14 +114,14 @@ public function union(Value $set): self
      *
      * Returns a Set which is the intersection of this Set with all passed sets.
      *
-     * @param Value $set,...
+     * @param Value ...$sets One or more Sets
      */
-    public function intersect(Value $set): self
+    public function intersect(Value ...$sets): self
     {
         $intersect = $this->value;
 
         /** @var Value $arg */
-        foreach (\func_get_args() as $arg) {
+        foreach ($sets as $arg) {
             /** @var array $convertedArg */
             $convertedArg = $arg->getSet()->getValue();
             // array_values is needed to make sure the indexes are ordered from 0
@@ -136,14 +136,14 @@ public function intersect(Value $set): self
      *
      * Returns a Set which is the complement of this Set with all passed Sets.
      *
-     * @param Value $set,...
+     * @param Value ...$sets One or more Sets
      */
-    public function complement(Value $set): self
+    public function complement(Value ...$sets): self
     {
         $complement = $this->value;
 
         /** @var Value $arg */
-        foreach (\func_get_args() as $arg) {
+        foreach ($sets as $arg) {
             /** @var array $convertedArg */
             $convertedArg = $arg->getSet()->getValue();
             // array_values is needed to make sure the indexes are ordered from 0