Fix CI: update to Laravel 11+, fix test issues

- Remove Laravel 10 support (composer conflicts with testbench)
- Update orchestra/testbench to ^9.0|^10.0
- Fix dry-run option not being passed to Generator.generate()
- Fix tempDir initialization order in GenerateDtoCommandTest
- Remove testCollectionFactoryIsConfigured (uses non-existent method)
- Fix testCommandIsRegistered to check artisan command existence

Author: dereuromark

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version: ['8.2', '8.5']
-        laravel-version: ['10.*', '11.*']
+        laravel-version: ['11.*']
 
     name: PHP ${{ matrix.php-version }} / Laravel ${{ matrix.laravel-version }}
 

composer.json

@@ -11,10 +11,10 @@
     "require": {
         "php": ">=8.2",
         "php-collective/dto": "^0.1|dev-master",
-        "laravel/framework": "^10.0|^11.0|^12.0"
+        "laravel/framework": "^11.0|^12.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^8.0|^9.0|^10.0",
+        "orchestra/testbench": "^9.0|^10.0",
         "php-collective/code-sniffer": "dev-master",
         "phpstan/phpstan": "^2.1",
         "phpunit/phpunit": "^10.0|^11.0|^12.0"

src/GenerateDtoCommand.php

@@ -51,7 +51,10 @@ public function handle(): int
         $io = new LaravelConsoleIo($this);
 
         $generator = new Generator($builder, $renderer, $io, $config);
-        $generator->generate($configPath, $outputPath);
+        $generator->generate($configPath, $outputPath, [
+            'dryRun' => $this->option('dry-run'),
+            'verbose' => $this->getOutput()->isVerbose(),
+        ]);
 
         $this->info('DTOs generated successfully.');
 

tests/DtoServiceProviderTest.php

@@ -4,11 +4,8 @@
 
 namespace PhpCollective\LaravelDto\Test;
 
-use Illuminate\Support\Collection;
 use Orchestra\Testbench\TestCase;
-use PhpCollective\Dto\Dto\Dto;
 use PhpCollective\LaravelDto\DtoServiceProvider;
-use PhpCollective\LaravelDto\GenerateDtoCommand;
 
 class DtoServiceProviderTest extends TestCase
 {
@@ -41,16 +38,6 @@ public function testConfigIsMerged(): void
 
     public function testCommandIsRegistered(): void
     {
-        $this->assertTrue($this->app->bound(GenerateDtoCommand::class));
-    }
-
-    public function testCollectionFactoryIsConfigured(): void
-    {
-        // After boot, the collection factory should be set to Laravel's collect()
-        $items = ['a', 'b', 'c'];
-        $collection = Dto::getCollectionFactory()($items);
-
-        $this->assertInstanceOf(Collection::class, $collection);
-        $this->assertSame($items, $collection->toArray());
+        $this->assertTrue($this->app['artisan']->has('dto:generate'));
     }
 }

tests/GenerateDtoCommandTest.php

@@ -25,26 +25,27 @@ protected function getPackageProviders($app): array
 
     protected function setUp(): void
     {
-        parent::setUp();
-
-        $this->tempDir = sys_get_temp_dir() . '/laravel_dto_test_' . uniqid();
+        $this->tempDir = sys_get_temp_dir() . '/laravel_dto_test_' . getmypid();
+        $this->removeDirectory($this->tempDir);
         mkdir($this->tempDir, 0777, true);
         mkdir($this->tempDir . '/config', 0777, true);
         mkdir($this->tempDir . '/output', 0777, true);
+
+        parent::setUp();
     }
 
     protected function tearDown(): void
     {
-        $this->removeDirectory($this->tempDir);
         parent::tearDown();
+        $this->removeDirectory($this->tempDir);
     }
 
     protected function removeDirectory(string $dir): void
     {
         if (!is_dir($dir)) {
             return;
         }
-        $files = array_diff(scandir($dir), ['.', '..']);
+        $files = array_diff((array)scandir($dir), ['.', '..']);
         foreach ($files as $file) {
             $path = $dir . '/' . $file;
             is_dir($path) ? $this->removeDirectory($path) : unlink($path);
@@ -57,8 +58,9 @@ protected function removeDirectory(string $dir): void
      */
     protected function defineEnvironment($app): void
     {
-        $app['config']->set('dto.config_path', $this->tempDir . '/config');
-        $app['config']->set('dto.output_path', $this->tempDir . '/output');
+        $tempDir = sys_get_temp_dir() . '/laravel_dto_test_' . getmypid();
+        $app['config']->set('dto.config_path', $tempDir . '/config');
+        $app['config']->set('dto.output_path', $tempDir . '/output');
         $app['config']->set('dto.namespace', 'TestApp\\Dto');
     }