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

Author: albertcht

src/foundation/src/Http/WebsocketKernel.php

@@ -5,7 +5,6 @@
 namespace Hypervel\Foundation\Http;
 
 use Hyperf\Context\Context;
-use Hyperf\Contract\ConfigInterface;
 use Hyperf\Coordinator\Constants;
 use Hyperf\Coordinator\CoordinatorManager;
 use Hyperf\Engine\Constant;
@@ -16,10 +15,11 @@
 use Hyperf\WebSocketServer\Collector\FdCollector;
 use Hyperf\WebSocketServer\Context as WsContext;
 use Hyperf\WebSocketServer\CoreMiddleware;
-use Hyperf\WebSocketServer\Exception\Handler\WebSocketExceptionHandler;
 use Hyperf\WebSocketServer\Exception\WebSocketHandShakeException;
 use Hyperf\WebSocketServer\Security;
 use Hyperf\WebSocketServer\Server as WebSocketServer;
+use Hypervel\Foundation\Exceptions\Contracts\ExceptionHandler as ExceptionHandlerContract;
+use Hypervel\Foundation\Exceptions\Handler as ExceptionHandler;
 use Hypervel\Foundation\Http\Contracts\MiddlewareContract;
 use Hypervel\Foundation\Http\Traits\HasMiddleware;
 use Psr\Http\Message\ResponseInterface;
@@ -39,10 +39,15 @@ public function initCoreMiddleware(string $serverName): void
         $this->serverName = $serverName;
         $this->coreMiddleware = make(CoreMiddleware::class, [$this->container, $serverName]);
 
-        $config = $this->container->get(ConfigInterface::class);
-        $this->exceptionHandlers = $config->get('exceptions.handler.' . $serverName, [
-            WebSocketExceptionHandler::class,
-        ]);
+        $this->initExceptionHandlers();
+    }
+
+    protected function initExceptionHandlers(): void
+    {
+        /* @phpstan-ignore-next-line */
+        $this->exceptionHandlers = $this->container->bound(ExceptionHandlerContract::class)
+            ? [ExceptionHandlerContract::class]
+            : [ExceptionHandler::class];
     }
 
     /**

src/support/src/DataObject.php

@@ -220,8 +220,10 @@ protected static function getDependencyFromUnionType(ReflectionUnionType $type):
     {
         foreach ($type->getTypes() as $namedType) {
             $className = $namedType->getName();
-            if (is_subclass_of($className, DataObject::class)
-                || is_subclass_of($className, DateTimeInterface::class)) {
+            if (
+                is_subclass_of($className, DataObject::class)
+                || is_subclass_of($className, DateTimeInterface::class)
+            ) {
                 return $namedType;
             }
         }
@@ -284,10 +286,18 @@ protected static function resolveDependenciesMap(string $class, array &$visited
                 ];
                 continue;
             }
+            $dataKey = static::isAutoCasting()
+                ? static::convertPropertyToDataKey($property->getName())
+                : $property->getName();
+            if (enum_exists($typeName)) {
+                $result[$dataKey] = [
+                    'handler' => [$typeName, 'from'],
+                    'nullable' => $allowsNull,
+                    'children' => [],
+                ];
+                continue;
+            }
             if ($resolver = $customizedDependencies[$typeName] ?? null) {
-                $dataKey = static::isAutoCasting()
-                    ? static::convertPropertyToDataKey($property->getName())
-                    : $property->getName();
                 $result[$dataKey] = [
                     'handler' => $resolver,
                     'nullable' => $allowsNull,

tests/Support/DataObjectTest.php

@@ -255,6 +255,7 @@ public function testMakeWithoutAutoResolve(): void
                 'city' => 'New York',
                 'zipCode' => '10001',
             ],
+            'gender' => TestGenderEnum::Male,
             'created_at' => '2023-01-01 12:00:00',
         ];
 
@@ -265,6 +266,7 @@ public function testMakeWithoutAutoResolve(): void
         $this->assertSame(['street' => '123 Main St', 'city' => 'New York', 'zipCode' => '10001'], $user->address);
         $this->assertIsString($user->createdAt);
         $this->assertSame('2023-01-01 12:00:00', $user->createdAt);
+        $this->assertSame(TestGenderEnum::Male, $user->gender);
     }
 
     /**
@@ -279,6 +281,7 @@ public function testMakeWithAutoResolveDataObject(): void
                 'city' => 'New York',
                 'zip_code' => '10001',
             ],
+            'gender' => 'male',
             'created_at' => '2023-01-01 12:00:00',
         ];
 
@@ -291,6 +294,7 @@ public function testMakeWithAutoResolveDataObject(): void
         $this->assertSame('10001', $user->address->zipCode);
         $this->assertInstanceOf(DateTime::class, $user->createdAt);
         $this->assertSame('2023-01-01 12:00:00', $user->createdAt->format('Y-m-d H:i:s'));
+        $this->assertSame(TestGenderEnum::Male, $user->gender);
     }
 
     /**
@@ -307,6 +311,7 @@ public function testMakeWithAutoResolveDeepNesting(): void
                     'city' => 'Boston',
                     'zip_code' => '02101',
                 ],
+                'gender' => 'male',
                 'created_at' => '2023-06-15 09:30:00',
             ],
         ];
@@ -320,6 +325,7 @@ public function testMakeWithAutoResolveDeepNesting(): void
         $this->assertSame('456 Oak Ave', $company->employee->address->street);
         $this->assertSame('Boston', $company->employee->address->city);
         $this->assertInstanceOf(DateTime::class, $company->employee->createdAt);
+        $this->assertSame(TestGenderEnum::Male, $company->employee->gender);
     }
 
     /**
@@ -331,13 +337,15 @@ public function testMakeWithAutoResolveNullValues(): void
             'name' => 'John Doe',
             'address' => null,
             'created_at' => null,
+            'gender' => 'male',
         ];
 
         $user = TestUserDataObject::make($data, true);
 
         $this->assertSame('John Doe', $user->name);
         $this->assertNull($user->address);
         $this->assertNull($user->createdAt);
+        $this->assertSame(TestGenderEnum::Male, $user->gender);
     }
 
     protected function getData(): array
@@ -421,6 +429,7 @@ class TestUserDataObject extends DataObject
 {
     public function __construct(
         public string $name,
+        public TestGenderEnum $gender,
         public TestAddressDataObject|array|null $address,
         public DateTime|string|null $createdAt,
     ) {
@@ -438,3 +447,9 @@ public function __construct(
     ) {
     }
 }
+
+enum TestGenderEnum: string
+{
+    case Male = 'male';
+    case Female = 'female';
+}