blocktrail / blocktrail-sdk-php

src/TransactionBuilder.php

Spacing +3 added lines, -3 removed lines

@@ -102,7 +102,7 @@ 
         }
 
         if ($value <= Blocktrail::DUST) {
-            throw new \Exception("Values should be more than dust (" . Blocktrail::DUST . ")");
+            throw new \Exception("Values should be more than dust (".Blocktrail::DUST.")");
         }
 
         $this->addOutput([
@@ -150,7 +150,7 @@ 
         }
 
         if ($value <= Blocktrail::DUST) {
-            throw new \Exception("Values should be more than dust (" . Blocktrail::DUST . ")");
+            throw new \Exception("Values should be more than dust (".Blocktrail::DUST.")");
         }
 
         if (!isset($this->outputs[$idx])) {
@@ -196,7 +196,7 @@ 
      * @return array
      */
     public function getOutputs($json = false) {
-        return array_map(function ($output) use ($json) {
+        return array_map(function($output) use ($json) {
             $result = $output;
 
             if ($json) {

src/SizeEstimation.php

Doc Comments +4 added lines, -4 removed lines

@@ -62,7 +62,7 @@ 
 
     /**
      * @param array $vectorSizes
-     * @return int|mixed
+     * @return integer
      */
     public static function getLengthOfVector(array $vectorSizes) {
         $vectorSize = self::getLengthOfVarInt(count($vectorSizes));
@@ -117,11 +117,11 @@ 
     }
 
     /**
-     * @param array $stackSizes - array of integer size of a value (for scriptSig or witness)
+     * @param integer[] $stackSizes - array of integer size of a value (for scriptSig or witness)
      * @param bool $isWitness
      * @param ScriptInterface $redeemScript
      * @param ScriptInterface $witnessScript
-     * @return array
+     * @return integer[]
      */
     public static function estimateSizeForStack(array $stackSizes, $isWitness, ScriptInterface $redeemScript = null, ScriptInterface $witnessScript = null) {
         assert(($witnessScript === null) || $isWitness);
@@ -168,7 +168,7 @@ 
      * @param ScriptInterface|null $redeemScript
      * @param ScriptInterface $witnessScript
      * @param bool $isWitness
-     * @return array
+     * @return integer[]
      */
     public static function estimateInputFromScripts(ScriptInterface $script, ScriptInterface $redeemScript = null, ScriptInterface $witnessScript = null, $isWitness) {
         assert($witnessScript === null || $isWitness);

src/Wallet.php

Unused Use Statements -1 removed lines

@@ -22,7 +22,6 @@
 use BitWasp\Bitcoin\Transaction\TransactionInterface;
 use BitWasp\Buffertools\Buffer;
 use Blocktrail\SDK\Address\AddressReaderBase;
-use Blocktrail\SDK\Address\BitcoinCashAddressReader;
 use Blocktrail\SDK\Address\CashAddress;
 use Blocktrail\SDK\Bitcoin\BIP32Key;
 use Blocktrail\SDK\Bitcoin\BIP32Path;

Spacing +9 added lines, -9 removed lines

@@ -209,7 +209,7 @@ 
         }
 
         $this->addressReader = $addressReader;
-        $this->isSegwit = (bool) $segwit;
+        $this->isSegwit = (bool)$segwit;
         $this->chainIndex = $chainIdx;
         $this->changeIndex = $changeIdx;
     }
@@ -268,7 +268,7 @@ 
      * @return array[]      [ [xpub, path] ]
      */
     public function getBlocktrailPublicKeys() {
-        return array_map(function (BIP32Key $key) {
+        return array_map(function(BIP32Key $key) {
             return $key->tuple();
         }, $this->blocktrailPublicKeys);
     }
@@ -417,7 +417,7 @@ 
     public function getAddressByPath($path) {
         $path = (string)BIP32Path::path($path)->privatePath();
         if (!isset($this->derivations[$path])) {
-            list($address, ) = $this->getRedeemScriptByPath($path);
+            list($address,) = $this->getRedeemScriptByPath($path);
 
             $this->derivations[$path] = $address;
             $this->derivationsByAddress[$address] = $path;
@@ -761,7 +761,7 @@ 
             $signInfo[] = $utxo->getSignInfo();
         }
 
-        $utxoSum = array_sum(array_map(function (UTXO $utxo) {
+        $utxoSum = array_sum(array_map(function(UTXO $utxo) {
             return $utxo->value;
         }, $utxos));
         if ($utxoSum < array_sum(array_column($send, 'value'))) {
@@ -895,7 +895,7 @@ 
             throw new \Exception("Wallet needs to be unlocked to pay");
         }
 
-        assert(Util::all(function ($signInfo) {
+        assert(Util::all(function($signInfo) {
             return $signInfo instanceof SignInfo;
         }, $signInfo), '$signInfo should be SignInfo[]');
 
@@ -908,7 +908,7 @@ 
         ];
 
         // send the transaction
-        return $this->sendTransaction($txs, array_map(function (SignInfo $r) {
+        return $this->sendTransaction($txs, array_map(function(SignInfo $r) {
             return (string)$r->path;
         }, $signInfo), $apiCheckFee);
     }
@@ -968,7 +968,7 @@ 
     public static function estimateSizeUTXOs($utxoCnt) {
         $txinSize = 0;
 
-        for ($i=0; $i<$utxoCnt; $i++) {
+        for ($i = 0; $i < $utxoCnt; $i++) {
             // @TODO: proper size calculation, we only do multisig right now so it's hardcoded and then we guess the size ...
             $multisig = "2of3";
 
@@ -1046,7 +1046,7 @@ 
      * @return int
      */
     protected function determineChange($utxos, $outputs, $fee) {
-        $inputsTotal = array_sum(array_map(function (UTXO $utxo) {
+        $inputsTotal = array_sum(array_map(function(UTXO $utxo) {
             return $utxo->value;
         }, $utxos));
         $outputsTotal = array_sum(array_column($outputs, 'value'));
@@ -1065,7 +1065,7 @@ 
     protected function signTransaction(Transaction $tx, array $signInfo) {
         $signer = new Signer($tx, Bitcoin::getEcAdapter());
 
-        assert(Util::all(function ($signInfo) {
+        assert(Util::all(function($signInfo) {
             return $signInfo instanceof SignInfo;
         }, $signInfo), '$signInfo should be SignInfo[]');
 

Doc Comments +14 added lines, -10 removed lines

@@ -384,7 +384,7 @@ 
     }
 
     /**
-     * @param string|BIP32Path  $path
+     * @param BIP32Path  $path
      * @return BIP32Key|false
      * @throws \Exception
      *
@@ -411,7 +411,7 @@ 
     /**
      * get address for the specified path
      *
-     * @param string|BIP32Path  $path
+     * @param string  $path
      * @return string
      */
     public function getAddressByPath($path) {
@@ -517,7 +517,7 @@ 
     }
 
     /**
-     * @param string|BIP32Path  $path
+     * @param BIP32Path  $path
      * @return BIP32Key
      * @throws \Exception
      */
@@ -677,7 +677,7 @@ 
      * 'fund' the txBuilder with UTXOs (modified in place)
      *
      * @param TransactionBuilder    $txBuilder
-     * @param bool|true             $lockUTXOs
+     * @param boolean             $lockUTXOs
      * @param bool|false            $allowZeroConf
      * @param null|int              $forceFee
      * @return TransactionBuilder
@@ -809,6 +809,10 @@ 
         return [$txb->get(), $signInfo];
     }
 
+    /**
+     * @param integer $optimalFeePerKB
+     * @param integer $lowPriorityFeePerKB
+     */
     public function determineFeeAndChange(TransactionBuilder $txBuilder, $highPriorityFeePerKB, $optimalFeePerKB, $lowPriorityFeePerKB) {
         $send = (new OutputsNormalizer($this->addressReader))->normalize($txBuilder->getOutputs());
         $utxos = $txBuilder->getUtxos();
@@ -920,7 +924,7 @@ 
      * @todo: mark this as deprecated, insist on the utxo's or qualified scripts.
      * @param int $utxoCnt      number of unspent inputs in transaction
      * @param int $outputCnt    number of outputs in transaction
-     * @return float
+     * @return integer
      * @access public           reminder that people might use this!
      */
     public static function estimateFee($utxoCnt, $outputCnt) {
@@ -944,7 +948,7 @@ 
      * @todo: deprecate
      * @param int $txinSize
      * @param int $txoutSize
-     * @return float
+     * @return integer
      */
     public static function estimateSize($txinSize, $txoutSize) {
         return 4 + 4 + $txinSize + 4 + $txoutSize + 4; // version + txinVarInt + txin + txoutVarInt + txout + locktime
@@ -954,7 +958,7 @@ 
      * only supports estimating size for P2PKH/P2SH outputs
      *
      * @param int $outputCnt    number of outputs in transaction
-     * @return float
+     * @return integer
      */
     public static function estimateSizeOutputs($outputCnt) {
         return ($outputCnt * 34);
@@ -1009,7 +1013,7 @@ 
      *
      * @param UTXO[]  $utxos
      * @param array[] $outputs
-     * @param         $feeStrategy
+     * @param         string $feeStrategy
      * @param         $highPriorityFeePerKB
      * @param         $optimalFeePerKB
      * @param         $lowPriorityFeePerKB
@@ -1113,8 +1117,8 @@ 
      * @param \array[] $outputs
      * @param bool $lockUTXO
      * @param bool $allowZeroConf
-     * @param int|null|string $feeStrategy
-     * @param null $forceFee
+     * @param string $feeStrategy
+     * @param null|integer $forceFee
      * @return array
      */
     public function coinSelection($outputs, $lockUTXO = true, $allowZeroConf = false, $feeStrategy = self::FEE_STRATEGY_OPTIMAL, $forceFee = null) {

src/Address/BitcoinCashAddressReader.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
      * @param bool $useNewCashAddress
      */
     public function __construct($useNewCashAddress) {
-        $this->useNewCashAddress = (bool) $useNewCashAddress;
+        $this->useNewCashAddress = (bool)$useNewCashAddress;
     }
 
     /**

src/BlocktrailSDK.php

Spacing +12 added lines, -15 removed lines

@@ -100,7 +100,7 @@ 
                 $useNetwork = NetworkFactory::bitcoin();
             }
         } else if ($network === "bitcoincash") {
-            $useNetwork = new BitcoinCash((bool) $testnet);
+            $useNetwork = new BitcoinCash((bool)$testnet);
         }
 
         Bitcoin::setNetwork($useNetwork);
@@ -314,7 +314,7 @@ 
      * @return array[]            array containing the response
      */
     public function transactions($txhashes) {
-        $response = $this->client->get("transactions/" . implode(",", $txhashes));
+        $response = $this->client->get("transactions/".implode(",", $txhashes));
         return self::jsonDecode($response->body(), true);
     }
     
@@ -581,7 +581,7 @@ 
             } else {
                 // create new primary seed
                 /** @var HierarchicalKey $primaryPrivateKey */
-                list($primaryMnemonic, , $primaryPrivateKey) = $this->newPrimarySeed($options['passphrase']);
+                list($primaryMnemonic,, $primaryPrivateKey) = $this->newPrimarySeed($options['passphrase']);
                 if ($storePrimaryMnemonic !== false) {
                     $storePrimaryMnemonic = true;
                 }
@@ -620,7 +620,7 @@ 
         $backupPublicKey = null;
         if (!isset($options['backup_mnemonic']) && !isset($options['backup_public_key'])) {
             /** @var HierarchicalKey $backupPrivateKey */
-            list($backupMnemonic, , ) = $this->newBackupSeed();
+            list($backupMnemonic,,) = $this->newBackupSeed();
         } else if (isset($options['backup_mnemonic'])) {
             $backupMnemonic = $options['backup_mnemonic'];
         } elseif (isset($options['backup_public_key'])) {
@@ -653,7 +653,7 @@ 
         );
 
         // received the blocktrail public keys
-        $blocktrailPublicKeys = Util::arrayMapWithIndex(function ($keyIndex, $pubKeyTuple) {
+        $blocktrailPublicKeys = Util::arrayMapWithIndex(function($keyIndex, $pubKeyTuple) {
             return [$keyIndex, BIP32Key::create(HierarchicalKeyFactory::fromExtended($pubKeyTuple[0]), $pubKeyTuple[1])];
         }, $data['blocktrail_public_keys']);
 
@@ -775,7 +775,7 @@ 
         );
 
         // received the blocktrail public keys
-        $blocktrailPublicKeys = Util::arrayMapWithIndex(function ($keyIndex, $pubKeyTuple) {
+        $blocktrailPublicKeys = Util::arrayMapWithIndex(function($keyIndex, $pubKeyTuple) {
             return [$keyIndex, BIP32Key::create(HierarchicalKeyFactory::fromExtended($pubKeyTuple[0]), $pubKeyTuple[1])];
         }, $data['blocktrail_public_keys']);
 
@@ -810,7 +810,7 @@ 
                 'backup_seed' => $backupSeed ? MnemonicFactory::bip39()->entropyToMnemonic(new Buffer($backupSeed)) : null,
                 'recovery_encrypted_secret' => $recoveryEncryptedSecret ? MnemonicFactory::bip39()->entropyToMnemonic(new Buffer(base64_decode($recoveryEncryptedSecret))) : null,
                 'encrypted_secret' => $encryptedSecret ? MnemonicFactory::bip39()->entropyToMnemonic(new Buffer(base64_decode($encryptedSecret))) : null,
-                'blocktrail_public_keys' => Util::arrayMapWithIndex(function ($keyIndex, BIP32Key $pubKey) {
+                'blocktrail_public_keys' => Util::arrayMapWithIndex(function($keyIndex, BIP32Key $pubKey) {
                     return [$keyIndex, $pubKey->tuple()];
                 }, $blocktrailPublicKeys),
             ],
@@ -917,7 +917,7 @@ 
         );
 
         // received the blocktrail public keys
-        $blocktrailPublicKeys = Util::arrayMapWithIndex(function ($keyIndex, $pubKeyTuple) {
+        $blocktrailPublicKeys = Util::arrayMapWithIndex(function($keyIndex, $pubKeyTuple) {
             return [$keyIndex, BIP32Key::create(HierarchicalKeyFactory::fromExtended($pubKeyTuple[0]), $pubKeyTuple[1])];
         }, $data['blocktrail_public_keys']);
 
@@ -952,7 +952,7 @@ 
                 'backup_seed'               => $backupSeed ? MnemonicFactory::bip39()->entropyToMnemonic($backupSeed) : null,
                 'recovery_encrypted_secret' => $recoveryEncryptedSecret ? EncryptionMnemonic::encode($recoveryEncryptedSecret) : null,
                 'encrypted_secret'          => $encryptedSecret ? EncryptionMnemonic::encode($encryptedSecret) : null,
-                'blocktrail_public_keys'    => Util::arrayMapWithIndex(function ($keyIndex, BIP32Key $pubKey) {
+                'blocktrail_public_keys'    => Util::arrayMapWithIndex(function($keyIndex, BIP32Key $pubKey) {
                     return [$keyIndex, $pubKey->tuple()];
                 }, $blocktrailPublicKeys),
             ]
@@ -1146,10 +1146,7 @@ 
         }
 
         $identifier = $options['identifier'];
-        $readonly = isset($options['readonly']) ? $options['readonly'] :
-                    (isset($options['readOnly']) ? $options['readOnly'] :
-                        (isset($options['read-only']) ? $options['read-only'] :
-                            false));
+        $readonly = isset($options['readonly']) ? $options['readonly'] : (isset($options['readOnly']) ? $options['readOnly'] : (isset($options['read-only']) ? $options['read-only'] : false));
 
         // get the wallet data from the server
         $data = $this->getWallet($identifier);
@@ -1837,7 +1834,7 @@ 
      */
     public static function sortMultisigKeys(array $pubKeys) {
         $result = array_values($pubKeys);
-        usort($result, function (PublicKeyInterface $a, PublicKeyInterface $b) {
+        usort($result, function(PublicKeyInterface $a, PublicKeyInterface $b) {
             $av = $a->getHex();
             $bv = $b->getHex();
             return $av == $bv ? 0 : $av > $bv ? 1 : -1;
@@ -1863,7 +1860,7 @@ 
     }
 
     public static function normalizeBIP32KeyArray($keys) {
-        return Util::arrayMapWithIndex(function ($idx, $key) {
+        return Util::arrayMapWithIndex(function($idx, $key) {
             return [$idx, self::normalizeBIP32Key($key)];
         }, $keys);
     }

src/OutputsNormalizer.php

Doc Comments +1 added lines

@@ -53,6 +53,7 @@
     /**
      * @param $address
      * @param $value
+     * @param NetworkInterface $network
      * @return array
      */
     private function parseAddressOutput($address, $value, $network) {

Spacing +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
                 if (!$newOutput['value']) {
                     throw new BlocktrailSDKException("Values should be non zero");
                 } else if ($newOutput['value'] < Blocktrail::DUST) {
-                    throw new BlocktrailSDKException("Values should be more than dust (" . Blocktrail::DUST . ")");
+                    throw new BlocktrailSDKException("Values should be more than dust (".Blocktrail::DUST.")");
                 }
             }
         }