🔀 Merge pull request #21 from Morning-Train/hotfix/filters

🐛 Allow mixed value as operatororvalue
Morning-Train · Feb 29, 2024 · 26a19cd · 26a19cd
2 parents 8f16cbd + d3e3680
commit 26a19cd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/Classes/EconomicQueryBuilder.php b/src/Classes/EconomicQueryBuilder.php
@@ -42,7 +42,7 @@ protected function getEndpoint(): string
         return $this->endpoint;
     }
 
-    public function where(int|string|Closure $propertyName, ?string $operatorOrValue = null, mixed $value = null): static
+    public function where(int|string|Closure $propertyName, mixed $operatorOrValue = null, mixed $value = null): static
     {
         if (! isset($this->filter)) {
             $this->filter = new EconomicQueryFilterBuilder(EconomicQueryFilterBuilder::FILTER_RELATION_AND);
@@ -53,7 +53,7 @@ public function where(int|string|Closure $propertyName, ?string $operatorOrValue
         return $this;
     }
 
-    public function orWhere(int|string|Closure $propertyName, ?string $operatorOrValue = null, mixed $value = null): static
+    public function orWhere(int|string|Closure $propertyName, mixed $operatorOrValue = null, mixed $value = null): static
     {
         if (! isset($this->filter)) {
             $this->filter = new EconomicQueryFilterBuilder(EconomicQueryFilterBuilder::FILTER_RELATION_OR);

diff --git a/src/Classes/EconomicQueryFilterBuilder.php b/src/Classes/EconomicQueryFilterBuilder.php
@@ -110,7 +110,7 @@ protected function whereNested(Closure $closure)
         return $this;
     }
 
-    public function where(int|string|Closure $propertyName, ?string $operatorOrValue = null, mixed $value = null): static
+    public function where(int|string|Closure $propertyName, mixed $operatorOrValue = null, mixed $value = null): static
     {
         if ($propertyName instanceof Closure) {
             return $this->whereNested($propertyName);
@@ -144,7 +144,7 @@ public function where(int|string|Closure $propertyName, ?string $operatorOrValue
         return $this;
     }
 
-    public function orWhere(int|string|Closure $propertyName, ?string $operatorOrValue = null, mixed $value = null): static
+    public function orWhere(int|string|Closure $propertyName, mixed $operatorOrValue = null, mixed $value = null): static
     {
         $instance = new static(static::FILTER_RELATION_OR);
 

diff --git a/src/Classes/EconomicRelatedResource.php b/src/Classes/EconomicRelatedResource.php
@@ -39,7 +39,7 @@ public function find(string|int $reference): ?Resource
     /**
      * @return EconomicQueryBuilder<R>
      */
-    public function where(int|string $propertyName, string $operatorOrValue, mixed $value = null): EconomicQueryBuilder
+    public function where(int|string $propertyName, mixed $operatorOrValue = null, mixed $value = null): EconomicQueryBuilder
     {
         return (new EconomicQueryBuilder($this->resourceClass))->setEndpoint($this->endpointCollection->getEndpoint($this->references))->where($propertyName, $operatorOrValue, $value);
 

diff --git a/src/Traits/Resources/GetCollectionable.php b/src/Traits/Resources/GetCollectionable.php
@@ -15,7 +15,7 @@ trait GetCollectionable
     /**
      * @return EconomicQueryBuilder<ResourceClass>
      */
-    public static function where(int|string $propertyName, string $operatorOrValue, mixed $value = null): EconomicQueryBuilder
+    public static function where(int|string $propertyName, mixed $operatorOrValue = null, mixed $value = null): EconomicQueryBuilder
     {
         return (new EconomicQueryBuilder(static::class))->where($propertyName, $operatorOrValue, $value);
     }