More mapped fields.

vierge-noire · Dec 23, 2023 · 4c7dcbd · 4c7dcbd
1 parent eea154c
commit 4c7dcbd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/Command/BakeFixtureFactoryCommand.php b/src/Command/BakeFixtureFactoryCommand.php
@@ -51,12 +51,23 @@ class BakeFixtureFactoryCommand extends BakeCommand
     /**
      * @var array
      */
-    protected $map = [
+    protected array $map = [
         'string' => [
             'name' => 'name',
+            'first_name' => 'firstName',
+            'last_name' => 'lastName',
+            'username' => 'userName',
             'slug' => 'slug',
+            'email' => 'email',
             'description' => 'words',
             'postal_code' => 'postcode',
+            'city' => 'city',
+            'address' => 'address',
+            'url' => 'url',
+            'ip_address' => 'ipv4',
+            'currency' => 'currencyCode',
+            'phone_number' => 'phoneNumber',
+            'timezone' => 'timezone',
         ],
         'float' => [
             'latitude' => 'latitude',
@@ -589,7 +600,11 @@ protected function foreignKeys(AssociationCollection $associations): array
         $keys = [];
 
         foreach ($associations as $association) {
-            $keys[] = $association->getForeignKey();
+            $key = $association->getForeignKey();
+            if ($key === false) {
+                continue;
+            }
+            $keys = array_merge($keys, (array)$key);
         }
 
         return $keys;

diff --git a/src/View/Helper/FactoryBakeHelper.php b/src/View/Helper/FactoryBakeHelper.php
@@ -14,8 +14,10 @@ class FactoryBakeHelper extends Helper
     public function defaultData(array $defaultData): string
     {
         $rows = [];
+        $indent = str_repeat(' ', 4 * 4);
+
         foreach ($defaultData as $key => $value) {
-            $rows[] = "\t\t\t\t" . '\'' . $key . '\' => ' . $value . ',';
+            $rows[] = $indent . '\'' . $key . '\' => ' . $value . ',';
         }
 
         $string = implode(PHP_EOL, $rows);