From cd3139e77824b74bd2d3dd3a7f3b870381f0a6b3 Mon Sep 17 00:00:00 2001
From: Victor Westerlund <victor@vlw.se>
Date: Sat, 19 Apr 2025 13:13:28 +0200
Subject: [PATCH] chore: use Reflect built-in request validation (#37)

commit 15a1fb886ad5661397262773048374d49174cc16
Author: Victor Westerlund <victor@vlw.se>
Date:   Fri Apr 4 07:33:31 2025 +0200

    upstream(reflect): use Reflect built-in request validation
---
 composer.json                        |  1 -
 composer.lock                        | 32 +---------------------------
 endpoints/about/languages/DELETE.php |  2 +-
 endpoints/about/languages/GET.php    |  2 +-
 endpoints/about/languages/POST.php   |  2 +-
 endpoints/coffee/GET.php             |  2 +-
 endpoints/coffee/POST.php            |  2 +-
 endpoints/coffee/stats/GET.php       |  2 +-
 endpoints/coffee/stats/POST.php      |  2 +-
 endpoints/messages/POST.php          |  2 +-
 endpoints/search/DELETE.php          |  2 +-
 endpoints/search/GET.php             |  2 +-
 endpoints/search/POST.php            |  2 +-
 endpoints/update/GET.php             |  2 +-
 endpoints/work/GET.php               |  2 +-
 endpoints/work/actions/GET.php       |  2 +-
 endpoints/work/tags/GET.php          |  2 +-
 endpoints/work/timeline/GET.php      |  2 +-
 18 files changed, 17 insertions(+), 48 deletions(-)

diff --git a/composer.json b/composer.json
index d20fe64..07a4b64 100755
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,6 @@
 {
     "require": {
         "reflect/client": "dev-master",
-        "reflect/plugin-rules": "dev-master",
         "vlw/mysql": "dev-master",
         "vlw/xenum": "dev-master"
     },
diff --git a/composer.lock b/composer.lock
index 977c82f..a4dd9a1 100755
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "cb70f9f3f538a72aa8bcf906fdc906bf",
+    "content-hash": "f74f68a452514a9d4dd011cef7648a7f",
     "packages": [
         {
             "name": "reflect/client",
@@ -34,35 +34,6 @@
             "description": "Extendable PHP interface for communicating with Reflect API over HTTP or UNIX sockets",
             "time": "2024-04-06T14:55:04+00:00"
         },
-        {
-            "name": "reflect/plugin-rules",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://codeberg.org/reflect/rules-plugin",
-                "reference": "01cc1eea020ec5ea23140d86597bb5c8c1c2ec7f"
-            },
-            "default-branch": true,
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "ReflectRules\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "GPL-3.0-only"
-            ],
-            "authors": [
-                {
-                    "name": "Victor Westerlund",
-                    "email": "victor.vesterlund@gmail.com"
-                }
-            ],
-            "description": "Add request search paramter and request body constraints to an API built with Reflect",
-            "abandoned": true,
-            "time": "2025-04-04T06:00:01+00:00"
-        },
         {
             "name": "vlw/mysql",
             "version": "dev-master",
@@ -125,7 +96,6 @@
     "minimum-stability": "dev",
     "stability-flags": {
         "reflect/client": 20,
-        "reflect/plugin-rules": 20,
         "vlw/mysql": 20,
         "vlw/xenum": 20
     },
diff --git a/endpoints/about/languages/DELETE.php b/endpoints/about/languages/DELETE.php
index a1e5247..4da5b58 100644
--- a/endpoints/about/languages/DELETE.php
+++ b/endpoints/about/languages/DELETE.php
@@ -1,6 +1,6 @@
 <?php
 
-	use ReflectRules\Ruleset;
+	use Reflect\Rules\Ruleset;
 	use Reflect\{Response, Path, Call};
 
 	use VLW\API\Endpoints;
diff --git a/endpoints/about/languages/GET.php b/endpoints/about/languages/GET.php
index 66680df..b4b4ba0 100644
--- a/endpoints/about/languages/GET.php
+++ b/endpoints/about/languages/GET.php
@@ -2,7 +2,7 @@
 
 	use vlw\MySQL\Order;
 	use Reflect\{Response, Path, Call};
-	use ReflectRules\{Ruleset, Rules, Type};
+	use Reflect\Rules\{Ruleset, Rules, Type};
 
 	use VLW\API\Endpoints;
 	use VLW\Database\Database;
diff --git a/endpoints/about/languages/POST.php b/endpoints/about/languages/POST.php
index d75189b..cb95667 100644
--- a/endpoints/about/languages/POST.php
+++ b/endpoints/about/languages/POST.php
@@ -1,6 +1,6 @@
 <?php
 
-	use ReflectRules\Ruleset;
+	use Reflect\Rules\Ruleset;
 	use Reflect\{Response, Path, Call};
 
 	use VLW\API\Endpoints;
diff --git a/endpoints/coffee/GET.php b/endpoints/coffee/GET.php
index e925438..151b6dc 100644
--- a/endpoints/coffee/GET.php
+++ b/endpoints/coffee/GET.php
@@ -2,7 +2,7 @@
 
 	use vlw\MySQL\Order;
 	use Reflect\{Response, Path, Call};
-	use ReflectRules\{Ruleset, Rules, Type};
+	use Reflect\Rules\{Ruleset, Rules, Type};
 
 	use VLW\API\Endpoints;
 	use VLW\Database\Database;
diff --git a/endpoints/coffee/POST.php b/endpoints/coffee/POST.php
index 58e3964..7c96ad9 100644
--- a/endpoints/coffee/POST.php
+++ b/endpoints/coffee/POST.php
@@ -1,7 +1,7 @@
 <?php
 
 	use Reflect\{Response, Path, Call};
-	use ReflectRules\{Ruleset, Rules, Type};
+	use Reflect\Rules\{Ruleset, Rules, Type};
 
 	use VLW\API\Endpoints;
 	use VLW\Database\Database;
diff --git a/endpoints/coffee/stats/GET.php b/endpoints/coffee/stats/GET.php
index a9a8b9e..b3990ba 100644
--- a/endpoints/coffee/stats/GET.php
+++ b/endpoints/coffee/stats/GET.php
@@ -2,7 +2,7 @@
 
 	use vlw\MySQL\Order;
 	use Reflect\{Response, Path, Call};
-	use ReflectRules\{Ruleset, Rules, Type};
+	use Reflect\Rules\{Ruleset, Rules, Type};
 
 	use VLW\API\Endpoints;
 	use VLW\Database\Database;
diff --git a/endpoints/coffee/stats/POST.php b/endpoints/coffee/stats/POST.php
index 43ca84f..6d05917 100644
--- a/endpoints/coffee/stats/POST.php
+++ b/endpoints/coffee/stats/POST.php
@@ -1,7 +1,7 @@
 <?php
 
 	use Reflect\{Response, Path, Call};
-	use ReflectRules\{Ruleset, Rules, Type};
+	use Reflect\Rules\{Ruleset, Rules, Type};
 
 	use VLW\API\Endpoints;
 	use VLW\Database\Database;
diff --git a/endpoints/messages/POST.php b/endpoints/messages/POST.php
index 9512460..e6cbdd7 100644
--- a/endpoints/messages/POST.php
+++ b/endpoints/messages/POST.php
@@ -1,7 +1,7 @@
 <?php
 
 	use Reflect\{Response, Path};
-	use ReflectRules\{Ruleset, Rules, Type};
+	use Reflect\Rules\{Ruleset, Rules, Type};
 
 	use VLW\Database\Database;
 	use VLW\Database\Tables\Messages\MessagesTable;
diff --git a/endpoints/search/DELETE.php b/endpoints/search/DELETE.php
index 9dc485a..6d9e445 100644
--- a/endpoints/search/DELETE.php
+++ b/endpoints/search/DELETE.php
@@ -2,7 +2,7 @@
 
 	use vlw\MySQL\Operators;
 	use Reflect\{Response, Path};
-	use ReflectRules\{Ruleset, Rules, Type};
+	use Reflect\Rules\{Ruleset, Rules, Type};
 
 	use VLW\Database\Database;
 	use VLW\Database\Tables\Search\SearchTable;
diff --git a/endpoints/search/GET.php b/endpoints/search/GET.php
index 94463c2..46c793a 100644
--- a/endpoints/search/GET.php
+++ b/endpoints/search/GET.php
@@ -2,7 +2,7 @@
 
 	use vlw\MySQL\Operators;
 	use Reflect\{Response, Path, Call};
-	use ReflectRules\{Ruleset, Rules, Type};
+	use Reflect\Rules\{Ruleset, Rules, Type};
 
 	use VLW\API\Endpoints;
 	use VLW\Database\Database;
diff --git a/endpoints/search/POST.php b/endpoints/search/POST.php
index a934b04..95548e8 100644
--- a/endpoints/search/POST.php
+++ b/endpoints/search/POST.php
@@ -2,7 +2,7 @@
 
 	use vlw\MySQL\Operators;
 	use Reflect\{Response, Path, Call};
-	use ReflectRules\{Ruleset, Rules, Type};
+	use Reflect\Rules\{Ruleset, Rules, Type};
 
 	use VLW\API\Endpoints;
 	use VLW\Database\Database;
diff --git a/endpoints/update/GET.php b/endpoints/update/GET.php
index 10cf57c..6044689 100644
--- a/endpoints/update/GET.php
+++ b/endpoints/update/GET.php
@@ -1,7 +1,7 @@
 <?php
 
 	use Reflect\{Response, Path, Call};
-	use ReflectRules\{Ruleset, Rules, Type};
+	use Reflect\Rules\{Ruleset, Rules, Type};
 
 	use VLW\API\Endpoints;
 
diff --git a/endpoints/work/GET.php b/endpoints/work/GET.php
index 548a67d..01ecdc4 100644
--- a/endpoints/work/GET.php
+++ b/endpoints/work/GET.php
@@ -2,7 +2,7 @@
 
 	use vlw\MySQL\Order;
 	use Reflect\{Response, Path};
-	use ReflectRules\{Ruleset, Rules, Type};
+	use Reflect\Rules\{Ruleset, Rules, Type};
 
 	use VLW\Database\Database;
 	use VLW\Database\Tables\Work\WorkTable;
diff --git a/endpoints/work/actions/GET.php b/endpoints/work/actions/GET.php
index 8fa5e39..f92e0bb 100644
--- a/endpoints/work/actions/GET.php
+++ b/endpoints/work/actions/GET.php
@@ -2,7 +2,7 @@
 
 	use vlw\MySQL\Order;
 	use Reflect\{Response, Path};
-	use ReflectRules\{Ruleset, Rules, Type};
+	use Reflect\Rules\{Ruleset, Rules, Type};
 
 	use VLW\Database\Database;
 	use VLW\Database\Tables\Work\ActionsTable;
diff --git a/endpoints/work/tags/GET.php b/endpoints/work/tags/GET.php
index 7d6ff52..a8a9f4c 100644
--- a/endpoints/work/tags/GET.php
+++ b/endpoints/work/tags/GET.php
@@ -1,7 +1,7 @@
 <?php
 
 	use Reflect\{Response, Path};
-	use ReflectRules\{Ruleset, Rules, Type};
+	use Reflect\Rules\{Ruleset, Rules, Type};
 
 	use VLW\Database\Database;
 	use VLW\Database\Tables\Work\{TagsTable, TagsLabelEnum};
diff --git a/endpoints/work/timeline/GET.php b/endpoints/work/timeline/GET.php
index 2a5af72..b9b442d 100644
--- a/endpoints/work/timeline/GET.php
+++ b/endpoints/work/timeline/GET.php
@@ -2,7 +2,7 @@
 
 	use vlw\MySQL\Order;
 	use Reflect\{Response, Path};
-	use ReflectRules\{Ruleset, Rules, Type};
+	use Reflect\Rules\{Ruleset, Rules, Type};
 
 	use VLW\Database\Database;
 	use VLW\Database\Tables\Work\TimelineTable;