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

Add BlockHashValidator and fix validators.

Browse Source
This commit is contained in:
sc0Vu 2017-12-13 21:58:23 +08:00
parent 6a95cdef15
commit 2f7a9f901b
4 changed files with 50 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Eth.php
View File

@ -148,16 +148,25 @@ class Eth
foreach ($allowedMethod['params'] as $key => $param) {
if (isset($param['validators'])) {
if (is_array($param['validators'])) {
$isError = true;
foreach ($param['validators'] as $rule) {
if (!isset($arguments[$key]) || call_user_func([$rule, 'validate'], $arguments[$key]) === false) {
if (isset($param['default']) && !isset($arguments[$key])) {
$arguments[$key] = $param['default'];
if (isset($arguments[$key])) {
if (call_user_func([$rule, 'validate'], $arguments[$key]) === true) {
$isError = false;
break;
}
} else {
if (isset($param['default'])) {
$arguments[$key] = $param['default'];
$isError = false;
break;
}
}
}
if ($isError === true) {
throw new \RuntimeException('Wrong type of ' . $name . ' method argument ' . $key . '.');
}
}
}
} else {
if (!isset($arguments[$key]) || call_user_func([$param['validators'], 'validate'], $arguments[$key]) === false) {
if (isset($param['default']) && !isset($arguments[$key])) {

22
src/Validators/BlockHashValidator.php Normal file
View File

@ -0,0 +1,22 @@
<?php
namespace Web3\Validators;
use Web3\Validators\IValidator;
class BlockHashValidator
{
/**
* validate
*
* @param string $value
* @return bool
*/
public static function validate($value)
{
if (!is_string($value)) {
return false;
}
return (preg_match('/^0x[a-fA-F0-9]{64}$/', $value) >= 1);
}
}

19
src/Web3.php
View File

@ -98,16 +98,25 @@ class Web3
foreach ($allowedMethod['params'] as $key => $param) {
if (isset($param['validators'])) {
if (is_array($param['validators'])) {
$isError = true;
foreach ($param['validators'] as $rule) {
if (!isset($arguments[$key]) || call_user_func([$rule, 'validate'], $arguments[$key]) === false) {
if (isset($param['default']) && !isset($arguments[$key])) {
$arguments[$key] = $param['default'];
if (isset($arguments[$key])) {
if (call_user_func([$rule, 'validate'], $arguments[$key]) === true) {
$isError = false;
break;
}
} else {
if (isset($param['default'])) {
$arguments[$key] = $param['default'];
$isError = false;
break;
}
}
}
if ($isError === true) {
throw new \RuntimeException('Wrong type of ' . $name . ' method argument ' . $key . '.');
}
}
}
} else {
if (!isset($arguments[$key]) || call_user_func([$param['validators'], 'validate'], $arguments[$key]) === false) {
if (isset($param['default']) && !isset($arguments[$key])) {

1
test/unit/EthTest.php
View File

@ -301,7 +301,6 @@ class EthTest extends TestCase
return $this->fail($err->getMessage());
}
if (isset($transactionCount->result)) {
var_dump($transactionCount->result);
$this->assertTrue(is_string($transactionCount->result));
} else {
if (isset($transactionCount->error)) {