Merge pull request #129 from limosa-io/feature/internal-filter-parser

Replace external SCIM parser with internal implementation

Author: arietimmerman

composer.json

@@ -13,9 +13,7 @@
 		"php": "^8.0",
         "illuminate/database": "^10.0|^11.0|^12.0",
         "illuminate/support": "^10.0|^11.0|^12.0",
-        "illuminate/console": "^10.0|^11.0|^12.0",
-        "tmilos/scim-schema": "^0.1.0",
-        "tmilos/scim-filter-parser": "^1.3"
+        "illuminate/console": "^10.0|^11.0|^12.0"
     },
     "classmap": [
         "database/migrations"

composer.lock

@@ -8,7 +8,7 @@
 use ArieTimmerman\Laravel\SCIMServer\SCIM\Schema;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
-use Tmilos\ScimFilterParser\Ast\AttributePath;
+use ArieTimmerman\Laravel\SCIMServer\Filter\Ast\AttributePath as FilterAttributePath;
 use Illuminate\Support\Str;
 
 class Attribute
@@ -207,7 +207,7 @@ public function getSchema()
         }
     }
 
-    public function getNode(?AttributePath $attributePath)
+    public function getNode(?FilterAttributePath $attributePath)
     {
         if (empty($attributePath)) {
             return $this;

src/Attribute/Attribute.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace ArieTimmerman\Laravel\SCIMServer\Filter\Ast;
+
+class AttributePath extends Node
+{
+    public ?string $schema = null;
+
+    /** @var string[] */
+    public array $attributeNames = [];
+
+    public function __construct(?string $schema = null, array $attributeNames = [])
+    {
+        $this->schema = $schema;
+        $this->attributeNames = array_values($attributeNames);
+    }
+
+    public function add(string $attributeName): void
+    {
+        $this->attributeNames[] = $attributeName;
+    }
+
+    public function __toString(): string
+    {
+        $path = implode('.', $this->attributeNames);
+
+        if ($this->schema !== null && $this->schema !== '') {
+            return $this->schema . ':' . $path;
+        }
+
+        return $path;
+    }
+
+    public function dump(): array
+    {
+        return [
+            'AttributePath' => (string) $this,
+        ];
+    }
+
+    public function shift(): ?string
+    {
+        return array_shift($this->attributeNames);
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getAttributeNames(): array
+    {
+        return $this->attributeNames;
+    }
+}

src/Filter/Ast/AttributePath.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace ArieTimmerman\Laravel\SCIMServer\Filter\Ast;
+
+class ComparisonExpression extends Factor
+{
+    public AttributePath $attributePath;
+
+    public string $operator;
+
+    public mixed $compareValue;
+
+    public function __construct(AttributePath $attributePath, string $operator, mixed $compareValue = null)
+    {
+        $this->attributePath = $attributePath;
+        $this->operator = strtolower($operator);
+        $this->compareValue = $compareValue;
+    }
+
+    public function __toString(): string
+    {
+        if ($this->operator === 'pr') {
+            return sprintf('%s %s', $this->attributePath, $this->operator);
+        }
+
+        $value = $this->compareValue;
+        if ($value instanceof \DateTimeInterface) {
+            $value = $value->format('Y-m-d\TH:i:s\Z');
+        } elseif (is_string($value)) {
+            $value = '"' . $value . '"';
+        } elseif (is_bool($value)) {
+            $value = $value ? 'true' : 'false';
+        } elseif ($value === null) {
+            $value = 'null';
+        }
+
+        return sprintf('%s %s %s', $this->attributePath, $this->operator, $value);
+    }
+
+    public function dump(): array
+    {
+        return [
+            'ComparisonExpression' => (string) $this,
+        ];
+    }
+}