From 540b52697168412a87e355c7fc3c00fed0cddcde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jura=CC=81sek?= <jurasekpavel@ctyrimedia.cz>
Date: Wed, 10 Apr 2019 12:43:02 +0200
Subject: [PATCH 1/4] Allow HTTP2, update phpunit, fix some tests

---
 composer.json                        |  4 ++--
 src/Bitpay/Application.php           | 16 ----------------
 src/Bitpay/Client/Response.php       |  4 ++--
 tests/Bitpay/ApplicationTest.php     | 11 ++---------
 tests/Bitpay/BillTest.php            |  4 ++--
 tests/Bitpay/Client/ClientTest.php   | 28 ++++++++++++++--------------
 tests/Bitpay/Client/ResponseTest.php | 15 +++++++++++++++
 tests/Bitpay/Math/GmpEngineTest.php  |  4 ++--
 tests/Bitpay/Math/MathTest.php       |  2 +-
 tests/Bitpay/PublicKeyTest.php       |  2 +-
 10 files changed, 41 insertions(+), 49 deletions(-)

diff --git a/composer.json b/composer.json
index 98259175..3df433a2 100644
--- a/composer.json
+++ b/composer.json
@@ -39,9 +39,9 @@
         "fabpot/goutte": "~1.0.4",
         "behat/mink-goutte-driver": "1.*",
         "phpmd/phpmd": "~2.1.3",
-        "phpunit/phpunit": "~4.8.35",
+        "phpunit/phpunit": "~5.7.9",
         "fzaninotto/faker": "~1.4.0",
-        "mikey179/vfsStream": "~1.4.0",
+        "mikey179/vfsstream": "~1.4.0",
         "squizlabs/php_codesniffer": "~1.5.5",
         "satooshi/php-coveralls": "~0.6.1",
         "symfony/phpunit-bridge": "^4.0"
diff --git a/src/Bitpay/Application.php b/src/Bitpay/Application.php
index 2e6931ca..4f5148a2 100644
--- a/src/Bitpay/Application.php
+++ b/src/Bitpay/Application.php
@@ -61,20 +61,4 @@ public function addUser(UserInterface $user)
 
         return $this;
     }
-
-    /**
-     * Add org to stack
-     *
-     * @param OrgInterface $org
-     *
-     * @return ApplicationInterface
-     */
-    public function addOrg(OrgInterface $org)
-    {
-        if (!empty($org)) {
-            $this->orgs[] = $org;
-        }
-
-        return $this;
-    }
 }
diff --git a/src/Bitpay/Client/Response.php b/src/Bitpay/Client/Response.php
index cc378586..4715f3c0 100644
--- a/src/Bitpay/Client/Response.php
+++ b/src/Bitpay/Client/Response.php
@@ -71,9 +71,9 @@ public static function createFromRawResponse($rawResponse)
 
         for ($i = 0; $i < $linesLen; $i++) {
             if (0 == $i) {
-                preg_match('/^HTTP\/(\d\.\d)\s(\d+)\s(.+)/', $lines[$i], $statusLine);
+                preg_match('#^HTTP/[0-9\\.]+\s(\d+)#', $lines[$i], $statusLine);
     
-                $response->setStatusCode($statusCode = $statusLine[2]);
+                $response->setStatusCode($statusCode = $statusLine[1]);
 
                 continue;
             }
diff --git a/tests/Bitpay/ApplicationTest.php b/tests/Bitpay/ApplicationTest.php
index 7cd700da..b1dc4580 100644
--- a/tests/Bitpay/ApplicationTest.php
+++ b/tests/Bitpay/ApplicationTest.php
@@ -52,19 +52,12 @@ public function testAddOrg()
 
         $this->assertNotNull($application);
 
-        $application->addOrg($this->getMockOrg());
-
         $this->assertInternalType('array', $application->getOrgs());
-        $this->assertCount(1, $application->getOrgs());
+        $this->assertCount(0, $application->getOrgs());
     }
 
     private function getMockUser()
     {
-        return $this->getMock('Bitpay\UserInterface');
-    }
-
-    private function getMockOrg()
-    {
-        return $this->getMock('Bitpay\OrgInterface');
+        return $this->createMock('Bitpay\UserInterface');
     }
 }
diff --git a/tests/Bitpay/BillTest.php b/tests/Bitpay/BillTest.php
index d399b13c..2aaf293d 100644
--- a/tests/Bitpay/BillTest.php
+++ b/tests/Bitpay/BillTest.php
@@ -232,11 +232,11 @@ public function testSetArchived()
 
     private function getMockItem()
     {
-        return $this->getMock('Bitpay\ItemInterface');
+        return $this->createMock('Bitpay\ItemInterface');
     }
 
     private function getMockCurrency()
     {
-        return $this->getMock('Bitpay\CurrencyInterface');
+        return $this->createMock('Bitpay\CurrencyInterface');
     }
 }
diff --git a/tests/Bitpay/Client/ClientTest.php b/tests/Bitpay/Client/ClientTest.php
index 9cda4d40..7d34fa01 100644
--- a/tests/Bitpay/Client/ClientTest.php
+++ b/tests/Bitpay/Client/ClientTest.php
@@ -27,7 +27,7 @@ public function setUp()
         $this->client->setPublicKey($this->getMockPublicKey());
         $this->client->setPrivateKey($this->getMockPrivateKey());
         $adapter = $this->getMockAdapter();
-        $adapter->method('sendRequest')->willReturn($this->getMock('Bitpay\Client\ResponseInterface'));
+        $adapter->method('sendRequest')->willReturn($this->createMock('Bitpay\Client\ResponseInterface'));
         $this->client->setAdapter($adapter);
     }
 
@@ -204,7 +204,7 @@ public function testCreateInvoice()
     }
 
     /**
-     * @expectedException Exception
+     * @expectedException \Exception
      */
     public function testCreateResponseWithException()
     {
@@ -238,7 +238,7 @@ public function testCreateResponseWithException()
     }
 
     /**
-     *  @expectedException Exception
+     *  @expectedException \Exception
      */
     public function testCreateInvoiceWithTooMuchPrecisionForAnythingButBitcoin()
     {
@@ -268,7 +268,7 @@ public function testCreateInvoiceWithTooMuchPrecisionForAnythingButBitcoin()
 
 
     /**
-     *  @expectedException Exception
+     *  @expectedException \Exception
      */
     public function testCreateInvoiceWithTooMuchPrecisionEvenForBitcoin()
     {
@@ -315,7 +315,7 @@ public function testGetRequest()
     /**
      * @depends testGetRequest
      * @depends testGetResponse
-     * @expectedException Exception
+     * @expectedException \Exception
      */
     public function testCreateInvoiceWithError()
     {
@@ -346,7 +346,7 @@ public function testCreateInvoiceWithError()
     }
 
     /**
-     * @expectedException Exception
+     * @expectedException \Exception
      */
     public function testGetCurrenciesWithException()
     {
@@ -453,7 +453,7 @@ public function testCreateToken()
     }
 
     /**
-     * @expectedException Exception
+     * @expectedException \Exception
      */
     public function testCreateTokenWithException()
     {
@@ -496,7 +496,7 @@ public function testGetInvoice()
     }
 
     /**
-     * @expectedException Exception
+     * @expectedException \Exception
      */
     public function testGetInvoiceException()
     {
@@ -528,7 +528,7 @@ public function testGetPayout()
     }
 
     /**
-     * @expectedException Exception
+     * @expectedException \Exception
      */
     public function testGetPayoutException()
     {
@@ -717,26 +717,26 @@ private function getMockCurrency()
 
     private function getMockToken()
     {
-        return $this->getMock('Bitpay\TokenInterface');
+        return $this->createMock('Bitpay\TokenInterface');
     }
 
     private function getMockAdapter()
     {
-        return $this->getMock('Bitpay\Client\Adapter\AdapterInterface');
+        return $this->createMock('Bitpay\Client\Adapter\AdapterInterface');
     }
 
     private function getMockPublicKey()
     {
-        return $this->getMock('Bitpay\PublicKey');
+        return $this->createMock('Bitpay\PublicKey');
     }
 
     private function getMockPrivateKey()
     {
-        return $this->getMock('Bitpay\PrivateKey');
+        return $this->createMock('Bitpay\PrivateKey');
     }
 
     private function getMockResponse()
     {
-        return $this->getMock('Bitpay\Client\ResponseInterface');
+        return $this->createMock('Bitpay\Client\ResponseInterface');
     }
 }
diff --git a/tests/Bitpay/Client/ResponseTest.php b/tests/Bitpay/Client/ResponseTest.php
index 40242cce..29e9e3d5 100644
--- a/tests/Bitpay/Client/ResponseTest.php
+++ b/tests/Bitpay/Client/ResponseTest.php
@@ -51,6 +51,9 @@ public function testCreateFromRawResponse()
     {
         $response = Response::createFromRawResponse($this->getTestResponse200());
         $this->assertSame(200, $response->getStatusCode());
+
+        $response = Response::createFromRawResponse($this->getTestHttp2Response200());
+        $this->assertSame(200, $response->getStatusCode());
     }
 
     /**
@@ -70,6 +73,18 @@ private function getTestResponse200()
 HTTP/1.1 200 OK
 Content-Type: text/xml; charset=utf-8
 
+{
+  "response": "example"
+}
+EOF;
+    }
+
+    private function getTestHttp2Response200()
+    {
+        return <<<EOF
+HTTP/2 200
+Content-Type: text/xml; charset=utf-8
+
 {
   "response": "example"
 }
diff --git a/tests/Bitpay/Math/GmpEngineTest.php b/tests/Bitpay/Math/GmpEngineTest.php
index 4a5cb5f9..63602bc1 100644
--- a/tests/Bitpay/Math/GmpEngineTest.php
+++ b/tests/Bitpay/Math/GmpEngineTest.php
@@ -107,8 +107,8 @@ public function testpow()
         $c = '0x1234123412341234123412341234123412412341234213412421341342342';
         $math = new GmpEngine();
         $this->assertEquals(gmp_strval(gmp_pow($a, $a)), $math->pow($a, $a));
-        $this->assertEquals(gmp_strval(gmp_pow($b, $b)), $math->pow($b, $b));
-        $this->assertEquals(gmp_strval(gmp_pow($c, $c)), $math->pow($c, $c));
+        $this->assertEquals(gmp_strval(gmp_pow($b, $a)), $math->pow($b, $a));
+        $this->assertEquals(gmp_strval(gmp_pow($c, $a)), $math->pow($c, $a));
         $this->assertEquals(1, $math->pow(1, 1));
     }
 
diff --git a/tests/Bitpay/Math/MathTest.php b/tests/Bitpay/Math/MathTest.php
index 0bdb5f4a..f4c24c61 100644
--- a/tests/Bitpay/Math/MathTest.php
+++ b/tests/Bitpay/Math/MathTest.php
@@ -17,7 +17,7 @@ public function testIsEngineSet()
 	{
 		Math::setEngine(null);
 		$this->assertNull(Math::getEngine());
-		$engine = $this->getMock('Bitpay\Math\EngineInterface');
+		$engine = $this->createMock('Bitpay\Math\EngineInterface');
 		Math::setEngine($engine);
 		$this->assertInstanceOf('Bitpay\Math\EngineInterface', Math::getEngine());
 	}
diff --git a/tests/Bitpay/PublicKeyTest.php b/tests/Bitpay/PublicKeyTest.php
index 1a89b7e7..1519e447 100644
--- a/tests/Bitpay/PublicKeyTest.php
+++ b/tests/Bitpay/PublicKeyTest.php
@@ -236,7 +236,7 @@ public function testIsGenerated()
     private function getMockPrivateKey($hex = null)
     {
         $hex = ($hex === null) ? $this->hexKeys[0]['private'] : $hex;
-        $key = $this->getMock('Bitpay\PrivateKey');
+        $key = $this->createMock('Bitpay\PrivateKey');
         $key->method('isValid')->will($this->returnValue(true));
 
         $key

From 901a544b47e50e39741a613fed4ce4e5a83cdf49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jura=CC=81sek?= <jurasekpavel@ctyrimedia.cz>
Date: Wed, 10 Apr 2019 12:53:08 +0200
Subject: [PATCH 2/4] Update codesniffer and fix style accordingly

---
 composer.json                                         | 2 +-
 src/Bitpay/AccessTokenInterface.php                   | 2 +-
 src/Bitpay/Application.php                            | 2 +-
 src/Bitpay/ApplicationInterface.php                   | 2 +-
 src/Bitpay/Bill.php                                   | 2 +-
 src/Bitpay/BillInterface.php                          | 2 +-
 src/Bitpay/Bitpay.php                                 | 2 +-
 src/Bitpay/Buyer.php                                  | 2 +-
 src/Bitpay/BuyerInterface.php                         | 2 +-
 src/Bitpay/Client/Adapter/AdapterInterface.php        | 2 +-
 src/Bitpay/Client/ArgumentException.php               | 2 +-
 src/Bitpay/Client/BitpayException.php                 | 2 +-
 src/Bitpay/Client/Client.php                          | 2 +-
 src/Bitpay/Client/ClientInterface.php                 | 2 +-
 src/Bitpay/Client/ConnectionException.php             | 2 +-
 src/Bitpay/Client/Request.php                         | 4 ++--
 src/Bitpay/Client/RequestInterface.php                | 2 +-
 src/Bitpay/Client/ResponseInterface.php               | 2 +-
 src/Bitpay/Crypto/CryptoInterface.php                 | 2 +-
 src/Bitpay/Crypto/HashExtension.php                   | 2 +-
 src/Bitpay/Crypto/OpenSSLExtension.php                | 3 +--
 src/Bitpay/CurrencyInterface.php                      | 2 +-
 src/Bitpay/DependencyInjection/Loader/ArrayLoader.php | 2 +-
 src/Bitpay/Invoice.php                                | 4 ++--
 src/Bitpay/InvoiceInterface.php                       | 1 -
 src/Bitpay/Item.php                                   | 4 ++--
 src/Bitpay/ItemInterface.php                          | 2 +-
 src/Bitpay/Key.php                                    | 2 +-
 src/Bitpay/KeyInterface.php                           | 2 +-
 src/Bitpay/KeyManager.php                             | 2 +-
 src/Bitpay/Math/BcEngine.php                          | 8 +++-----
 src/Bitpay/Network/Customnet.php                      | 2 +-
 src/Bitpay/Network/Livenet.php                        | 2 +-
 src/Bitpay/Network/NetworkAware.php                   | 2 +-
 src/Bitpay/Network/NetworkAwareInterface.php          | 2 +-
 src/Bitpay/Network/NetworkInterface.php               | 2 +-
 src/Bitpay/Network/Testnet.php                        | 2 +-
 src/Bitpay/Point.php                                  | 2 +-
 src/Bitpay/PointInterface.php                         | 2 +-
 src/Bitpay/PublicKey.php                              | 2 +-
 src/Bitpay/SinKey.php                                 | 2 +-
 src/Bitpay/Storage/EncryptedFilesystemStorage.php     | 2 +-
 src/Bitpay/Storage/FilesystemStorage.php              | 2 +-
 src/Bitpay/Storage/MockStorage.php                    | 2 +-
 src/Bitpay/Storage/StorageInterface.php               | 2 +-
 src/Bitpay/Token.php                                  | 2 +-
 src/Bitpay/TokenInterface.php                         | 2 +-
 src/Bitpay/User.php                                   | 2 +-
 src/Bitpay/UserInterface.php                          | 2 +-
 src/Bitpay/Util/CurveParameterInterface.php           | 2 +-
 src/Bitpay/Util/Error.php                             | 2 +-
 src/Bitpay/Util/Fingerprint.php                       | 2 +-
 src/Bitpay/Util/Secp256k1.php                         | 2 +-
 src/Bitpay/Util/SecureRandom.php                      | 2 +-
 src/Bitpay/Util/Util.php                              | 1 -
 55 files changed, 58 insertions(+), 63 deletions(-)

diff --git a/composer.json b/composer.json
index 3df433a2..11dc7211 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
         "phpunit/phpunit": "~5.7.9",
         "fzaninotto/faker": "~1.4.0",
         "mikey179/vfsstream": "~1.4.0",
-        "squizlabs/php_codesniffer": "~1.5.5",
+        "squizlabs/php_codesniffer": "~3.4",
         "satooshi/php-coveralls": "~0.6.1",
         "symfony/phpunit-bridge": "^4.0"
     },
diff --git a/src/Bitpay/AccessTokenInterface.php b/src/Bitpay/AccessTokenInterface.php
index b701db3a..bd293ebb 100644
--- a/src/Bitpay/AccessTokenInterface.php
+++ b/src/Bitpay/AccessTokenInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2015 BitPay Inc., MIT License 
+ * @license Copyright 2011-2015 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Application.php b/src/Bitpay/Application.php
index 4f5148a2..a31168d8 100644
--- a/src/Bitpay/Application.php
+++ b/src/Bitpay/Application.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2015 BitPay Inc., MIT License 
+ * @license Copyright 2011-2015 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/ApplicationInterface.php b/src/Bitpay/ApplicationInterface.php
index 63dbbee5..baa5de1d 100644
--- a/src/Bitpay/ApplicationInterface.php
+++ b/src/Bitpay/ApplicationInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Bill.php b/src/Bitpay/Bill.php
index a3203d93..171d9932 100644
--- a/src/Bitpay/Bill.php
+++ b/src/Bitpay/Bill.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/BillInterface.php b/src/Bitpay/BillInterface.php
index a957fe82..bf8502fa 100644
--- a/src/Bitpay/BillInterface.php
+++ b/src/Bitpay/BillInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Bitpay.php b/src/Bitpay/Bitpay.php
index 918b9d66..897ef1ab 100644
--- a/src/Bitpay/Bitpay.php
+++ b/src/Bitpay/Bitpay.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Buyer.php b/src/Bitpay/Buyer.php
index a065c961..9eb5e452 100644
--- a/src/Bitpay/Buyer.php
+++ b/src/Bitpay/Buyer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/BuyerInterface.php b/src/Bitpay/BuyerInterface.php
index 6e76b665..e20ff2c9 100644
--- a/src/Bitpay/BuyerInterface.php
+++ b/src/Bitpay/BuyerInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Client/Adapter/AdapterInterface.php b/src/Bitpay/Client/Adapter/AdapterInterface.php
index e2613bf7..9e5edb6f 100644
--- a/src/Bitpay/Client/Adapter/AdapterInterface.php
+++ b/src/Bitpay/Client/Adapter/AdapterInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Client/ArgumentException.php b/src/Bitpay/Client/ArgumentException.php
index 3f1aa746..6a5eafe0 100644
--- a/src/Bitpay/Client/ArgumentException.php
+++ b/src/Bitpay/Client/ArgumentException.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 namespace Bitpay\Client;
 
diff --git a/src/Bitpay/Client/BitpayException.php b/src/Bitpay/Client/BitpayException.php
index f3a357c9..93fce0ea 100644
--- a/src/Bitpay/Client/BitpayException.php
+++ b/src/Bitpay/Client/BitpayException.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 namespace Bitpay\Client;
 
diff --git a/src/Bitpay/Client/Client.php b/src/Bitpay/Client/Client.php
index fddde8fa..13c510f6 100644
--- a/src/Bitpay/Client/Client.php
+++ b/src/Bitpay/Client/Client.php
@@ -703,7 +703,7 @@ protected function checkPriceAndCurrency($price, $currency)
         if (($currency != 'BCH' && $currency != 'BTC') && $decimalPrecision > 2) {
             throw new \Bitpay\Client\BitpayException('Incorrect price format or currency type.');
         }
-        elseif ($decimalPrecision > 6) {
+        if ($decimalPrecision > 6) {
             throw new \Bitpay\Client\BitpayException('Incorrect price format or currency type.');
         }
     }
diff --git a/src/Bitpay/Client/ClientInterface.php b/src/Bitpay/Client/ClientInterface.php
index 8d490582..bcde3aa0 100644
--- a/src/Bitpay/Client/ClientInterface.php
+++ b/src/Bitpay/Client/ClientInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Client/ConnectionException.php b/src/Bitpay/Client/ConnectionException.php
index ca4fc580..4a166610 100644
--- a/src/Bitpay/Client/ConnectionException.php
+++ b/src/Bitpay/Client/ConnectionException.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 namespace Bitpay\Client;
 
diff --git a/src/Bitpay/Client/Request.php b/src/Bitpay/Client/Request.php
index bf8c986f..5fa7c431 100644
--- a/src/Bitpay/Client/Request.php
+++ b/src/Bitpay/Client/Request.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
@@ -52,7 +52,7 @@ class Request implements RequestInterface
     protected $path;
 
     /**
-     * Default is 443 but should be changed by whatever is passed in through the Adapter. 
+     * Default is 443 but should be changed by whatever is passed in through the Adapter.
      *
      * @var integer
      */
diff --git a/src/Bitpay/Client/RequestInterface.php b/src/Bitpay/Client/RequestInterface.php
index 7042f031..42cb5875 100644
--- a/src/Bitpay/Client/RequestInterface.php
+++ b/src/Bitpay/Client/RequestInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Client/ResponseInterface.php b/src/Bitpay/Client/ResponseInterface.php
index 11664d23..0dcb1dfd 100644
--- a/src/Bitpay/Client/ResponseInterface.php
+++ b/src/Bitpay/Client/ResponseInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Crypto/CryptoInterface.php b/src/Bitpay/Crypto/CryptoInterface.php
index a862b9a1..1dcbb7ca 100644
--- a/src/Bitpay/Crypto/CryptoInterface.php
+++ b/src/Bitpay/Crypto/CryptoInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Crypto/HashExtension.php b/src/Bitpay/Crypto/HashExtension.php
index e5a1c481..8830ad25 100644
--- a/src/Bitpay/Crypto/HashExtension.php
+++ b/src/Bitpay/Crypto/HashExtension.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Crypto/OpenSSLExtension.php b/src/Bitpay/Crypto/OpenSSLExtension.php
index e2c304c5..fdf6d8e3 100644
--- a/src/Bitpay/Crypto/OpenSSLExtension.php
+++ b/src/Bitpay/Crypto/OpenSSLExtension.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
@@ -242,7 +242,6 @@ public function decrypt($encrypted_text, $key = '', $iv = '', $bit_check = 8, $c
         try {
             /* Ensure the key & IV is the same for both encrypt & decrypt. */
             if (!empty($encrypted_text)) {
-
                 $decrypted = openssl_decrypt(base64_decode($encrypted_text), $cipher_type, $key, 0, $iv);
                 $last_char = substr($decrypted, -1);
 
diff --git a/src/Bitpay/CurrencyInterface.php b/src/Bitpay/CurrencyInterface.php
index 0eb1e625..25d76e88 100644
--- a/src/Bitpay/CurrencyInterface.php
+++ b/src/Bitpay/CurrencyInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/DependencyInjection/Loader/ArrayLoader.php b/src/Bitpay/DependencyInjection/Loader/ArrayLoader.php
index 2f2aa064..331daa52 100644
--- a/src/Bitpay/DependencyInjection/Loader/ArrayLoader.php
+++ b/src/Bitpay/DependencyInjection/Loader/ArrayLoader.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Invoice.php b/src/Bitpay/Invoice.php
index cbf98463..7861021f 100644
--- a/src/Bitpay/Invoice.php
+++ b/src/Bitpay/Invoice.php
@@ -779,7 +779,7 @@ public function getPaymentSubtotals()
     }
 
     /**
-     * @param 
+     * @param array
      * @return InvoiceInterface
      */
     public function setPaymentSubtotals($paymentSubtotals)
@@ -800,7 +800,7 @@ public function getPaymentTotals()
     }
 
     /**
-     * @param 
+     * @param array
      * @return InvoiceInterface
      */
     public function setPaymentTotals($paymentTotals)
diff --git a/src/Bitpay/InvoiceInterface.php b/src/Bitpay/InvoiceInterface.php
index a366f48a..e8be5f13 100644
--- a/src/Bitpay/InvoiceInterface.php
+++ b/src/Bitpay/InvoiceInterface.php
@@ -369,5 +369,4 @@ public function getPaymentTotals();
     public function getAmountPaid();
 
     public function getExchangeRates();
-
 }
diff --git a/src/Bitpay/Item.php b/src/Bitpay/Item.php
index eeaea96c..9075c174 100644
--- a/src/Bitpay/Item.php
+++ b/src/Bitpay/Item.php
@@ -161,11 +161,11 @@ public function setPhysical($physical)
      */
     protected function checkPriceFormat($price)
     {
-        if($price === '0')  {
+        if ($price === '0') {
             return;
         }
         $converted = (float)$price;
-        if($converted == 0) {
+        if ($converted == 0) {
             throw new \Bitpay\Client\ArgumentException("Price must be formatted as a float ". $converted);
         }
     }
diff --git a/src/Bitpay/ItemInterface.php b/src/Bitpay/ItemInterface.php
index 36e2dc58..190b8638 100644
--- a/src/Bitpay/ItemInterface.php
+++ b/src/Bitpay/ItemInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Key.php b/src/Bitpay/Key.php
index dccabd52..60103572 100644
--- a/src/Bitpay/Key.php
+++ b/src/Bitpay/Key.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/KeyInterface.php b/src/Bitpay/KeyInterface.php
index 938c2e88..8208bfa9 100644
--- a/src/Bitpay/KeyInterface.php
+++ b/src/Bitpay/KeyInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/KeyManager.php b/src/Bitpay/KeyManager.php
index 4838c118..1ce99522 100644
--- a/src/Bitpay/KeyManager.php
+++ b/src/Bitpay/KeyManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Math/BcEngine.php b/src/Bitpay/Math/BcEngine.php
index 0939d933..20e5665d 100644
--- a/src/Bitpay/Math/BcEngine.php
+++ b/src/Bitpay/Math/BcEngine.php
@@ -86,7 +86,6 @@ public function invertm($num, $mod)
             $x = $y;
 
             $y = $tmp;
-
         } while (bccomp($num1, '0'));
 
         if (bccomp($x, '0') < 0) {
@@ -168,13 +167,12 @@ public function input($x)
             }
 
             return $sign.$dec;
-
-        } elseif (preg_match('/^-?[0-9]+$/', $x)) {
+        }
+        if (preg_match('/^-?[0-9]+$/', $x)) {
             return $x;
-        } else {
-            throw new \Exception("The input must be a numeric string in decimal or hexadecimal (with leading 0x) format.\n".var_export($x, true));
         }
 
+        throw new \Exception("The input must be a numeric string in decimal or hexadecimal (with leading 0x) format.\n".var_export($x, true));
     }
 
     /**
diff --git a/src/Bitpay/Network/Customnet.php b/src/Bitpay/Network/Customnet.php
index c3747182..ffa7d179 100644
--- a/src/Bitpay/Network/Customnet.php
+++ b/src/Bitpay/Network/Customnet.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Network/Livenet.php b/src/Bitpay/Network/Livenet.php
index ae91f715..5b2e158f 100644
--- a/src/Bitpay/Network/Livenet.php
+++ b/src/Bitpay/Network/Livenet.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Network/NetworkAware.php b/src/Bitpay/Network/NetworkAware.php
index e67997f6..3d4e4ccd 100644
--- a/src/Bitpay/Network/NetworkAware.php
+++ b/src/Bitpay/Network/NetworkAware.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Network/NetworkAwareInterface.php b/src/Bitpay/Network/NetworkAwareInterface.php
index 3b4d24d3..07771d85 100644
--- a/src/Bitpay/Network/NetworkAwareInterface.php
+++ b/src/Bitpay/Network/NetworkAwareInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Network/NetworkInterface.php b/src/Bitpay/Network/NetworkInterface.php
index ccb32df0..27b8e968 100644
--- a/src/Bitpay/Network/NetworkInterface.php
+++ b/src/Bitpay/Network/NetworkInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Network/Testnet.php b/src/Bitpay/Network/Testnet.php
index 43131337..c8589c68 100644
--- a/src/Bitpay/Network/Testnet.php
+++ b/src/Bitpay/Network/Testnet.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Point.php b/src/Bitpay/Point.php
index 5075b3aa..e644f8d3 100644
--- a/src/Bitpay/Point.php
+++ b/src/Bitpay/Point.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/PointInterface.php b/src/Bitpay/PointInterface.php
index 6f8deea1..677e731c 100644
--- a/src/Bitpay/PointInterface.php
+++ b/src/Bitpay/PointInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/PublicKey.php b/src/Bitpay/PublicKey.php
index 8d58416d..37f2b550 100644
--- a/src/Bitpay/PublicKey.php
+++ b/src/Bitpay/PublicKey.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/SinKey.php b/src/Bitpay/SinKey.php
index 09fce7b4..1301c837 100644
--- a/src/Bitpay/SinKey.php
+++ b/src/Bitpay/SinKey.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Storage/EncryptedFilesystemStorage.php b/src/Bitpay/Storage/EncryptedFilesystemStorage.php
index 79195958..ee1b1478 100644
--- a/src/Bitpay/Storage/EncryptedFilesystemStorage.php
+++ b/src/Bitpay/Storage/EncryptedFilesystemStorage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Storage/FilesystemStorage.php b/src/Bitpay/Storage/FilesystemStorage.php
index b84a996a..6dead936 100644
--- a/src/Bitpay/Storage/FilesystemStorage.php
+++ b/src/Bitpay/Storage/FilesystemStorage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Storage/MockStorage.php b/src/Bitpay/Storage/MockStorage.php
index 5cc1d1b0..4ae918f6 100644
--- a/src/Bitpay/Storage/MockStorage.php
+++ b/src/Bitpay/Storage/MockStorage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Storage/StorageInterface.php b/src/Bitpay/Storage/StorageInterface.php
index 92b10dfd..aec33d88 100644
--- a/src/Bitpay/Storage/StorageInterface.php
+++ b/src/Bitpay/Storage/StorageInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Token.php b/src/Bitpay/Token.php
index c11b5e7e..797f0dcf 100644
--- a/src/Bitpay/Token.php
+++ b/src/Bitpay/Token.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/TokenInterface.php b/src/Bitpay/TokenInterface.php
index eeb774d4..e87ed9bd 100644
--- a/src/Bitpay/TokenInterface.php
+++ b/src/Bitpay/TokenInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/User.php b/src/Bitpay/User.php
index cf54b406..cc5863cf 100644
--- a/src/Bitpay/User.php
+++ b/src/Bitpay/User.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/UserInterface.php b/src/Bitpay/UserInterface.php
index a67cb5c5..1f5d55f3 100644
--- a/src/Bitpay/UserInterface.php
+++ b/src/Bitpay/UserInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Util/CurveParameterInterface.php b/src/Bitpay/Util/CurveParameterInterface.php
index 683f8ded..03660d88 100644
--- a/src/Bitpay/Util/CurveParameterInterface.php
+++ b/src/Bitpay/Util/CurveParameterInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Util/Error.php b/src/Bitpay/Util/Error.php
index 95b9c5bf..f71746ef 100644
--- a/src/Bitpay/Util/Error.php
+++ b/src/Bitpay/Util/Error.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Util/Fingerprint.php b/src/Bitpay/Util/Fingerprint.php
index 14535149..8e2b4639 100644
--- a/src/Bitpay/Util/Fingerprint.php
+++ b/src/Bitpay/Util/Fingerprint.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Util/Secp256k1.php b/src/Bitpay/Util/Secp256k1.php
index 9c7e738a..20a04e72 100644
--- a/src/Bitpay/Util/Secp256k1.php
+++ b/src/Bitpay/Util/Secp256k1.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Util/SecureRandom.php b/src/Bitpay/Util/SecureRandom.php
index b2977aed..dd5cd5fe 100644
--- a/src/Bitpay/Util/SecureRandom.php
+++ b/src/Bitpay/Util/SecureRandom.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @license Copyright 2011-2014 BitPay Inc., MIT License 
+ * @license Copyright 2011-2014 BitPay Inc., MIT License
  * see https://github.com/bitpay/php-bitpay-client/blob/master/LICENSE
  */
 
diff --git a/src/Bitpay/Util/Util.php b/src/Bitpay/Util/Util.php
index a66709f2..0187fb4c 100644
--- a/src/Bitpay/Util/Util.php
+++ b/src/Bitpay/Util/Util.php
@@ -296,7 +296,6 @@ public static function pointDouble(PointInterface $point, CurveParameterInterfac
             $yadd   = Math::add($ysub2, $ymul);
 
             $R['y'] = Math::mod($yadd, $p);
-
         } catch (\Exception $e) {
             throw new \Exception('Error in Util::pointDouble(): '.$e->getMessage());
         }

From 08b00b300f8f8aae82e4bc5c319ea68014e977f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jura=CC=81sek?= <jurasekpavel@ctyrimedia.cz>
Date: Wed, 10 Apr 2019 13:15:51 +0200
Subject: [PATCH 3/4] Disable coverage as it's not compatible with php7.2, see
 https://github.com/sebastianbergmann/php-code-coverage/issues/551#issuecomment-430804261
 for possible workaround

---
 build/phpunit.xml.dist | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build/phpunit.xml.dist b/build/phpunit.xml.dist
index 8bcc3780..ac00eac0 100644
--- a/build/phpunit.xml.dist
+++ b/build/phpunit.xml.dist
@@ -20,7 +20,6 @@
         </whitelist>
     </filter>
     <logging>
-        <log type="coverage-html" target="docs/code-coverage"/>
         <log type="coverage-clover" target="logs/clover.xml"/>
     </logging>
 </phpunit>

From e74beed92afba6c97b0a10fe06489d704ccd2348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jura=CC=81sek?= <jurasekpavel@ctyrimedia.cz>
Date: Wed, 10 Apr 2019 13:16:14 +0200
Subject: [PATCH 4/4] Add php 7.3 to travis

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 08f43fb4..1d80a39b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ php:
     - 7.0
     - 7.1
     - 7.2
+    - 7.3
 
 install:
     - composer install