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/core/src/Context/RequestContext.php

@@ -5,7 +5,12 @@
 namespace Hypervel\Context;
 
 use Hyperf\Context\RequestContext as HyperfRequestContext;
+use Psr\Http\Message\ServerRequestInterface;
 
 class RequestContext extends HyperfRequestContext
 {
+    public static function destroy(?int $coroutineId = null): void
+    {
+        Context::destroy(ServerRequestInterface::class, $coroutineId);
+    }
 }

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/Application.php

@@ -626,8 +626,8 @@ protected function registerCoreContainerAliases(): void
                 'url',
                 \Hypervel\Router\UrlGenerator::class,
             ],
-            \Hyperf\ViewEngine\Contract\FactoryInterface::class => ['view'],
-            \Hyperf\ViewEngine\Compiler\CompilerInterface::class => ['blade.compiler'],
+            \Hypervel\View\Contracts\Factory::class => ['view'],
+            \Hypervel\View\Compilers\CompilerInterface::class => ['blade.compiler'],
             \Hypervel\Session\Contracts\Factory::class => [
                 'session',
                 \Hypervel\Session\SessionManager::class,

src/foundation/src/Exceptions/Handler.php

@@ -8,16 +8,12 @@
 use Exception;
 use Hyperf\Collection\Arr;
 use Hyperf\Context\Context;
-use Hyperf\Contract\MessageBag as MessageBagContract;
-use Hyperf\Contract\MessageProvider;
 use Hyperf\Contract\SessionInterface;
 use Hyperf\Database\Model\ModelNotFoundException;
 use Hyperf\ExceptionHandler\ExceptionHandler;
 use Hyperf\HttpMessage\Base\Response as BaseResponse;
 use Hyperf\HttpMessage\Exception\HttpException as HyperfHttpException;
 use Hyperf\HttpMessage\Upload\UploadedFile;
-use Hyperf\Support\MessageBag;
-use Hyperf\ViewEngine\ViewErrorBag;
 use Hypervel\Auth\Access\AuthorizationException;
 use Hypervel\Auth\AuthenticationException;
 use Hypervel\Foundation\Contracts\Application as Container;
@@ -33,10 +29,14 @@
 use Hypervel\Router\Contracts\UrlGenerator as UrlGeneratorContract;
 use Hypervel\Session\Contracts\Session as SessionContract;
 use Hypervel\Session\TokenMismatchException;
+use Hypervel\Support\Contracts\MessageBag as MessageBagContract;
+use Hypervel\Support\Contracts\MessageProvider;
 use Hypervel\Support\Contracts\Responsable;
 use Hypervel\Support\Facades\Auth;
+use Hypervel\Support\MessageBag;
 use Hypervel\Support\Reflector;
 use Hypervel\Support\Traits\ReflectsClosures;
+use Hypervel\Support\ViewErrorBag;
 use Hypervel\Validation\ValidationException;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Log\LoggerInterface;
@@ -461,7 +461,7 @@ protected function finalizeRenderedResponse(Request $request, ResponseInterface
 
         if ($callbacks = $this->afterResponseCallbacks()) {
             foreach ($callbacks as $callback) {
-                $response = $callback($response, $e, $request);
+                $response = $callback($response, $e, $request) ?: $response;
             }
         }