From de7d40546eb4a4552f48e08f2f7734052ce437d6 Mon Sep 17 00:00:00 2001
From: Jan Henk Hazelaar <janhenk@concept7.nl>
Date: Thu, 18 Mar 2021 09:35:57 +0100
Subject: [PATCH 1/5] Added acf support for users

---
 src/Entity/User.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/Entity/User.php b/src/Entity/User.php
index da96190..bb75f3f 100644
--- a/src/Entity/User.php
+++ b/src/Entity/User.php
@@ -6,11 +6,12 @@
 
 class User extends Entity
 {
+    public $acf;
     public $user_pass;
-    public $user_login; 
-    public $user_nicename; 
-    public $user_url; 
-    public $user_email; 
+    public $user_login;
+    public $user_nicename;
+    public $user_url;
+    public $user_email;
     public $display_name;
     public $nickname;
     public $first_name;
@@ -33,6 +34,13 @@ public function persist()
 
         update_user_meta($this->id, '_fake', true);
 
+        if (class_exists('acf') && $this->acf) {
+            foreach ($this->acf as $name => $value) {
+                $field = acf_get_field($name);
+                update_field($field['key'], $value, $this->id);
+            }
+        }
+
         if ($this->meta) {
             foreach ($this->meta as $key => $value) {
                 update_user_meta($this->id, $key, $value);

From 66359c4482cd5c8d960986a99884c68e38ee7720 Mon Sep 17 00:00:00 2001
From: Jan Henk Hazelaar <janhenk@concept7.nl>
Date: Thu, 18 Mar 2021 10:01:37 +0100
Subject: [PATCH 2/5] Unset meta and acf data

---
 src/Entity/User.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Entity/User.php b/src/Entity/User.php
index bb75f3f..bd0500e 100644
--- a/src/Entity/User.php
+++ b/src/Entity/User.php
@@ -76,6 +76,9 @@ protected function getUserData()
     {
         $data = get_object_vars($this);
 
+        unset($data['acf']);
+        unset($data['meta']);
+
         return array_filter($data);
     }
 }

From 6db9b96dc9a0cd398b63adb82cf86c5de365cf20 Mon Sep 17 00:00:00 2001
From: Jan Henk Hazelaar <janhenk@concept7.nl>
Date: Thu, 18 Mar 2021 10:09:14 +0100
Subject: [PATCH 3/5] Update everthink

---
 composer.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 566cffe..13ccbb6 100644
--- a/composer.json
+++ b/composer.json
@@ -21,12 +21,12 @@
   },
   "require": {
     "php": "^5.6 || ^7.0",
-    "fzaninotto/faker": "^1.8",
-    "nelmio/alice": "^2.2",
-    "wp-cli/wp-cli": "^2.0"
+    "wp-cli/wp-cli": "^2.0",
+    "fakerphp/faker": "^1.13",
+    "nelmio/alice": "^3.8"
   },
   "require-dev": {
-    "behat/behat": "^2.5",
-    "squizlabs/php_codesniffer": "^2.9"
+    "behat/behat": "^3.8",
+    "squizlabs/php_codesniffer": "^3.5"
   }
 }

From 861361dda8f8ed6be26ec5e1cb1184910187694a Mon Sep 17 00:00:00 2001
From: Jan Henk Hazelaar <janhenk@concept7.nl>
Date: Thu, 18 Mar 2021 10:38:29 +0100
Subject: [PATCH 4/5] Using AliceDataFixtures

---
 composer.json     |  3 ++-
 src/Faker.php     | 11 ++++++-----
 src/Persister.php |  8 ++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index 13ccbb6..7ebabb6 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,8 @@
     "php": "^5.6 || ^7.0",
     "wp-cli/wp-cli": "^2.0",
     "fakerphp/faker": "^1.13",
-    "nelmio/alice": "^3.8"
+    "nelmio/alice": "^3.8",
+    "theofidry/alice-data-fixtures": "^1.4"
   },
   "require-dev": {
     "behat/behat": "^3.8",
diff --git a/src/Faker.php b/src/Faker.php
index e3d5de6..6f30601 100644
--- a/src/Faker.php
+++ b/src/Faker.php
@@ -1,7 +1,8 @@
 <?php
 namespace Trendwerk\Faker;
 
-use Nelmio\Alice\Fixtures\Loader;
+// use Nelmio\Alice\Fixtures\Loader;
+use Nelmio\Alice\Loader\NativeLoader;
 
 final class Faker
 {
@@ -11,7 +12,7 @@ final class Faker
     public function __construct($files)
     {
         $this->files = $files;
-        $this->loader = new Loader(get_locale(), [new Provider\Term]);
+        $this->loader = new NativeLoader();
     }
 
     public function persist(ProgressBar $progressBar)
@@ -19,7 +20,7 @@ public function persist(ProgressBar $progressBar)
         $persister = new Persister($progressBar);
 
         foreach ($this->files as $file) {
-            $objects = $this->loader->load($file);
+            $objects = $this->loader->loadFile($file);
             $persister->persist($objects);
         }
     }
@@ -29,8 +30,8 @@ public function getObjectCount()
         $objects = [];
 
         foreach ($this->files as $file) {
-            $set = $this->loader->load($file);
-            $objects = array_merge($objects, $set);
+            $set = $this->loader->loadFile($file);
+            $objects = array_merge($objects, $set->getObjects());
         }
 
         return count($objects);
diff --git a/src/Persister.php b/src/Persister.php
index 376538a..381ebe3 100644
--- a/src/Persister.php
+++ b/src/Persister.php
@@ -1,7 +1,7 @@
 <?php
 namespace Trendwerk\Faker;
 
-use Nelmio\Alice\PersisterInterface;
+use Fidry\AliceDataFixtures\Persistence\PersisterInterface;
 
 final class Persister implements PersisterInterface
 {
@@ -12,15 +12,15 @@ public function __construct(ProgressBar $progressBar)
         $this->progressBar = $progressBar;
     }
 
-    public function persist(array $objects)
+    public function persist($objects)
     {
-        foreach ($objects as $object) {
+        foreach ($objects->getObjects() as $object) {
             $object->persist();
             $this->progressBar->tick();
         }
     }
 
-    public function find($class, $id)
+    public function flush()
     {
     }
 }

From 9ac09860e94d9c79298231278696d71bc5afee53 Mon Sep 17 00:00:00 2001
From: Jan Henk Hazelaar <janhenk@concept7.nl>
Date: Thu, 18 Mar 2021 10:56:35 +0100
Subject: [PATCH 5/5] Removed commented out use

---
 src/Command.php | 1 -
 src/Faker.php   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/Command.php b/src/Command.php
index d7c9356..59ad6b3 100644
--- a/src/Command.php
+++ b/src/Command.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace Trendwerk\Faker;
 
 use WP_CLI;
diff --git a/src/Faker.php b/src/Faker.php
index 6f30601..f3f6372 100644
--- a/src/Faker.php
+++ b/src/Faker.php
@@ -1,7 +1,6 @@
 <?php
 namespace Trendwerk\Faker;
 
-// use Nelmio\Alice\Fixtures\Loader;
 use Nelmio\Alice\Loader\NativeLoader;
 
 final class Faker