Merge pull request #130 from WyriHaximus/transform-to-attrributes

Transform to Attributes
WyriHaximus · Mar 19, 2024 · acfbe5c · acfbe5c
2 parents ecd704c + 24500dc
commit acfbe5c
Show file tree

Hide file tree

Showing 30 changed files with 322 additions and 557 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,4 +16,4 @@ jobs:
     name: Continuous Integration
     uses: WyriHaximus/github-workflows/.github/workflows/package.yaml@main
     with:
-      services: "{\"postgres\":{\"image\":\"postgres:\$\{\{ matrix.postgres \}\}\",\"env\":{\"POSTGRES_PASSWORD\":\"postgres\"},\"options\":\"--health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5\"}}"
+      services: "{\"postgres\":{\"image\":\"postgres:${{ matrix.postgres }}\",\"env\":{\"POSTGRES_PASSWORD\":\"postgres\"},\"options\":\"--health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5\"}}"
diff --git a/composer.json b/composer.json
@@ -11,17 +11,15 @@
   ],
   "require": {
     "php": "^8.2",
-    "doctrine/annotations": "^1.13",
     "eventsauce/object-hydrator": "^1.4",
     "latitude/latitude": "^4.1",
     "ramsey/uuid": "^4.2.3",
-    "react/dns": "^1.9",
     "react/event-loop": "^1.3",
     "react/promise": "^3.1",
     "react/stream": "^1.1",
-    "reactivex/rxphp": "^2.0",
-    "roave/better-reflection": "^4.0 || ^5 || ^6",
-    "thecodingmachine/safe": "^1.3 || ^2",
+    "reactivex/rxphp": "^2.0.12",
+    "roave/better-reflection": "^6",
+    "thecodingmachine/safe": "^2",
     "voryx/pgasync": "^2.0",
     "wyrihaximus/constants": "^1.5",
     "wyrihaximus/doctrine-annotation-autoloader": "^1.0",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Annotation/Clause.php b/src/Annotation/Clause.php
diff --git a/src/Annotation/InnerJoin.php b/src/Annotation/InnerJoin.php
diff --git a/src/Annotation/JoinInterface.php b/src/Annotation/JoinInterface.php
diff --git a/src/Annotation/LeftJoin.php b/src/Annotation/LeftJoin.php
diff --git a/src/Annotation/Table.php b/src/Annotation/Table.php
diff --git a/src/Attribute/Clause.php b/src/Attribute/Clause.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace WyriHaximus\React\SimpleORM\Attribute;
+
+final readonly class Clause
+{
+    public function __construct(
+        public string $localKey,
+        public string $foreignKey,
+        public string|null $localCast = null,
+        public string|null $localFunction = null,
+        public string|null $foreignCast = null,
+        public string|null $foreignFunction = null,
+    ) {
+    }
+}