Merge branch 'master' into develop

Author: Pascal Krason

src/Request/Method/Payment/Broadcast.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace Electrum\Request\Method\Payment;
+
+use Electrum\Request\AbstractMethod;
+use Electrum\Request\MethodInterface;
+use Electrum\Response\Exception\ElectrumResponseException;
+
+/**
+ * Return a payment request.
+ * @author Pascal Krason <p.krason@padr.io>
+ */
+class Broadcast extends AbstractMethod implements MethodInterface
+{
+
+    /**
+     * @var string
+     */
+    private $method = 'broadcast';
+
+    /**
+     * @var string
+     * Serialized transaction (hexadecimal)
+     */
+    private $transaction = '';
+
+    /**
+     * @param array $optional
+     *
+     * @return PaymentRequestResponse|null
+     * @throws \Electrum\Request\Exception\BadRequestException
+     * @throws \Electrum\Response\Exception\ElectrumResponseException
+     */
+    public function execute(array $optional = [])
+    {
+        $data = $this->getClient()->execute($this->method, array_merge([
+            'tx' => $this->getTransaction()
+        ], $optional));
+
+        return isset($data[1]) ? $data[1] : null;
+    }
+
+    /**
+     * Get the value of Transaction
+     *
+     * @return string
+     */
+    public function getTransaction()
+    {
+        return $this->transaction;
+    }
+
+    /**
+     * Set the value of Transaction
+     *
+     * @param string transaction
+     *
+     * @return self
+     */
+    public function setTransaction($transaction)
+    {
+        $this->transaction = $transaction;
+
+        return $this;
+    }
+
+}

src/Request/Method/Payment/PayTo.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace Electrum\Request\Method\Payment;
+
+use Electrum\Request\AbstractMethod;
+use Electrum\Request\MethodInterface;
+use Electrum\Response\Exception\ElectrumResponseException;
+
+/**
+ * Return a payment request.
+ * @author Pascal Krason <p.krason@padr.io>
+ */
+class PayTo extends AbstractMethod implements MethodInterface
+{
+
+    /**
+     * @var string
+     */
+    private $method = 'payto';
+
+    /**
+     * @var string
+     * '!' for  maximum available
+     */
+    private $amount = '!';
+
+    /**
+     * @var string
+     */
+    private $destination = '';
+
+    /**
+     * @param array $optional
+     *
+     * @return PaymentRequestResponse|null
+     * @throws \Electrum\Request\Exception\BadRequestException
+     * @throws \Electrum\Response\Exception\ElectrumResponseException
+     */
+    public function execute(array $optional = [])
+    {
+        $data = $this->getClient()->execute($this->method, array_merge([
+            'destination' => $this->getDestination(),
+            'amount'      => $this->getAmount()
+        ], $optional));
+
+        return $data['hex'];
+    }
+
+    /**
+     * Get the value of Amount
+     *
+     * @return string
+     */
+    public function getAmount()
+    {
+        return $this->amount;
+    }
+
+    /**
+     * Set the value of Amount
+     *
+     * @param string amount
+     *
+     * @return self
+     */
+    public function setAmount($amount)
+    {
+        $this->amount = $amount;
+
+        return $this;
+    }
+
+    /**
+     * Get the value of Destination
+     *
+     * @return string
+     */
+    public function getDestination()
+    {
+        return $this->destination;
+    }
+
+    /**
+     * Set the value of Destination
+     *
+     * @param string destination
+     *
+     * @return self
+     */
+    public function setDestination($destination)
+    {
+        $this->destination = $destination;
+
+        return $this;
+    }
+
+}

src/Request/Method/Wallet/GetBalance.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Electrum\Request\Method;
+namespace Electrum\Request\Method\Wallet;
 
 use Electrum\Request\AbstractMethod;
 use Electrum\Request\MethodInterface;
@@ -30,4 +30,4 @@ public function execute(array $optional = [])
         $data = $this->getClient()->execute($this->method, $optional);
         return $this->hydrate(new BalanceResponse(), $data);
     }
-}
+}

src/Request/Method/Wallet/GetHistory.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Electrum\Request\Method;
+namespace Electrum\Request\Method\Wallet;
 
 use Electrum\Request\AbstractMethod;
 use Electrum\Request\MethodInterface;
-use Electrum\Response\Model\Wallet\History as HistoryResponse;
+use Electrum\Response\Model\Wallet\Transaction;
 
 /**
  * Wallet history. Returns the transaction history of your wallet.
@@ -28,6 +28,10 @@ class GetHistory extends AbstractMethod implements MethodInterface
     public function execute(array $optional = [])
     {
         $data = $this->getClient()->execute($this->method, $optional);
-        return $this->hydrate(new HistoryResponse(), $data);
+        $transactions = [];
+        foreach ($data as $transaction) {
+            $transactions[] = $this->hydrate(new Transaction(), $transaction);
+        }
+        return $transactions;
     }
-}
+}

src/Response/Hydrator/Payment/PaymentRequest.php

@@ -23,6 +23,7 @@ public function __construct()
             'URI' => 'uri',
             'exp' => 'expires',
             'time' => 'time',
+            'confirmations' => 'confirmations',
         ]);
 
         $this->setNamingStrategy($namingStrategy);

src/Response/Model/Payment/PaymentRequest.php

@@ -71,6 +71,11 @@ class PaymentRequest implements ResponseInterface
      */
     private $time = 0;
 
+    /**
+     * @var int
+     */
+    private $confirmations = null;
+
     /**
      * Factory method
      *
@@ -246,4 +251,24 @@ public function setTime($time)
         return $this;
     }
 
+    /**
+     * @return int
+     */
+    public function getConfirmations()
+    {
+        return $this->confirmations;
+    }
+
+    /**
+     * @param int $confirmations
+     *
+     * @return PaymentRequest
+     */
+    public function setConfirmations($confirmations)
+    {
+        $this->confirmations = $confirmations;
+
+        return $this;
+    }
+
 }