Merge pull request #22 from techmahedy/techmahedy-1.x

console command handle() method dependency injection:

Author: techmahedy

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "doppar/airbend",
-    "description": "Doppar Airbend is a real-time broadcasting component of the Doppar PHP Frameworkc",
+    "description": "Doppar Airbend is a real-time broadcasting component of the Doppar PHP Framework",
     "type": "library",
     "license": "MIT",
     "authors": [

src/Console/Commands/MakeEventCommand.php

@@ -25,27 +25,24 @@ class MakeEventCommand extends Command
      *
      * @return int
      */
-    protected function handle(): int
+    public function handle(): int
     {
         return $this->executeWithTiming(function () {
-            $name = $this->argument('name');
-            $parts = explode('/', $name);
-            $className = array_pop($parts);
+            [$name, $parts, $className] = $this->splitGeneratedName((string) $this->argument('name'));
 
             // Ensure class name ends with Event
             if (!str_ends_with($className, 'Event')) {
                 $className .= 'Event';
             }
 
             $namespace = 'App\\Events' . (count($parts) > 0 ? '\\' . implode('\\', $parts) : '');
-            $parts[] = $className;
-
-            $filePath = base_path('app/Events/' . implode(DIRECTORY_SEPARATOR, $parts) . '.php');
+            $fileName = count($parts) > 0 ? implode('/', $parts) . '/' . $className : $className;
+            $filePath = $this->generatedFilePath('app/Events', $fileName);
 
             // Check if Event already exists
             if (file_exists($filePath)) {
                 $this->displayError('Event already exists at:');
-                $this->line('<fg=white>' . str_replace(base_path(), '', $filePath) . '</>');
+                $this->line('<fg=white>' . $this->relativePath($filePath) . '</>');
                 return Command::FAILURE;
             }
 
@@ -64,7 +61,7 @@ protected function handle(): int
             file_put_contents($filePath, $content);
 
             $this->displaySuccess('Event created successfully');
-            $this->line('<fg=yellow>📦 File:</> <fg=white>' . str_replace(base_path(), '', $filePath) . '</>');
+            $this->line('<fg=yellow>📦 File:</> <fg=white>' . $this->relativePath($filePath) . '</>');
             $this->newLine();
             $this->line('<fg=yellow>⚙️  Class:</> <fg=white>' . $className . '</>');
 

src/Console/Commands/WebSocketStartCommand.php

@@ -29,7 +29,7 @@ class WebSocketStartCommand extends Command
      *
      * @return int
      */
-    protected function handle(): int
+    public function handle(): int
     {
         $host = $this->option('host');
         $port = $this->option('port');

tests/Unit/MakeEventCommandTest.php

@@ -0,0 +1,125 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doppar\Airbend\Tests\Unit;
+
+use Doppar\Airbend\Console\Commands\MakeEventCommand;
+use PHPUnit\Framework\TestCase;
+
+class MakeEventCommandTest extends TestCase
+{
+    private string $tempRoot;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->tempRoot = sys_get_temp_dir() . '/doppar-airbend-command-' . bin2hex(random_bytes(5));
+        mkdir($this->tempRoot, 0755, true);
+    }
+
+    protected function tearDown(): void
+    {
+        $this->deleteDirectory($this->tempRoot);
+
+        parent::tearDown();
+    }
+
+    public function testMakeEventCommandSupportsBackslashesAndRelativeOutput(): void
+    {
+        $command = new class($this->tempRoot) extends MakeEventCommand
+        {
+            public array $capturedLines = [];
+            public array $capturedSuccesses = [];
+
+            public function __construct(private string $tempRoot)
+            {
+                parent::__construct();
+            }
+
+            protected function argument($key = null)
+            {
+                return $key === 'name' ? 'Realtime\\OrderPlaced' : null;
+            }
+
+            protected function line(string $string, ?string $style = null): void
+            {
+                $this->capturedLines[] = $string;
+            }
+
+            protected function newLine($count = 1): void
+            {
+            }
+
+            protected function displaySuccess(string $message): void
+            {
+                $this->capturedSuccesses[] = $message;
+            }
+
+            protected function executeWithTiming(callable $callback): int
+            {
+                $result = $callback();
+
+                return is_int($result) ? $result : 0;
+            }
+
+            protected function generatedFilePath(string $baseDirectory, string $name, string $extension = '.php'): string
+            {
+                $normalizedName = $this->normalizeGeneratedName($name);
+                $relativePath = trim($baseDirectory, '/\\');
+
+                if ($normalizedName !== '') {
+                    $relativePath .= '/' . $normalizedName;
+                }
+
+                return $this->tempRoot . '/' . $relativePath . $extension;
+            }
+
+            protected function relativePath(string $path, ?string $basePath = null): string
+            {
+                $normalizedPath = str_replace('\\', '/', $path);
+                $normalizedBase = rtrim(str_replace('\\', '/', $this->tempRoot), '/');
+
+                return substr($normalizedPath, strlen($normalizedBase) + 1);
+            }
+        };
+
+        $result = $command->handle();
+        $file = $this->tempRoot . '/app/Events/Realtime/OrderPlacedEvent.php';
+        $contents = (string) file_get_contents($file);
+
+        $this->assertSame(0, $result);
+        $this->assertFileExists($file);
+        $this->assertStringContainsString('namespace App\\Events\\Realtime;', $contents);
+        $this->assertStringContainsString('class OrderPlacedEvent extends BaseBroadcastEvent', $contents);
+        $this->assertContains('Event created successfully', $command->capturedSuccesses);
+        $this->assertContains(
+            '<fg=yellow>📦 File:</> <fg=white>app/Events/Realtime/OrderPlacedEvent.php</>',
+            $command->capturedLines
+        );
+    }
+
+    private function deleteDirectory(string $directory): void
+    {
+        if (!is_dir($directory)) {
+            return;
+        }
+
+        $iterator = new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator($directory, \FilesystemIterator::SKIP_DOTS),
+            \RecursiveIteratorIterator::CHILD_FIRST
+        );
+
+        foreach ($iterator as $item) {
+            if ($item->isDir()) {
+                rmdir($item->getPathname());
+                continue;
+            }
+
+            unlink($item->getPathname());
+        }
+
+        rmdir($directory);
+    }
+}