Migrate Laravel View

composer.json

@@ -66,7 +66,8 @@
             "Hypervel\\Translation\\": "src/translation/src/",
             "Hypervel\\Validation\\": "src/validation/src/",
             "Hypervel\\Permission\\": "src/permission/src/",
-            "Hypervel\\Sentry\\": "src/sentry/src/"
+            "Hypervel\\Sentry\\": "src/sentry/src/",
+            "Hypervel\\View\\": "src/view/src/"
         },
         "files": [
             "src/auth/src/Functions.php",
@@ -182,7 +183,8 @@
         "hypervel/translation": "self.version",
         "hypervel/validation": "self.version",
         "hypervel/permission": "self.version",
-        "hypervel/sentry": "self.version"
+        "hypervel/sentry": "self.version",
+        "hypervel/view": "self.version"
     },
     "suggest": {
         "hyperf/redis": "Required to use redis driver. (^3.1).",
@@ -261,7 +263,8 @@
             "providers": [
                 "Hypervel\\Notifications\\NotificationServiceProvider",
                 "Hypervel\\Telescope\\TelescopeServiceProvider",
-                "Hypervel\\Sentry\\SentryServiceProvider"
+                "Hypervel\\Sentry\\SentryServiceProvider",
+                "Hypervel\\View\\ViewServiceProvider"
             ]
         },
         "branch-alias": {

src/core/src/ConfigProvider.php

@@ -16,12 +16,10 @@
 use Hyperf\Database\Commands\Migrations\StatusCommand;
 use Hyperf\Database\Migrations\MigrationCreator as HyperfMigrationCreator;
 use Hyperf\Database\Model\Factory as HyperfDatabaseFactory;
-use Hyperf\ViewEngine\Compiler\CompilerInterface;
 use Hypervel\Database\Console\SeedCommand;
 use Hypervel\Database\Eloquent\Factories\LegacyFactoryInvoker as DatabaseFactoryInvoker;
 use Hypervel\Database\Migrations\MigrationCreator;
 use Hypervel\Database\TransactionListener;
-use Hypervel\View\CompilerFactory;
 
 class ConfigProvider
 {
@@ -31,7 +29,6 @@ public function __invoke(): array
             'dependencies' => [
                 HyperfDatabaseFactory::class => DatabaseFactoryInvoker::class,
                 HyperfMigrationCreator::class => MigrationCreator::class,
-                CompilerInterface::class => CompilerFactory::class,
             ],
             'listeners' => [
                 TransactionListener::class,

src/devtool/src/Generator/ComponentCommand.php

@@ -5,6 +5,7 @@
 namespace Hypervel\Devtool\Generator;
 
 use Hyperf\Devtool\Generator\GeneratorCommand;
+use Hypervel\Support\Str;
 
 class ComponentCommand extends GeneratorCommand
 {
@@ -27,7 +28,7 @@ protected function getStub(): string
 
     protected function getDefaultNamespace(): string
     {
-        return $this->getConfig()['namespace'] ?? 'App\View\Component';
+        return $this->getConfig()['namespace'] ?? 'App\View\Components';
     }
 
     protected function buildClass(string $name): string
@@ -37,7 +38,12 @@ protected function buildClass(string $name): string
 
     protected function replaceView(string $stub, string $name): string
     {
-        $view = lcfirst(str_replace($this->getNamespace($name) . '\\', '', $name));
+        $view = str_replace($this->getDefaultNamespace() . '\\', '', $name);
+        $view = array_map(
+            fn ($part) => Str::snake($part),
+            explode('\\', $view)
+        );
+        $view = implode('.', $view);
 
         return str_replace(
             ['%VIEW%'],

src/devtool/src/Generator/stubs/view-component.stub

@@ -5,8 +5,8 @@ declare(strict_types=1);
 namespace %NAMESPACE%;
 
 use Closure;
-use Hyperf\ViewEngine\Component\Component;
-use Hyperf\ViewEngine\Contract\ViewInterface;
+use Hypervel\View\Component;
+use Hypervel\View\Contracts\View as ViewContract;
 use Hypervel\Support\Facades\View;
 
 class %CLASS% extends Component
@@ -22,7 +22,7 @@ class %CLASS% extends Component
     /**
      * Get the view / contents that represent the component.
      */
-    public function render(): ViewInterface|Closure|string
+    public function render(): ViewContract|Closure|string
     {
         return %VIEW%;
     }

src/filesystem/src/Filesystem.php

@@ -5,6 +5,7 @@
 namespace Hypervel\Filesystem;
 
 use Hyperf\Support\Filesystem\Filesystem as HyperfFilesystem;
+use Hypervel\Http\Exceptions\FileNotFoundException;
 
 class Filesystem extends HyperfFilesystem
 {
@@ -17,4 +18,25 @@ public function ensureDirectoryExists(string $path, int $mode = 0755, bool $recu
             $this->makeDirectory($path, $mode, $recursive);
         }
     }
+
+    /**
+     * Get the returned value of a file.
+     *
+     * @throws FileNotFoundException
+     */
+    public function getRequire(string $path, array $data = [[]])
+    {
+        if ($this->isFile($path)) {
+            $__path = $path;
+            $__data = $data;
+
+            return (static function () use ($__path, $__data) {
+                extract($__data, EXTR_SKIP);
+
+                return require $__path;
+            })();
+        }
+
+        throw new FileNotFoundException("File does not exist at path {$path}.");
+    }
 }

src/foundation/src/Exceptions/Handler.php

@@ -600,6 +600,10 @@ protected function withErrors(Request $request, mixed $provider, string $key = '
         if ($flashInputs) {
             $session->flashInput($flashInputs);
         }
+
+        // Because an exception is thrown and the reset logic of `StartSession` middleware is not executed,
+        // We need to save the session here manually.
+        $session->save();
     }
 
     /**

src/foundation/src/helpers.php

@@ -7,8 +7,6 @@
 use Hyperf\Contract\Arrayable;
 use Hyperf\HttpMessage\Cookie\Cookie;
 use Hyperf\Stringable\Stringable;
-use Hyperf\ViewEngine\Contract\FactoryInterface;
-use Hyperf\ViewEngine\Contract\ViewInterface;
 use Hypervel\Auth\Contracts\Factory as AuthFactoryContract;
 use Hypervel\Auth\Contracts\Gate;
 use Hypervel\Auth\Contracts\Guard;
@@ -33,6 +31,8 @@
 use Hypervel\Translation\Contracts\Translator as TranslatorContract;
 use Hypervel\Validation\Contracts\Factory as ValidatorFactoryContract;
 use Hypervel\Validation\Contracts\Validator as ValidatorContract;
+use Hypervel\View\Contracts\Factory as FactoryContract;
+use Hypervel\View\Contracts\View as ViewContract;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Log\LoggerInterface;
 
@@ -770,9 +770,9 @@ function __(?string $key = null, array $replace = [], ?string $locale = null): a
      * @param null|string $view
      * @param array $mergeData
      */
-    function view($view = null, array|Arrayable $data = [], $mergeData = []): FactoryInterface|ViewInterface
+    function view($view = null, array|Arrayable $data = [], $mergeData = []): FactoryContract|ViewContract
     {
-        $factory = app(FactoryInterface::class);
+        $factory = app(FactoryContract::class);
 
         if (func_num_args() === 0) {
             return $factory;

src/http/src/CoreMiddleware.php

@@ -17,6 +17,7 @@
 use Hyperf\HttpServer\Router\DispatcherFactory;
 use Hyperf\Server\Exception\ServerException;
 use Hyperf\View\RenderInterface;
+use Hyperf\ViewEngine\Contract\Htmlable;
 use Hyperf\ViewEngine\Contract\Renderable;
 use Hyperf\ViewEngine\Contract\ViewInterface;
 use Hypervel\Context\ResponseContext;
@@ -65,6 +66,12 @@ protected function transferToResponse($response, ServerRequestInterface $request
                 ->setBody(new SwooleStream($response->render()));
         }
 
+        if ($response instanceof Htmlable) {
+            return $this->response()
+                ->addHeader('content-type', 'text/html')
+                ->setBody(new SwooleStream((string) $response));
+        }
+
         if (is_string($response)) {
             return $this->response()->addHeader('content-type', 'text/plain')->setBody(new SwooleStream($response));
         }

src/session/src/Store.php

@@ -10,9 +10,9 @@
 use Hyperf\Context\Context;
 use Hyperf\Macroable\Macroable;
 use Hyperf\Stringable\Str;
-use Hyperf\Support\MessageBag;
-use Hyperf\ViewEngine\ViewErrorBag;
 use Hypervel\Session\Contracts\Session;
+use Hypervel\Support\MessageBag;
+use Hypervel\Support\ViewErrorBag;
 use SessionHandlerInterface;
 use stdClass;
 

src/support/src/Contracts/MessageProvider.php

@@ -8,4 +8,8 @@
 
 interface MessageProvider extends HyperfMessageProvider
 {
+    /**
+     * Get the messages for the instance.
+     */
+    public function getMessageBag(): MessageBag;
 }

src/support/src/DefaultProviders.php

@@ -19,6 +19,7 @@ public function __construct(?array $providers = null)
         $this->providers = $providers ?: [
             \Hypervel\Foundation\Providers\FoundationServiceProvider::class,
             \Hypervel\Foundation\Providers\FormRequestServiceProvider::class,
+            \Hypervel\View\ViewServiceProvider::class,
         ];
     }