refactor: pr comments

Author: Rovasch

.php-cs-fixer.php

@@ -3,39 +3,40 @@
 declare(strict_types=1);
 
 $finder = PhpCsFixer\Finder::create()
-	->notPath('vendor')
-	->notPath('node_modules')
-	->in(__DIR__)
-	->in('./resources/views')
-	->in('./config')
-	->name('*.php')
-	->notName('*.blade.php')
-	->ignoreDotFiles(true)
-	->ignoreVCS(true);
+    ->notPath('vendor')
+    ->notPath('node_modules')
+    ->in(__DIR__)
+    ->in('./resources/views')
+    ->in('./config')
+    ->name('*.php')
+    ->notName('*.blade.php')
+    ->ignoreDotFiles(true)
+    ->ignoreVCS(true);
 
 return (new PhpCsFixer\Config)
-	->setRules([
-		'@PSR2' => true,
-		'array_syntax' => [
-			'syntax' => 'short',
-		],
-		'ordered_imports' => [
-			'sort_algorithm' => 'alpha',
-		],
-		'no_unused_imports' => true,
-		'binary_operator_spaces' => [
-			'default' => 'single_space',
-			'operators' => [
-				'=>' => 'single_space',
-				'|' => 'no_space',
-			],
-		],
-		'full_opening_tag' => true,
-		'yoda_style' => [
-			'always_move_variable' => true,
-			'equal' => true,
-			'identical' => true,
-			'less_and_greater' => true,
-		],
-	])
-	->setFinder($finder);
+    ->setRules([
+        '@PSR2' => true,
+        'array_syntax' => [
+            'syntax' => 'short',
+        ],
+        'ordered_imports' => [
+            'sort_algorithm' => 'alpha',
+        ],
+        'no_unused_imports' => true,
+        'array_indentation' => true,
+        'binary_operator_spaces' => [
+            'default' => 'single_space',
+            'operators' => [
+                '=>' => 'single_space',
+                '|' => 'no_space',
+            ],
+        ],
+        'full_opening_tag' => true,
+        'yoda_style' => [
+            'always_move_variable' => true,
+            'equal' => true,
+            'identical' => true,
+            'less_and_greater' => true,
+        ],
+    ])
+    ->setFinder($finder);

src/PrefillGravityForms/Services/PersonalDataService.php

@@ -52,11 +52,20 @@ private function key(string $key): string
             return 'naam.voornamen';
         }
 
-        if ('enableu' === strtolower($this->supplier) && 'verblijfplaats.woonplaats' === $key || 'vrijbrp' == strtolower($this->supplier) && 'verblijfplaats.woonplaats' === $key) {
+        $prefillSuppliersWithKeyExceptions = [
+            'enableu',
+            'vrijbrp'
+        ];
+
+        if (! in_array(strtolower($this->supplier), $prefillSuppliersWithKeyExceptions)) {
+            return $key;
+        }
+
+        if ('verblijfplaats.woonplaats' === $key) {
             return 'verblijfplaats.woonplaatsnaam';
         }
 
-        if ('enableu' === strtolower($this->supplier) && 'verblijfplaats.straat' === $key || 'vrijbrp' == strtolower($this->supplier) && 'verblijfplaats.straat' === $key) {
+        if ('verblijfplaats.straat' === $key) {
             return 'verblijfplaats.straatnaam';
         }