Refactor passing of issue config

To avoid falls with variables naming when added new issue property.
Aeliot-Tm · Jun 17, 2024 · 2371182 · 2371182
1 parent 2c96a13
commit 2371182
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/Service/Registrar/JIRA/IssueConfig.php b/src/Service/Registrar/JIRA/IssueConfig.php
@@ -34,14 +34,14 @@ public function __construct(array $config)
             'priority' => null,
             'tagPrefix' => '',
         ];
-        $issue = $config['issue'] + $issueDefaults;
+        $issue = $config + $issueDefaults;
         $this->addTagToLabels = (bool) $issue['addTagToLabels'];
         $this->assignee = $issue['assignee'];
         $this->components = (array) $issue['components'];
         $this->issueType = $issue['type'];
         $this->labels = (array) $issue['labels'];
         $this->priority = $issue['priority'];
-        $this->projectKey = $config['projectKey'];
+        $this->projectKey = $issue['projectKey'];
         $this->tagPrefix = $issue['tagPrefix'];
     }
 

diff --git a/src/Service/Registrar/JIRA/JiraRegistrarFactory.php b/src/Service/Registrar/JIRA/JiraRegistrarFactory.php
@@ -13,8 +13,9 @@ class JiraRegistrarFactory implements RegistrarFactoryInterface
 {
     public function create(array $config): RegistrarInterface
     {
+        $issueConfig = ($config['issue'] ?? []) + ['projectKey' => $config['projectKey']];
         return new JiraRegistrar(
-            new IssueFieldFactory(new IssueConfig($config)),
+            new IssueFieldFactory(new IssueConfig($issueConfig)),
             $this->createIssueService($config['service']),
         );
     }

diff --git a/tests/Unit/Service/Registrar/IssueConfigTest.php b/tests/Unit/Service/Registrar/IssueConfigTest.php
@@ -14,14 +14,13 @@ final class IssueConfigTest extends TestCase
     public function testValueAssigning(): void
     {
         $values = [
-            'issue' => [
-                'addTagToLabels' => true,
-                'components' => ['Component-1', 'Component-2'],
-                'labels' => ['Label-1', 'Label-2'],
-                'priority' => 'Low',
-                'tagPrefix' => 'tag-',
-                'type' => 'Bug',
-            ],
+            'addTagToLabels' => true,
+            'components' => ['Component-1', 'Component-2'],
+            'labels' => ['Label-1', 'Label-2'],
+            'priority' => 'Low',
+            'tagPrefix' => 'tag-',
+            'type' => 'Bug',
+            // extra key added in factory
             'projectKey' => 'Todo',
         ];
         $config = new IssueConfig($values);