Merge pull request #106 from nickyr/master

Fix bug where validating currency field passes after setting the currency to null

Author: barryvdh

src/Omnipay/Common/Message/AbstractRequest.php

@@ -383,7 +383,10 @@ public function getCurrency()
      */
     public function setCurrency($value)
     {
-        return $this->setParameter('currency', strtoupper($value));
+        if ($value !== null) {
+            $value = strtoupper($value);
+        }
+        return $this->setParameter('currency', $value);
     }
 
     /**

tests/Omnipay/Common/Message/AbstractRequestTest.php

@@ -270,6 +270,12 @@ public function testCurrencyLowercase()
         $this->assertSame('USD', $this->request->getCurrency());
     }
 
+    public function testCurrencyNull()
+    {
+        $this->assertSame($this->request, $this->request->setCurrency(null));
+        $this->assertNull($this->request->getCurrency());
+    }
+
     public function testCurrencyNumeric()
     {
         $this->assertSame($this->request, $this->request->setCurrency('USD'));