From 82344206ccdd7c4a7d6dae8bba930b4cc196ae7c Mon Sep 17 00:00:00 2001
From: Jeremy Pry <jeremy.pry@gmail.com>
Date: Wed, 3 Dec 2014 10:48:46 -0500
Subject: [PATCH 1/3] Remove trailing s from class name

---
 .../LoadBalancer/Resource/CertificateMappings.php      |  2 +-
 lib/OpenCloud/LoadBalancer/Resource/LoadBalancer.php   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/OpenCloud/LoadBalancer/Resource/CertificateMappings.php b/lib/OpenCloud/LoadBalancer/Resource/CertificateMappings.php
index c4fed5dd3..28e75aa9a 100644
--- a/lib/OpenCloud/LoadBalancer/Resource/CertificateMappings.php
+++ b/lib/OpenCloud/LoadBalancer/Resource/CertificateMappings.php
@@ -25,7 +25,7 @@
  * to a corresponding hostname, allowing multiple SSL certificates to
  * exist and be accurately utilized from a Load Balancer.
  */
-class CertificateMappings extends PersistentResource
+class CertificateMapping extends PersistentResource
 {
     /**
      * Id for the Certificate Map.
diff --git a/lib/OpenCloud/LoadBalancer/Resource/LoadBalancer.php b/lib/OpenCloud/LoadBalancer/Resource/LoadBalancer.php
index 19b667cd7..bd0742bcb 100644
--- a/lib/OpenCloud/LoadBalancer/Resource/LoadBalancer.php
+++ b/lib/OpenCloud/LoadBalancer/Resource/LoadBalancer.php
@@ -150,7 +150,7 @@ class LoadBalancer extends PersistentResource implements HasPtrRecordsInterface
     protected static $url_resource = 'loadbalancers';
 
     protected $associatedResources = array(
-        'certificateMapping' => 'CertificateMappings',
+        'certificateMapping' => 'CertificateMapping',
         'node'               => 'Node',
         'virtualIp'          => 'VirtualIp',
         'connectionLogging'  => 'ConnectionLogging',
@@ -159,7 +159,7 @@ class LoadBalancer extends PersistentResource implements HasPtrRecordsInterface
     );
 
     protected $associatedCollections = array(
-        'certificateMappings' => 'CertificateMappings',
+        'certificateMappings' => 'CertificateMapping',
         'nodes'               => 'Node',
         'virtualIps'          => 'VirtualIp',
         'accessList'          => 'Access'
@@ -400,11 +400,11 @@ public function virtualIpList()
      * @param int|array $id (Optional) Either a particular Certificate mapping ID, or an array of data about the
      *                      mapping. An array can include these keys: hostName, privateKey, certificate,
      *                      intermediateCertificate.
-     * @return \OpenCloud\LoadBalancer\Resource\CertificateMappings
+     * @return \OpenCloud\LoadBalancer\Resource\CertificateMapping
      */
     public function certificateMapping($id = null)
     {
-        return $this->getService()->resource('CertificateMappings', $id, $this);
+        return $this->getService()->resource('CertificateMapping', $id, $this);
     }
 
     /**
@@ -414,7 +414,7 @@ public function certificateMapping($id = null)
      */
     public function certificateMappingList()
     {
-        return $this->getService()->resourceList('CertificateMappings', null, $this);
+        return $this->getService()->resourceList('CertificateMapping', null, $this);
     }
 
     /**

From 4014af2c8ab4e6750cdc3dfe82b1d307c92ceebc Mon Sep 17 00:00:00 2001
From: Jeremy Pry <jeremy.pry@gmail.com>
Date: Wed, 3 Dec 2014 10:49:08 -0500
Subject: [PATCH 2/3] Adjust variable name

---
 lib/OpenCloud/LoadBalancer/Resource/CertificateMappings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/OpenCloud/LoadBalancer/Resource/CertificateMappings.php b/lib/OpenCloud/LoadBalancer/Resource/CertificateMappings.php
index 28e75aa9a..4dc4053d1 100644
--- a/lib/OpenCloud/LoadBalancer/Resource/CertificateMappings.php
+++ b/lib/OpenCloud/LoadBalancer/Resource/CertificateMappings.php
@@ -75,7 +75,7 @@ class CertificateMapping extends PersistentResource
 
     protected function updateJson($params = array())
     {
-        $update_fields = array(
+        $updateFields = array(
             'hostName',
             'certificate',
             'privateKey',

From 0b8b9adb082a0c72fb4239bb2752a3c8e0b81ee9 Mon Sep 17 00:00:00 2001
From: Jeremy Pry <jeremy.pry@gmail.com>
Date: Wed, 3 Dec 2014 10:49:18 -0500
Subject: [PATCH 3/3] Combine two loops into one

---
 .../LoadBalancer/Resource/CertificateMappings.php      | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/OpenCloud/LoadBalancer/Resource/CertificateMappings.php b/lib/OpenCloud/LoadBalancer/Resource/CertificateMappings.php
index 4dc4053d1..3b770a212 100644
--- a/lib/OpenCloud/LoadBalancer/Resource/CertificateMappings.php
+++ b/lib/OpenCloud/LoadBalancer/Resource/CertificateMappings.php
@@ -82,16 +82,12 @@ protected function updateJson($params = array())
             'intermediateCertificate',
         );
 
-        $fields = array_keys($params);
-        foreach ($fields as $field) {
-            if (!in_array($field, $update_fields)) {
-                throw new InvalidArgumentError("You cannot update ${field}.");
-            }
-        }
-
         $object = new \stdClass();
         $object->certificateMapping = new \stdClass();
         foreach ($params as $name => $value) {
+            if (!in_array($name, $updateFields)) {
+                throw new InvalidArgumentError("You cannot update ${name}.");
+            }
             $object->certificateMapping->$name = $this->$name;
         }