Merge pull request #4 from blamebutton/3-error-in-dockergenerate-detect

Bugfix for key not found

Author: bram-pkg

src/Commands/GenerateQuestions/PhpExtensionsQuestion.php

@@ -42,19 +42,18 @@ public function getAnswer(BaseCommand $command, string $phpVersion): array
             ->detect();
 
         if ($command->option('detect')) {
-            $detected = explode(',', $detected);
-
-            foreach ($detected as $key => $value) {
-                $detected[$key] = $supported[$value];
-            }
-
             return $detected;
         }
 
+        $default = collect($detected)
+            ->map(fn ($extension) => array_search($extension, $supported))
+            ->where(fn ($key) => is_int($key))
+            ->join(',');
+
         return $command->choice(
             question: 'PHP extensions',
             choices: $supported,
-            default: $detected,
+            default: $default,
             multiple: true,
         );
     }

src/Detectors/DetectorContract.php

@@ -4,5 +4,5 @@
 
 interface DetectorContract
 {
-    public function detect(): string|false;
+    public function detect(): array|string|false;
 }

src/Detectors/PhpExtensionsDetector.php

@@ -20,7 +20,7 @@ public function supported(array $supported = null): self|array
         return $this;
     }
 
-    public function detect(): string
+    public function detect(): array
     {
         $extensions = [
             $this->getDefaultExtensions(),
@@ -36,9 +36,8 @@ public function detect(): string
             ->unique()
             ->sort()
             ->intersect($this->supported())
-            ->map(fn (string $extension) => array_search($extension, $this->supported()))
-            ->filter(fn ($value) => is_int($value))
-            ->join(',');
+            ->values()
+            ->toArray();
     }
 
     /**

tests/Unit/Commands/GenerateQuestions/PhpExtensionsQuestionTest.php

@@ -73,7 +73,7 @@ public function testItDetectsExtensions(): void
                 ->andReturnSelf();
             $mock->shouldReceive('detect')
                 ->once()
-                ->andReturn('0,1');
+                ->andReturn(['bcmath', 'pdo_mysql']);
         });
 
         $mock = $this->createMock(BaseCommand::class);
@@ -103,7 +103,7 @@ public function testItAsksForInput(): void
                 ->andReturnSelf();
             $mock->shouldReceive('detect')
                 ->once()
-                ->andReturn('');
+                ->andReturn([]);
         });
 
         $mock = $this->createMock(BaseCommand::class);

tests/Unit/Detectors/PhpExtensionsDetectorTest.php

@@ -37,7 +37,7 @@ public function provideConfigurations(): array
     {
         return [
             [
-                '1',
+                ['bcmath'],
                 [
                     'cache.default' => 'array',
                     'cache.stores.array.driver' => 'array',
@@ -52,7 +52,7 @@ public function provideConfigurations(): array
                 ],
             ],
             [
-                '0,1',
+                ['apcu', 'bcmath'],
                 [
                     'cache.default' => 'apc',
                     'cache.stores.apc.driver' => 'apc',
@@ -66,7 +66,7 @@ public function provideConfigurations(): array
                 ],
             ],
             [
-                '1,6',
+                ['bcmath', 'redis'],
                 [
                     'cache.default' => 'array',
                     'cache.stores.array.driver' => 'array',
@@ -80,7 +80,7 @@ public function provideConfigurations(): array
                 ],
             ],
             [
-                '1,6',
+                ['bcmath', 'redis'],
                 [
                     'cache.default' => 'array',
                     'cache.stores.array.driver' => 'array',
@@ -94,7 +94,7 @@ public function provideConfigurations(): array
                 ],
             ],
             [
-                '0,1,3',
+                ['apcu', 'bcmath', 'pdo_mysql'],
                 [
                     'cache.default' => 'apc',
                     'cache.stores.apc.driver' => 'apc',
@@ -108,7 +108,7 @@ public function provideConfigurations(): array
                 ],
             ],
             [
-                '1,2,5,6,7',
+                ['bcmath', 'memcached', 'pdo_sqlsrv', 'redis', 'sqlsrv'],
                 [
                     'cache.default' => 'memcached',
                     'cache.stores.memcached.driver' => 'memcached',
@@ -126,7 +126,7 @@ public function provideConfigurations(): array
     }
 
     /** @dataProvider provideConfigurations */
-    public function testItDetectsExtensionsWithoutDuplicates(string $expected, array $config): void
+    public function testItDetectsExtensionsWithoutDuplicates(array $expected, array $config): void
     {
         config()->set($config);