Backporting changes merged to v4, also in v3

Author: specialtactics

src/Hyperwallet/Hyperwallet.php

@@ -68,13 +68,13 @@ class Hyperwallet {
      *
      * @throws HyperwalletArgumentException
      */
-    public function __construct($username, $password, $programToken = null, $server = 'https://api.sandbox.hyperwallet.com', $encryptionData = array()) {
+    public function __construct($username, $password, $programToken = null, $server = 'https://api.sandbox.hyperwallet.com', $encryptionData = array(), $clientOptions = array()) {
         if (empty($username) || empty($password)) {
             throw new HyperwalletArgumentException('You need to specify your API username and password!');
         }
 
         $this->programToken = $programToken;
-        $this->client = new ApiClient($username, $password, $server, array(), $encryptionData);
+        $this->client = new ApiClient($username, $password, $server, $clientOptions, $encryptionData);
     }
 
     //--------------------------------------

tests/Hyperwallet/Tests/Util/HyperwalletEncryptionTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace Hyperwallet\Tests;
+namespace Hyperwallet\Tests\Util;
 
 use Hyperwallet\Util\HyperwalletEncryption;
 use Hyperwallet\Exception\HyperwalletException;
@@ -37,8 +37,10 @@ public function testShouldFailDecryptionWhenWrongPrivateKeyIsUsed() {
             $encryption2->decrypt($encryptedMessage);
             $this->fail('Exception expected');
         } catch (\Exception $e) {
-            $this->assertEquals('Decryption error', $e->getMessage());
-        }
+            $this->assertThat($e->getMessage(), $this->logicalOr(
+                $this->equalTo('Decryption error'),
+                $this->equalTo('Ciphertext representative out of range')
+            ));        }
     }
 
     public function testShouldFailSignatureVerificationWhenWrongPublicKeyIsUsed() {