From 711d1f10f9bb6eb685a0851187ca62d808e4ee53 Mon Sep 17 00:00:00 2001
From: Jason Judge <jason.judge@consil.co.uk>
Date: Sat, 22 Jun 2019 23:33:01 +0100
Subject: [PATCH] Fix incorrect handling of userFields in response.

---
 src/Request/Model/Customer.php           |  3 ++-
 src/Response/Collections/UserFields.php  |  2 +-
 src/Response/Model/UserField             | 13 ------------
 src/Response/Model/UserField.php         | 27 ++++++++++++++++++++++++
 tests/ServerRequest/NotificationTest.php |  2 +-
 5 files changed, 31 insertions(+), 16 deletions(-)
 delete mode 100644 src/Response/Model/UserField
 create mode 100644 src/Response/Model/UserField.php

diff --git a/src/Request/Model/Customer.php b/src/Request/Model/Customer.php
index de1af5f..20d9c90 100644
--- a/src/Request/Model/Customer.php
+++ b/src/Request/Model/Customer.php
@@ -3,7 +3,8 @@
 namespace Academe\AuthorizeNet\Request\Model;
 
 /**
- *
+ * FIXME: the driversLicense is an object, not a scalar.
+ * See https://github.com/academe/authorizenet-objects/issues/10
  */
 
 use Academe\AuthorizeNet\TransactionRequestInterface;
diff --git a/src/Response/Collections/UserFields.php b/src/Response/Collections/UserFields.php
index ee211bf..2874498 100644
--- a/src/Response/Collections/UserFields.php
+++ b/src/Response/Collections/UserFields.php
@@ -19,7 +19,7 @@ public function __construct(array $data = [])
         $this->setData($data);
 
         // An array of userField records.
-        foreach ($this->getDataValue('userField') as $userField_data) {
+        foreach ($data as $userField_data) {
             $this->push(new UserField($userField_data));
         }
     }
diff --git a/src/Response/Model/UserField b/src/Response/Model/UserField
deleted file mode 100644
index b8c61b9..0000000
--- a/src/Response/Model/UserField
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Academe\AuthorizeNet\Response\Model;
-
-/**
- * The Response UserField is identical to the Request UserField.
- */
-
-use Academe\AuthorizeNet\Request\Model\UserField as RequestUserField;
-
-class UserField extends RequestUserField
-{
-}
diff --git a/src/Response/Model/UserField.php b/src/Response/Model/UserField.php
new file mode 100644
index 0000000..b4866f3
--- /dev/null
+++ b/src/Response/Model/UserField.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Academe\AuthorizeNet\Response\Model;
+
+/**
+ * The Response UserField is identical to the Request UserField.
+ */
+
+use Academe\AuthorizeNet\Request\Model\UserField as RequestUserField;
+
+class UserField extends RequestUserField
+{
+    public function __construct(
+        $name,
+        $value = null
+    ) {
+        if (is_string($name) && is_string($value)) {
+            parent::__construct($name, $value);
+        }
+
+        if (is_array($name) && is_null($value)) {
+            parent::__construct($name['name'], $name['value']);
+        }
+    }
+}
+
+
diff --git a/tests/ServerRequest/NotificationTest.php b/tests/ServerRequest/NotificationTest.php
index 3df52ea..45a85db 100644
--- a/tests/ServerRequest/NotificationTest.php
+++ b/tests/ServerRequest/NotificationTest.php
@@ -3,7 +3,7 @@
 namespace Academe\AuthorizeNet\ServerRequest;
 
 /**
- *
+ * The notification webhook.
  */
 
 use PHPUnit\Framework\TestCase;