From 12470f3b901ae822535944dfd2939215dddb2a28 Mon Sep 17 00:00:00 2001 From: sc0Vu Date: Tue, 26 Dec 2017 17:23:30 +0800 Subject: [PATCH] Normialize regular expressions --- src/Contracts/Types/Address.php | 2 +- src/Contracts/Types/Boolean.php | 2 +- src/Contracts/Types/Bytes.php | 2 +- src/Contracts/Types/Integer.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Contracts/Types/Address.php b/src/Contracts/Types/Address.php index a7112db..38a7ce6 100644 --- a/src/Contracts/Types/Address.php +++ b/src/Contracts/Types/Address.php @@ -34,7 +34,7 @@ class Address extends SolidityType implements IType */ public function isType($name) { - return (preg_match('/address(\[([0-9]+)\])?/', $name) === 1); + return (preg_match('/address(\[([0-9]+)\])*/', $name) === 1); } /** diff --git a/src/Contracts/Types/Boolean.php b/src/Contracts/Types/Boolean.php index 47d10fd..efd3118 100644 --- a/src/Contracts/Types/Boolean.php +++ b/src/Contracts/Types/Boolean.php @@ -34,7 +34,7 @@ class Boolean extends SolidityType implements IType */ public function isType($name) { - return (preg_match('/bool(\[([0-9]+)\])?/', $name) === 1); + return (preg_match('/bool(\[([0-9]+)\])*/', $name) === 1); } /** diff --git a/src/Contracts/Types/Bytes.php b/src/Contracts/Types/Bytes.php index c061998..7aaa40a 100644 --- a/src/Contracts/Types/Bytes.php +++ b/src/Contracts/Types/Bytes.php @@ -34,7 +34,7 @@ class Bytes extends SolidityType implements IType */ public function isType($name) { - return (preg_match('/bytes([0-9]{1,})?(\[([0-9]+)\])?/', $name) === 1); + return (preg_match('/bytes([0-9]{1,})?(\[([0-9]+)\])*/', $name) === 1); } /** diff --git a/src/Contracts/Types/Integer.php b/src/Contracts/Types/Integer.php index e779303..55611d6 100644 --- a/src/Contracts/Types/Integer.php +++ b/src/Contracts/Types/Integer.php @@ -34,7 +34,7 @@ class Integer extends SolidityType implements IType */ public function isType($name) { - return (preg_match('/int([0-9]{1,})?(\[([0-9]+)\])?/', $name) === 1); + return (preg_match('/int([0-9]{1,})?(\[([0-9]+)\])*/', $name) === 1); } /**