Promote transactionHash to Operation from Payment

Fixes #28
zulucrypto · Sep 22, 2018 · 7e11eca · 7e11eca
1 parent d7c963b
commit 7e11eca
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/getting-started/06-list-payments.php b/getting-started/06-list-payments.php
@@ -15,13 +15,15 @@
 
     $seenResults = 0;
     foreach ($payments as $payment) {
+        /** @var $payment \ZuluCrypto\StellarSdk\Model\Operation|\ZuluCrypto\StellarSdk\Model\AssetTransferInterface */
         // If the same cursor shows up twice, we're repeating results and should exit
         if ($payment->getPagingToken() == $currentCursor) break 2;
 
-        printf('[%s] Amount: %s From %s' . PHP_EOL,
+        printf('[%s] Amount: %s From %s in Tx %s' . PHP_EOL,
             $payment->getAssetTransferType(),
             $payment->getAssetAmount(),
-            $payment->getFromAccountId()
+            $payment->getFromAccountId(),
+            $payment->getTransactionHash()
         );
 
         $currentCursor = $payment->getPagingToken();

diff --git a/src/Model/Operation.php b/src/Model/Operation.php
@@ -45,6 +45,11 @@ class Operation extends RestApiModel
      */
     protected $typeI;
 
+    /**
+     * @var string
+     */
+    protected $transactionHash;
+
     /**
      * @param array $rawData
      * @return Operation
@@ -120,6 +125,7 @@ public function loadFromRawResponseData($rawData)
         $this->typeI = $rawData['type_i'];
 
         if (isset($rawData['paging_token'])) $this->pagingToken = $rawData['paging_token'];
+        if (isset($rawData['transaction_hash'])) $this->transactionHash = $rawData['transaction_hash'];
     }
 
     /**
@@ -169,4 +175,12 @@ public function setTypeI($typeI)
     {
         $this->typeI = $typeI;
     }
+
+    /**
+     * @return string
+     */
+    public function getTransactionHash()
+    {
+        return $this->transactionHash;
+    }
 }
diff --git a/src/Model/Payment.php b/src/Model/Payment.php
@@ -24,11 +24,6 @@ class Payment extends Operation implements AssetTransferInterface
      * @var string
      */
     private $toAccountId;
-
-    /**
-     * @var string
-     */
-    private $transactionHash;
 
     /**
      * @var AssetAmount
@@ -89,7 +84,6 @@ public function loadFromRawResponseData($rawData)
 
         if (isset($rawData['from'])) $this->fromAccountId = $rawData['from'];
         if (isset($rawData['to'])) $this->toAccountId = $rawData['to'];
-        if (isset($rawData['transaction_hash'])) $this->transactionHash = $rawData['transaction_hash'];
 
         $assetAmount = null;
         // Native assets
@@ -195,12 +189,4 @@ public function setAmount(AssetAmount $amount)
     {
         $this->amount = $amount;
     }
-
-    /**
-     * @return string
-     */
-    public function getTransactionHash()
-    {
-        return $this->transactionHash;
-    }
 }