Removed mcrypt from composer, fixed datetime invoice setting issue

CHANGELOG.md

@@ -2,6 +2,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.2.15] - 2017-11-28
+### Fixed
+- Fixed invoice time being set as numeric instead of datetime object
+
+### Removed
+- Removed support for mcrypt (#254)
+
+
 ## [2.2.14] - 2017-09-27
 ### Fixed
 - Fixed token check in get invoices method for public facade calls (#243)

VERSION

@@ -1 +1 @@
-2.2.14
+2.2.15

composer.json

@@ -28,7 +28,6 @@
         "ext-curl": "*",
         "ext-json": "*",
         "ext-openssl": "*",
-        "ext-mcrypt": "*",
         "symfony/config": "^2.3 || ^3.0",
         "symfony/dependency-injection": "^2.3 || ^3.0"
     },

src/Bitpay/Client/ClientInterface.php

@@ -26,7 +26,7 @@ interface ClientInterface
      * @see RFC2616 section 14.43 for User-Agent Format
      */
     const NAME    = 'BitPay PHP-Client';
-    const VERSION = '0.0.0';
+    const VERSION = '2.2.15';
 
     //public function createApplication(ApplicationInterface $application);
 

src/Bitpay/Invoice.php

@@ -470,10 +470,13 @@ public function getInvoiceTime()
      */
     public function setInvoiceTime($invoiceTime)
     {
-        if (!empty($invoiceTime)) {
+        if (is_a($invoiceTime, 'DateTime')) {
             $this->invoiceTime = $invoiceTime;
+        } else if (is_numeric($invoiceTime)) {
+            $invoiceDateTime = new \DateTime();
+            $invoiceDateTime->setTimestamp($invoiceTime);
+            $this->invoiceTime = $invoiceDateTime;
         }
-
         return $this;
     }
 
@@ -492,10 +495,13 @@ public function getExpirationTime()
      */
     public function setExpirationTime($expirationTime)
     {
-        if (!empty($expirationTime)) {
+        if (is_a($expirationTime, 'DateTime')) {
             $this->expirationTime = $expirationTime;
+        } else if (is_numeric($expirationTime)) {
+            $expirationDateTime = new \DateTime();
+            $expirationDateTime->setTimestamp($expirationTime);
+            $this->expirationTime = $expirationDateTime;
         }
-
         return $this;
     }
 
@@ -514,10 +520,13 @@ public function getCurrentTime()
      */
     public function setCurrentTime($currentTime)
     {
-        if (!empty($currentTime)) {
+        if (is_a($currentTime, 'DateTime')) {
             $this->currentTime = $currentTime;
+        } else if (is_numeric($currentTime)) {
+            $currentDateTime = new \DateTime();
+            $currentDateTime->setTimestamp($currentTime);
+            $this->currentTime = $currentDateTime;
         }
-
         return $this;
     }
 

src/Bitpay/Util/Util.php

@@ -433,13 +433,6 @@ public static function checkRequirements()
             $requirements['PHP'] = true;
         }
 
-        // Mcrypt Extension
-        if (!extension_loaded('mcrypt')) {
-            $requirements['Mcrypt'] = 'The Mcrypt PHP extension could not be found.';
-        } else {
-            $requirements['Mcrypt'] = true;
-        }
-
         // OpenSSL Extension
         if (!extension_loaded('openssl')) {
             $requirements['OpenSSL'] = 'The OpenSSL PHP extension could not be found.';

tests/Bitpay/Util/UtilTest.php

@@ -273,13 +273,6 @@ public function testCheckRequirements()
             $this->assertTrue(is_string($requirements['PHP']));
         }
 
-        // Mcrypt Extension
-        if (extension_loaded('mcrypt')) {
-            $this->assertTrue($requirements['Mcrypt']);
-        } else {
-            $this->assertTrue(is_string($requirements['Mcrypt']));
-        }
-
         // OpenSSL Extension
         if (extension_loaded('openssl')) {
             $this->assertTrue($requirements['OpenSSL']);