Merge branch 'main' of github.com:hypervel/components

Author: albertcht

composer.json

@@ -138,6 +138,7 @@
         "symfony/error-handler": "^6.3",
         "symfony/mailer": "^6.2",
         "symfony/process": "^6.2",
+        "symfony/uid": "^7.4",
         "tijsverkoyen/css-to-inline-styles": "^2.2.5"
     },
     "replace": {
@@ -204,6 +205,7 @@
         "hyperf/redis": "~3.1.0",
         "hyperf/testing": "~3.1.0",
         "hyperf/view-engine": "~3.1.0",
+        "hypervel/facade-documenter": "dev-main",
         "league/flysystem": "^3.0",
         "league/flysystem-aws-s3-v3": "^3.0",
         "league/flysystem-google-cloud-storage": "^3.0",

src/broadcasting/src/BroadcastManager.php

@@ -34,7 +34,7 @@
 use Pusher\Pusher;
 
 /**
- * @mixin \Hypervel\Broadcasting\Contracts\Broadcaster
+ * @mixin \Hypervel\Broadcasting\Broadcasters\Broadcaster
  */
 class BroadcastManager implements BroadcastingFactoryContract
 {

src/broadcasting/src/BroadcastPoolProxy.php

@@ -6,10 +6,21 @@
 
 use Hyperf\HttpServer\Contract\RequestInterface;
 use Hypervel\Broadcasting\Contracts\Broadcaster;
+use Hypervel\Broadcasting\Contracts\HasBroadcastChannel;
 use Hypervel\ObjectPool\PoolProxy;
 
 class BroadcastPoolProxy extends PoolProxy implements Broadcaster
 {
+    /**
+     * Register a channel authenticator.
+     */
+    public function channel(HasBroadcastChannel|string $channel, callable|string $callback, array $options = []): static
+    {
+        $this->__call(__FUNCTION__, func_get_args());
+
+        return $this;
+    }
+
     public function auth(RequestInterface $request): mixed
     {
         return $this->__call(__FUNCTION__, func_get_args());

src/core/src/Database/Eloquent/Concerns/HasAttributes.php

@@ -64,7 +64,7 @@ public function getCasts(): array
             return static::$castsCache[static::class] = array_merge([$this->getKeyName() => $this->getKeyType()], $this->casts, $this->casts());
         }
 
-        return static::$castsCache[static::class] = $this->casts;
+        return static::$castsCache[static::class] = array_merge($this->casts, $this->casts());
     }
 
     /**

src/core/src/Database/Eloquent/Concerns/HasUlids.php

@@ -6,22 +6,27 @@
 
 use Hyperf\Stringable\Str;
 
+/**
+ * Provides ULID primary key support for Eloquent models.
+ */
 trait HasUlids
 {
     /**
-     * Add a unique identifier to the model before it is created.
+     * Boot the trait.
      */
-    public function creating(): void
+    public static function bootHasUlids(): void
     {
-        foreach ($this->uniqueIds() as $column) {
-            if (empty($model->{$column})) {
-                $this->{$column} = $this->newUniqueId();
+        static::registerCallback('creating', function (self $model): void {
+            foreach ($model->uniqueIds() as $column) {
+                if (empty($model->{$column})) {
+                    $model->{$column} = $model->newUniqueId();
+                }
             }
-        }
+        });
     }
 
     /**
-     * Generate a new UUID for the model.
+     * Generate a new ULID for the model.
      */
     public function newUniqueId(): string
     {

src/core/src/Database/Eloquent/Concerns/HasUuids.php

@@ -6,18 +6,23 @@
 
 use Hyperf\Stringable\Str;
 
+/**
+ * Provides UUID primary key support for Eloquent models.
+ */
 trait HasUuids
 {
     /**
-     * Add a unique identifier to the model before it is created.
+     * Boot the trait.
      */
-    public function creating(): void
+    public static function bootHasUuids(): void
     {
-        foreach ($this->uniqueIds() as $column) {
-            if (empty($model->{$column})) {
-                $this->{$column} = $this->newUniqueId();
+        static::registerCallback('creating', function (self $model): void {
+            foreach ($model->uniqueIds() as $column) {
+                if (empty($model->{$column})) {
+                    $model->{$column} = $model->newUniqueId();
+                }
             }
-        }
+        });
     }
 
     /**

src/filesystem/src/FilesystemManager.php

@@ -379,7 +379,7 @@ function (&$parent) use ($config) {
      */
     protected function createFlysystem(FlysystemAdapter $adapter, array $config): FilesystemOperator
     {
-        if ($config['read-only'] ?? false === true) {
+        if (($config['read-only'] ?? false) === true) {
             /* @phpstan-ignore-next-line */
             $adapter = new ReadOnlyFilesystemAdapter($adapter);
         }

src/foundation/src/Testing/Concerns/InteractsWithSession.php

@@ -37,8 +37,17 @@ public function session(array $data): static
      */
     protected function startSession(): static
     {
-        if (! $this->app->get(Session::class)->isStarted()) {
-            $this->app->get(Session::class)->start();
+        $session = $this->app->get(Session::class);
+
+        if (! $session->isStarted()) {
+            // Ensure a session ID exists before starting. In production, the
+            // StartSession middleware sets the ID from the request cookie.
+            // In tests, we generate one if none exists.
+            if ($session->getId() === null) {
+                $session->setId(null);
+            }
+
+            $session->start();
         }
 
         return $this;

src/foundation/src/Testing/Constraints/NotSoftDeletedInDatabase.php

@@ -19,8 +19,8 @@ class NotSoftDeletedInDatabase extends Constraint
      */
     public function __construct(
         protected Connection $database,
-        array $data,
-        string $deletedAtColumn
+        protected array $data,
+        protected string $deletedAtColumn
     ) {
     }
 

src/foundation/src/Testing/Constraints/SoftDeletedInDatabase.php

@@ -19,8 +19,8 @@ class SoftDeletedInDatabase extends Constraint
      */
     public function __construct(
         protected Connection $database,
-        array $data,
-        string $deletedAtColumn
+        protected array $data,
+        protected string $deletedAtColumn
     ) {
     }