From dabb7262b52019517a68986ac14309236180632f Mon Sep 17 00:00:00 2001 From: Dante <35383529+srdante@users.noreply.github.com> Date: Sat, 26 Feb 2022 02:27:56 -0300 Subject: [PATCH 1/8] Update composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 4cbc3f0..3a249e7 100644 --- a/composer.json +++ b/composer.json @@ -11,13 +11,13 @@ ], "require": { "guzzlehttp/guzzle": "^6.3|^7.0", - "PHP": "^7.1", + "PHP": "^7.1|^8.0", "kornrunner/keccak": "~1.0", "phpseclib/phpseclib": "~2.0.11", "ext-mbstring": "*" }, "require-dev": { - "phpunit/phpunit": "~6.0" + "phpunit/phpunit": "~6.0|~8.0" }, "autoload": { "psr-4": { From 7eb8a463662d87314c061d5bee1a007716e0b8f2 Mon Sep 17 00:00:00 2001 From: Dante <35383529+srdante@users.noreply.github.com> Date: Sat, 26 Feb 2022 02:28:17 -0300 Subject: [PATCH 2/8] Update php.yml --- .github/workflows/php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 7b4c666..dc34c60 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -7,7 +7,7 @@ jobs: name: Build and test web3.php with ${{ matrix.php-version }} strategy: matrix: - php-version: ["7.3", "7.4"] + php-version: ["7.3", "7.4", "8.0"] runs-on: ubuntu-latest From 217851c62d684e9d18f8a671ecd96b0cc7255ab0 Mon Sep 17 00:00:00 2001 From: Dante <35383529+srdante@users.noreply.github.com> Date: Sat, 26 Feb 2022 02:33:59 -0300 Subject: [PATCH 3/8] Update php.yml --- .github/workflows/php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index dc34c60..0f0dc36 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -1,6 +1,6 @@ name: PHP -on: ["push", "pull_request"] +on: ["push", "pull_request", "workflow_dispatch"] jobs: build_and_test: From 2ae840f538d2ea61758fa35b89a69eb302174d2c Mon Sep 17 00:00:00 2001 From: Dante <35383529+srdante@users.noreply.github.com> Date: Sat, 26 Feb 2022 02:40:01 -0300 Subject: [PATCH 4/8] Update TestCase.php --- test/TestCase.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/test/TestCase.php b/test/TestCase.php index 51593d8..373a8b3 100644 --- a/test/TestCase.php +++ b/test/TestCase.php @@ -37,10 +37,8 @@ class TestCase extends BaseTestCase /** * setUp - * - * @return void */ - public function setUp() + public function setUp(): void { $web3 = new Web3($this->testHost); $this->web3 = $web3; @@ -55,8 +53,6 @@ class TestCase extends BaseTestCase /** * tearDown - * - * @return void */ - public function tearDown() {} -} \ No newline at end of file + public function tearDown(): void {} +} From 91f4d2c40bce62dcebc6a03b9bc258b1ee5d95f7 Mon Sep 17 00:00:00 2001 From: srdante Date: Sat, 26 Feb 2022 02:43:32 -0300 Subject: [PATCH 5/8] Set setUp() return type --- test/unit/AddressFormatterTest.php | 2 +- test/unit/AddressTypeTest.php | 2 +- test/unit/AddressValidatorTest.php | 2 +- test/unit/BigNumberFormatterTest.php | 2 +- test/unit/BlockHashValidatorTest.php | 2 +- test/unit/BooleanFormatterTest.php | 2 +- test/unit/BooleanTypeTest.php | 2 +- test/unit/BooleanValidatorTest.php | 2 +- test/unit/BytesTypeTest.php | 2 +- test/unit/CallValidatorTest.php | 2 +- test/unit/ContractTest.php | 2 +- test/unit/DynamicBytesTypeTest.php | 2 +- test/unit/EthApiTest.php | 2 +- test/unit/EthBatchTest.php | 2 +- test/unit/EthTest.php | 2 +- test/unit/EthabiTest.php | 2 +- test/unit/FilterValidatorTest.php | 2 +- test/unit/HexFormatterTest.php | 2 +- test/unit/HexValidatorTest.php | 2 +- test/unit/IdentityValidatorTest.php | 2 +- test/unit/IntegerFormatterTest.php | 2 +- test/unit/IntegerTypeTest.php | 2 +- test/unit/NetApiTest.php | 2 +- test/unit/NetBatchTest.php | 2 +- test/unit/NetTest.php | 2 +- test/unit/NonceValidatorTest.php | 2 +- test/unit/NumberFormatterTest.php | 2 +- test/unit/OptionalQuantityFormatterTest.php | 2 +- test/unit/PersonalApiTest.php | 2 +- test/unit/PersonalBatchTest.php | 2 +- test/unit/PersonalTest.php | 2 +- test/unit/PostFormatterTest.php | 2 +- test/unit/PostValidatorTest.php | 2 +- test/unit/QuantityFormatterTest.php | 2 +- test/unit/QuantityValidatorTest.php | 2 +- test/unit/ShhApiTest.php | 2 +- test/unit/ShhBatchTest.php | 2 +- test/unit/ShhFilterValidatorTest.php | 2 +- test/unit/ShhTest.php | 2 +- test/unit/SolidityTypeTest.php | 2 +- test/unit/StrTypeTest.php | 2 +- test/unit/StringFormatterTest.php | 2 +- test/unit/StringValidatorTest.php | 2 +- test/unit/TagValidatorTest.php | 2 +- test/unit/TransactionFormatterTest.php | 2 +- test/unit/TransactionValidatorTest.php | 2 +- test/unit/UintegerTypeTest.php | 2 +- test/unit/UtilsTest.php | 2 +- test/unit/Web3ApiTest.php | 2 +- test/unit/Web3BatchTest.php | 2 +- test/unit/Web3Test.php | 2 +- 51 files changed, 51 insertions(+), 51 deletions(-) diff --git a/test/unit/AddressFormatterTest.php b/test/unit/AddressFormatterTest.php index 030084b..6d62495 100644 --- a/test/unit/AddressFormatterTest.php +++ b/test/unit/AddressFormatterTest.php @@ -19,7 +19,7 @@ class AddressFormatterTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->formatter = new AddressFormatter; diff --git a/test/unit/AddressTypeTest.php b/test/unit/AddressTypeTest.php index 40b3a2a..0c370df 100644 --- a/test/unit/AddressTypeTest.php +++ b/test/unit/AddressTypeTest.php @@ -47,7 +47,7 @@ class AddressTypeTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->solidityType = new Address; diff --git a/test/unit/AddressValidatorTest.php b/test/unit/AddressValidatorTest.php index 63b0553..8ecf63c 100644 --- a/test/unit/AddressValidatorTest.php +++ b/test/unit/AddressValidatorTest.php @@ -19,7 +19,7 @@ class AddressValidatorTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->validator = new AddressValidator; diff --git a/test/unit/BigNumberFormatterTest.php b/test/unit/BigNumberFormatterTest.php index 7b96704..87dc621 100644 --- a/test/unit/BigNumberFormatterTest.php +++ b/test/unit/BigNumberFormatterTest.php @@ -20,7 +20,7 @@ class BigNumberFormatterTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->formatter = new BigNumberFormatter; diff --git a/test/unit/BlockHashValidatorTest.php b/test/unit/BlockHashValidatorTest.php index 091ce46..bd8340a 100644 --- a/test/unit/BlockHashValidatorTest.php +++ b/test/unit/BlockHashValidatorTest.php @@ -19,7 +19,7 @@ class BlockHashValidatorTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->validator = new BlockHashValidator; diff --git a/test/unit/BooleanFormatterTest.php b/test/unit/BooleanFormatterTest.php index 24c7d4a..a8b58ae 100644 --- a/test/unit/BooleanFormatterTest.php +++ b/test/unit/BooleanFormatterTest.php @@ -20,7 +20,7 @@ class BooleanFormatterTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->formatter = new BooleanFormatter; diff --git a/test/unit/BooleanTypeTest.php b/test/unit/BooleanTypeTest.php index 73304b3..bf9a94c 100644 --- a/test/unit/BooleanTypeTest.php +++ b/test/unit/BooleanTypeTest.php @@ -47,7 +47,7 @@ class BooleanTypeTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->solidityType = new Boolean; diff --git a/test/unit/BooleanValidatorTest.php b/test/unit/BooleanValidatorTest.php index 32fff35..c1fc82f 100644 --- a/test/unit/BooleanValidatorTest.php +++ b/test/unit/BooleanValidatorTest.php @@ -19,7 +19,7 @@ class BooleanValidatorTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->validator = new BooleanValidator; diff --git a/test/unit/BytesTypeTest.php b/test/unit/BytesTypeTest.php index c446cc5..dd82e6f 100644 --- a/test/unit/BytesTypeTest.php +++ b/test/unit/BytesTypeTest.php @@ -53,7 +53,7 @@ class BytesTypeTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->solidityType = new Bytes; diff --git a/test/unit/CallValidatorTest.php b/test/unit/CallValidatorTest.php index e533632..1e95765 100644 --- a/test/unit/CallValidatorTest.php +++ b/test/unit/CallValidatorTest.php @@ -19,7 +19,7 @@ class CallValidatorTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->validator = new CallValidator; diff --git a/test/unit/ContractTest.php b/test/unit/ContractTest.php index eb176f8..5061abc 100644 --- a/test/unit/ContractTest.php +++ b/test/unit/ContractTest.php @@ -412,7 +412,7 @@ class ContractTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/test/unit/DynamicBytesTypeTest.php b/test/unit/DynamicBytesTypeTest.php index 821f73b..3082456 100644 --- a/test/unit/DynamicBytesTypeTest.php +++ b/test/unit/DynamicBytesTypeTest.php @@ -53,7 +53,7 @@ class DynamicBytesTypeTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->solidityType = new DynamicBytes; diff --git a/test/unit/EthApiTest.php b/test/unit/EthApiTest.php index 0f600a2..2f58bc4 100644 --- a/test/unit/EthApiTest.php +++ b/test/unit/EthApiTest.php @@ -21,7 +21,7 @@ class EthApiTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/test/unit/EthBatchTest.php b/test/unit/EthBatchTest.php index 2ab28eb..976fe20 100644 --- a/test/unit/EthBatchTest.php +++ b/test/unit/EthBatchTest.php @@ -20,7 +20,7 @@ class EthBatchTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/test/unit/EthTest.php b/test/unit/EthTest.php index 50295bd..702bd6b 100644 --- a/test/unit/EthTest.php +++ b/test/unit/EthTest.php @@ -23,7 +23,7 @@ class EthTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/test/unit/EthabiTest.php b/test/unit/EthabiTest.php index f350084..ecea054 100644 --- a/test/unit/EthabiTest.php +++ b/test/unit/EthabiTest.php @@ -163,7 +163,7 @@ class EthabiTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); // Error: Using $this when not in object context diff --git a/test/unit/FilterValidatorTest.php b/test/unit/FilterValidatorTest.php index 5c6848f..688a611 100644 --- a/test/unit/FilterValidatorTest.php +++ b/test/unit/FilterValidatorTest.php @@ -19,7 +19,7 @@ class FilterValidatorTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->validator = new FilterValidator; diff --git a/test/unit/HexFormatterTest.php b/test/unit/HexFormatterTest.php index 5be7ecc..21a3ac7 100644 --- a/test/unit/HexFormatterTest.php +++ b/test/unit/HexFormatterTest.php @@ -19,7 +19,7 @@ class HexFormatterTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->formatter = new HexFormatter; diff --git a/test/unit/HexValidatorTest.php b/test/unit/HexValidatorTest.php index 50e783d..6b49a4c 100644 --- a/test/unit/HexValidatorTest.php +++ b/test/unit/HexValidatorTest.php @@ -19,7 +19,7 @@ class HexValidatorTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->validator = new HexValidator; diff --git a/test/unit/IdentityValidatorTest.php b/test/unit/IdentityValidatorTest.php index 5f1f102..20d4f8c 100644 --- a/test/unit/IdentityValidatorTest.php +++ b/test/unit/IdentityValidatorTest.php @@ -19,7 +19,7 @@ class IdentityValidatorTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->validator = new IdentityValidator; diff --git a/test/unit/IntegerFormatterTest.php b/test/unit/IntegerFormatterTest.php index 1476f64..c72d4cf 100644 --- a/test/unit/IntegerFormatterTest.php +++ b/test/unit/IntegerFormatterTest.php @@ -19,7 +19,7 @@ class IntegerFormatterTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->formatter = new IntegerFormatter; diff --git a/test/unit/IntegerTypeTest.php b/test/unit/IntegerTypeTest.php index 595906c..addeafc 100644 --- a/test/unit/IntegerTypeTest.php +++ b/test/unit/IntegerTypeTest.php @@ -53,7 +53,7 @@ class IntegerTypeTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->solidityType = new Integer; diff --git a/test/unit/NetApiTest.php b/test/unit/NetApiTest.php index 1aab1eb..4914235 100644 --- a/test/unit/NetApiTest.php +++ b/test/unit/NetApiTest.php @@ -21,7 +21,7 @@ class NetApiTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/test/unit/NetBatchTest.php b/test/unit/NetBatchTest.php index f3b58ec..8d6d5e3 100644 --- a/test/unit/NetBatchTest.php +++ b/test/unit/NetBatchTest.php @@ -20,7 +20,7 @@ class NetBatchTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/test/unit/NetTest.php b/test/unit/NetTest.php index bff7b4e..ef5ef33 100644 --- a/test/unit/NetTest.php +++ b/test/unit/NetTest.php @@ -23,7 +23,7 @@ class NetTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/test/unit/NonceValidatorTest.php b/test/unit/NonceValidatorTest.php index 6ec9400..13073d9 100644 --- a/test/unit/NonceValidatorTest.php +++ b/test/unit/NonceValidatorTest.php @@ -19,7 +19,7 @@ class NonceValidatorTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->validator = new NonceValidator; diff --git a/test/unit/NumberFormatterTest.php b/test/unit/NumberFormatterTest.php index 5cbe983..0f9bb4f 100644 --- a/test/unit/NumberFormatterTest.php +++ b/test/unit/NumberFormatterTest.php @@ -19,7 +19,7 @@ class NumberFormatterTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->formatter = new NumberFormatter; diff --git a/test/unit/OptionalQuantityFormatterTest.php b/test/unit/OptionalQuantityFormatterTest.php index 792db26..0f0f9ec 100644 --- a/test/unit/OptionalQuantityFormatterTest.php +++ b/test/unit/OptionalQuantityFormatterTest.php @@ -19,7 +19,7 @@ class OptionalQuantityFormatterTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->formatter = new OptionalQuantityFormatter; diff --git a/test/unit/PersonalApiTest.php b/test/unit/PersonalApiTest.php index 127c8d5..a156ecf 100644 --- a/test/unit/PersonalApiTest.php +++ b/test/unit/PersonalApiTest.php @@ -27,7 +27,7 @@ class PersonalApiTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/test/unit/PersonalBatchTest.php b/test/unit/PersonalBatchTest.php index 0c21cec..7af5fff 100644 --- a/test/unit/PersonalBatchTest.php +++ b/test/unit/PersonalBatchTest.php @@ -19,7 +19,7 @@ class PersonalBatchTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/test/unit/PersonalTest.php b/test/unit/PersonalTest.php index 1b97b81..b5bab27 100644 --- a/test/unit/PersonalTest.php +++ b/test/unit/PersonalTest.php @@ -23,7 +23,7 @@ class PersonalTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/test/unit/PostFormatterTest.php b/test/unit/PostFormatterTest.php index eaf4223..bd9eef7 100644 --- a/test/unit/PostFormatterTest.php +++ b/test/unit/PostFormatterTest.php @@ -19,7 +19,7 @@ class PostFormatterTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->formatter = new PostFormatter; diff --git a/test/unit/PostValidatorTest.php b/test/unit/PostValidatorTest.php index 8346eb8..6c99b5d 100644 --- a/test/unit/PostValidatorTest.php +++ b/test/unit/PostValidatorTest.php @@ -19,7 +19,7 @@ class PostValidatorTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->validator = new PostValidator; diff --git a/test/unit/QuantityFormatterTest.php b/test/unit/QuantityFormatterTest.php index c098f8b..e5cfdd7 100644 --- a/test/unit/QuantityFormatterTest.php +++ b/test/unit/QuantityFormatterTest.php @@ -19,7 +19,7 @@ class QuantityFormatterTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->formatter = new QuantityFormatter; diff --git a/test/unit/QuantityValidatorTest.php b/test/unit/QuantityValidatorTest.php index 2a708aa..a225bc2 100644 --- a/test/unit/QuantityValidatorTest.php +++ b/test/unit/QuantityValidatorTest.php @@ -19,7 +19,7 @@ class QuantityValidatorTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->validator = new QuantityValidator; diff --git a/test/unit/ShhApiTest.php b/test/unit/ShhApiTest.php index c1a3f34..e0fcd0e 100644 --- a/test/unit/ShhApiTest.php +++ b/test/unit/ShhApiTest.php @@ -21,7 +21,7 @@ class ShhApiTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/test/unit/ShhBatchTest.php b/test/unit/ShhBatchTest.php index 09d76b4..0109327 100644 --- a/test/unit/ShhBatchTest.php +++ b/test/unit/ShhBatchTest.php @@ -19,7 +19,7 @@ class ShhBatchTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/test/unit/ShhFilterValidatorTest.php b/test/unit/ShhFilterValidatorTest.php index 5e8c042..771017b 100644 --- a/test/unit/ShhFilterValidatorTest.php +++ b/test/unit/ShhFilterValidatorTest.php @@ -19,7 +19,7 @@ class ShhFilterValidatorTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->validator = new ShhFilterValidator; diff --git a/test/unit/ShhTest.php b/test/unit/ShhTest.php index 10cca8c..bcaeb8a 100644 --- a/test/unit/ShhTest.php +++ b/test/unit/ShhTest.php @@ -23,7 +23,7 @@ class ShhTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); diff --git a/test/unit/SolidityTypeTest.php b/test/unit/SolidityTypeTest.php index 941deb2..3afb7ac 100644 --- a/test/unit/SolidityTypeTest.php +++ b/test/unit/SolidityTypeTest.php @@ -20,7 +20,7 @@ class SolidityTypeTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->type = new SolidityType(); diff --git a/test/unit/StrTypeTest.php b/test/unit/StrTypeTest.php index 74f3309..235808f 100644 --- a/test/unit/StrTypeTest.php +++ b/test/unit/StrTypeTest.php @@ -47,7 +47,7 @@ class StrTypeTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->solidityType = new Str; diff --git a/test/unit/StringFormatterTest.php b/test/unit/StringFormatterTest.php index 1a52658..762d202 100644 --- a/test/unit/StringFormatterTest.php +++ b/test/unit/StringFormatterTest.php @@ -19,7 +19,7 @@ class StringFormatterTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->formatter = new StringFormatter; diff --git a/test/unit/StringValidatorTest.php b/test/unit/StringValidatorTest.php index 0b7b40e..640882b 100644 --- a/test/unit/StringValidatorTest.php +++ b/test/unit/StringValidatorTest.php @@ -19,7 +19,7 @@ class StringValidatorTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->validator = new StringValidator; diff --git a/test/unit/TagValidatorTest.php b/test/unit/TagValidatorTest.php index b906842..a9d92d2 100644 --- a/test/unit/TagValidatorTest.php +++ b/test/unit/TagValidatorTest.php @@ -19,7 +19,7 @@ class TagValidatorTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->validator = new TagValidator; diff --git a/test/unit/TransactionFormatterTest.php b/test/unit/TransactionFormatterTest.php index be1809f..862bf18 100644 --- a/test/unit/TransactionFormatterTest.php +++ b/test/unit/TransactionFormatterTest.php @@ -19,7 +19,7 @@ class TransactionFormatterTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->formatter = new TransactionFormatter; diff --git a/test/unit/TransactionValidatorTest.php b/test/unit/TransactionValidatorTest.php index ce12915..a9c20a6 100644 --- a/test/unit/TransactionValidatorTest.php +++ b/test/unit/TransactionValidatorTest.php @@ -19,7 +19,7 @@ class TransactionValidatorTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->validator = new TransactionValidator; diff --git a/test/unit/UintegerTypeTest.php b/test/unit/UintegerTypeTest.php index a1eec9d..33688e3 100644 --- a/test/unit/UintegerTypeTest.php +++ b/test/unit/UintegerTypeTest.php @@ -53,7 +53,7 @@ class UintegerTypeTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); $this->solidityType = new Uinteger; diff --git a/test/unit/UtilsTest.php b/test/unit/UtilsTest.php index 246d4c9..566c699 100644 --- a/test/unit/UtilsTest.php +++ b/test/unit/UtilsTest.php @@ -137,7 +137,7 @@ class UtilsTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); } diff --git a/test/unit/Web3ApiTest.php b/test/unit/Web3ApiTest.php index 4b365c3..1ffac11 100644 --- a/test/unit/Web3ApiTest.php +++ b/test/unit/Web3ApiTest.php @@ -29,7 +29,7 @@ class Web3ApiTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); } diff --git a/test/unit/Web3BatchTest.php b/test/unit/Web3BatchTest.php index 5edaf54..825a724 100644 --- a/test/unit/Web3BatchTest.php +++ b/test/unit/Web3BatchTest.php @@ -28,7 +28,7 @@ class Web3BatchTest extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); } diff --git a/test/unit/Web3Test.php b/test/unit/Web3Test.php index bbd05eb..db3b0b9 100644 --- a/test/unit/Web3Test.php +++ b/test/unit/Web3Test.php @@ -37,7 +37,7 @@ class Web3Test extends TestCase * * @return void */ - public function setUp() + public function setUp(): void { parent::setUp(); } From 7c46919e7d5551b75e901642f77f58f1e3353536 Mon Sep 17 00:00:00 2001 From: srdante Date: Sat, 26 Feb 2022 02:48:12 -0300 Subject: [PATCH 6/8] Bump composer dependencies --- composer.json | 6 +++--- phpunit.xml | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 3a249e7..e03dcef 100644 --- a/composer.json +++ b/composer.json @@ -11,13 +11,13 @@ ], "require": { "guzzlehttp/guzzle": "^6.3|^7.0", - "PHP": "^7.1|^8.0", + "PHP": "^7.2|^8.0", "kornrunner/keccak": "~1.0", - "phpseclib/phpseclib": "~2.0.11", + "phpseclib/phpseclib": "~2.0.30", "ext-mbstring": "*" }, "require-dev": { - "phpunit/phpunit": "~6.0|~8.0" + "phpunit/phpunit": "~8.0|~9.0" }, "autoload": { "psr-4": { diff --git a/phpunit.xml b/phpunit.xml index 3748540..5cbe216 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -7,8 +7,7 @@ convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" - stopOnFailure="false" - syntaxCheck="false"> + stopOnFailure="false"> ./test/unit From 1d47285b8b4c1c1b220250301816b572a2586411 Mon Sep 17 00:00:00 2001 From: srdante Date: Sat, 26 Feb 2022 03:15:44 -0300 Subject: [PATCH 7/8] Fix preg match & testings --- src/Utils.php | 2 +- test/unit/OptionalQuantityFormatterTest.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Utils.php b/src/Utils.php index be80c9d..8883c2b 100644 --- a/src/Utils.php +++ b/src/Utils.php @@ -529,7 +529,7 @@ class Utils $number = str_replace('-', '', $number, $count); $negative1 = new BigNumber(-1); } - if (self::isZeroPrefixed($number) || preg_match('/[a-f]+/', $number) === 1) { + if (self::isZeroPrefixed($number) || preg_match('/^[0-9a-f]+$/i', $number) === 1) { $number = self::stripZero($number); $bn = new BigNumber($number, 16); } elseif (empty($number)) { diff --git a/test/unit/OptionalQuantityFormatterTest.php b/test/unit/OptionalQuantityFormatterTest.php index 0f0f9ec..6ee009f 100644 --- a/test/unit/OptionalQuantityFormatterTest.php +++ b/test/unit/OptionalQuantityFormatterTest.php @@ -55,6 +55,8 @@ class OptionalQuantityFormatterTest extends TestCase $this->assertEquals('latest', $formatter->format('latest')); $this->assertEquals('earliest', $formatter->format('earliest')); $this->assertEquals('pending', $formatter->format('pending')); - $this->assertEquals('0x0', $formatter->format('hello')); + + $this->expectExceptionMessage('toBn number must be valid hex string.'); + $formatter->format('hello'); } } \ No newline at end of file From cc7d01e7eb8912c7fa46e1068034906846b15bd9 Mon Sep 17 00:00:00 2001 From: Dante <35383529+srdante@users.noreply.github.com> Date: Sat, 26 Feb 2022 03:44:06 -0300 Subject: [PATCH 8/8] Add Dockerfile-80 --- docker/php/Dockerfile-80 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 docker/php/Dockerfile-80 diff --git a/docker/php/Dockerfile-80 b/docker/php/Dockerfile-80 new file mode 100644 index 0000000..26224c7 --- /dev/null +++ b/docker/php/Dockerfile-80 @@ -0,0 +1,23 @@ +FROM php:8.0-alpine + +MAINTAINER Peter Lai + +COPY composer-setup.php composer-setup.php +# COPY php.ini-production $PHP_INI_DIR/php.ini + +RUN apk update && \ + apk add git + +# Install gmp +Run apk add gmp-dev && \ + docker-php-ext-install gmp + +# Install nodejs +# Run apk add --update nodejs nodejs-npm + +# Install composer +RUN php composer-setup.php && \ + php composer-setup.php --install-dir=/usr/bin --filename=composer && \ + php -r "unlink('composer-setup.php');" + +WORKDIR /app