Merge branch '4.1' of https://github.com/windwalker-io/framework into…

… 4.1
windwalker-io · Nov 9, 2023 · da7ae5a · da7ae5a
2 parents a8fe86b + 75a5aad
commit da7ae5a
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/packages/filesystem/src/Path.php b/packages/filesystem/src/Path.php
@@ -431,7 +431,7 @@ public static function isAbsolute(string $path): bool
             return false;
         }
 
-        if (str_contains($path, '://')) {
+        if (static::isURL($path)) {
             return true;
         }
 
@@ -455,6 +455,15 @@ public static function isAbsolute(string $path): bool
         return false;
     }
 
+    public static function isURL(string $path): bool
+    {
+        if ('' === $path) {
+            return false;
+        }
+
+        return str_contains($path, '://');
+    }
+
     /**
      * Returns whether a path is relative.
      *

diff --git a/packages/orm/src/EntityMapper.php b/packages/orm/src/EntityMapper.php
@@ -58,14 +58,7 @@
 class EntityMapper implements EventAwareInterface
 {
     use EventAwareTrait;
-
-    public const UPDATE_NULLS = 1 << 0;
-
-    public const IGNORE_EVENTS = 1 << 1;
-
-    public const IGNORE_OLD_DATA = 1 << 2;
-
-    public const TRANSACTION = 1 << 3;
+    use EntityMapperConstantsTrait;
 
     /**
      * @var ORM

diff --git a/packages/orm/src/EntityMapperConstantsTrait.php b/packages/orm/src/EntityMapperConstantsTrait.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Windwalker\ORM;
+
+trait EntityMapperConstantsTrait
+{
+    public const UPDATE_NULLS = 1 << 0;
+
+    public const IGNORE_EVENTS = 1 << 1;
+
+    public const IGNORE_OLD_DATA = 1 << 2;
+
+    public const TRANSACTION = 1 << 3;
+}
diff --git a/packages/orm/src/ORM.php b/packages/orm/src/ORM.php
@@ -85,8 +85,8 @@
 class ORM implements EventAwareInterface
 {
     use EventAwareTrait;
-
     use AttributesAwareTrait;
+    use EntityMapperConstantsTrait;
 
     protected ?FieldHydratorInterface $hydrator = null;