fix: Refactor component handling in ServiceMap to improve variable naming and streamline logic. (#28)

Author: terabytesoftw

CHANGELOG.md

@@ -5,6 +5,7 @@
 - Enh #25: Add support for PHPStan Extension Installer (@samuelrajan747)
 - Enh #26: Add PHPStan extension installer instructions and improve `ServiceMap` configuration handling (@terabytesoftw)
 - Bug #27: Enhance error handling in `ServiceMap` for invalid configuration structures and add corresponding test cases (@terabytesoftw)
+- Bug #28: Refactor component handling in `ServiceMap` to improve variable naming and streamline logic (@terabytesoftw)
 
 ## 0.2.2 June 04, 2025
 

src/ServiceMap.php

@@ -270,24 +270,20 @@ private function processComponents(array $config): void
         if ($config !== []) {
             $components = $config['components'] ?? [];
 
-            foreach ($components as $id => $component) {
+            foreach ($components as $id => $definition) {
                 if (is_string($id) === false) {
                     $this->throwErrorWhenIdIsNotString('Component', gettype($id));
                 }
 
-                if (is_object($component)) {
-                    $this->components[$id] = get_class($component);
+                if (is_object($definition)) {
+                    $this->components[$id] = get_class($definition);
 
                     continue;
                 }
 
-                if (isset($component['class']) && is_string($component['class']) && $component['class'] !== '') {
-                    $this->components[$id] = $component['class'];
-
-                    continue;
+                if (isset($definition['class']) && is_string($definition['class']) && $definition['class'] !== '') {
+                    $this->components[$id] = $definition['class'];
                 }
-
-                $this->throwErrorWhenUnsupportedDefinition($id);
             }
         }
     }

tests/ServiceMapTest.php

@@ -120,6 +120,10 @@ public function testItLoadsServicesAndComponents(): void
             $serviceMap->getComponentClassById('customInitializedComponent'),
             'ServiceMap should resolve component id \'customInitializedComponent\' to \'MyActiveRecord::class\'.',
         );
+        $this->assertNull(
+            $serviceMap->getComponentClassById('assetManager'),
+            'ServiceMap should return \'null\' for \'assetManager\' component id as it is not a class but an array.',
+        );
     }
 
     public function testItAllowsWithoutEmptyConfigPath(): void
@@ -164,20 +168,6 @@ public function testThrowRuntimeExceptionWhenComponentsHasUnsupportedIdNotString
         new ServiceMap($fixturePath);
     }
 
-    /**
-     * @throws ReflectionException if the service definition is invalid or can't be resolved.
-     */
-    public function testThrowRuntimeExceptionWhenComponentsHasUnsupportedTypeArrayInvalidValue(): void
-    {
-        $ds = DIRECTORY_SEPARATOR;
-        $fixturePath = __DIR__ . "{$ds}fixture{$ds}components-unsupported-type-array-invalid.php";
-
-        $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage('Unsupported definition for \'unsupported-array-invalid\'.');
-
-        new ServiceMap($fixturePath);
-    }
-
     public function testThrowRuntimeExceptionWhenConfigPathFileDoesNotExist(): void
     {
         $this->expectException(InvalidArgumentException::class);

tests/fixture/components-unsupported-type-array-invalid.php

@@ -6,6 +6,9 @@
 
 return [
     'components' => [
+        'assetManager' => [
+            'basePath' => '@runtime/assets',
+        ],
         'customComponent' => [
             'class' => MyActiveRecord::class,
         ],