heibai2006/web3.php
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Number formatter.

Browse Source
This commit is contained in:
sc0Vu 2018-01-21 16:37:17 +08:00
parent 85b5cea599
commit f45b34f33d
3 changed files with 49 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Formatters/NumberFormatter.php Normal file
View File

@ -0,0 +1,34 @@
<?php
/**
* This file is part of web3.php package.
*
* (c) Kuan-Cheng,Lai <alk03073135@gmail.com>
*
* @author Peter Lai <alk03073135@gmail.com>
* @license MIT
*/
namespace Web3\Formatters;
use InvalidArgumentException;
use Web3\Utils;
use Web3\Formatters\IFormatter;
class NumberFormatter implements IFormatter
{
/**
* format
*
* @param mixed $value
* @return int
*/
public static function format($value)
{
$value = Utils::toString($value);
$bn = Utils::toBn($value);
$int = (int) $bn->toString();
return $int;
}
}

26
src/Methods/EthMethod.php
View File

@ -147,22 +147,22 @@ class EthMethod extends JSONRPC implements IMethod
if (!is_array($rules)) {
throw new InvalidArgumentException('Please use array rules when call transform.');
}
if (count($params) < count($rules)) {
if (!isset($this->defaultValues) || empty($this->defaultValues)) {
throw new \InvalidArgumentException('The params are less than inputFormatters.');
}
$defaultValues = $this->defaultValues;
// $defaultValues = $this->defaultValues;
foreach ($defaultValues as $key => $value) {
if (!isset($params[$key])) {
$params[$key] = $value;
}
}
}
foreach ($params as $key => $param) {
if (isset($rules[$key])) {
$params[$key] = call_user_func([$rules[$key], 'format'], $param);
$formatted = call_user_func([$rules[$key], 'format'], $param);
// if (is_int($formatted)) {
// if ($formatted >= 0) {
// $params[$key] = $formatted;
// } elseif (isset($defaultValues[$key])) {
// $params[$key] = $defaultValues[$key];
// }
// } else {
// $params[$key] = $formatted;
// }
$params[$key] = $formatted;
}
}
return $params;

4
src/Methods/Personal/UnlockAccount.php
View File

@ -18,7 +18,7 @@ use Web3\Validators\StringValidator;
use Web3\Validators\QuantityValidator;
use Web3\Formatters\AddressFormatter;
use Web3\Formatters\StringFormatter;
use Web3\Formatters\QuantityFormatter;
use Web3\Formatters\NumberFormatter;
class UnlockAccount extends EthMethod
{
@ -37,7 +37,7 @@ class UnlockAccount extends EthMethod
* @var array
*/
protected $inputFormatters = [
AddressFormatter::class, StringFormatter::class, QuantityFormatter::class
AddressFormatter::class, StringFormatter::class, NumberFormatter::class
];
/**