Merge pull request #257 from cryptounifier/php-80-test-passing

sc0Vu · web-flow · commit 2eafffbbe50b · 2022-03-06T19:26:51.000-08:00
Support PHP 8.0
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -1,13 +1,13 @@
 name: PHP
 
-on: ["push", "pull_request"]
+on: ["push", "pull_request", "workflow_dispatch"]
 
 jobs:
   build_and_test:
     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
 
diff --git a/composer.json b/composer.json
@@ -11,13 +11,13 @@
     ],
     "require": {
         "guzzlehttp/guzzle": "^6.3|^7.0",
-        "PHP": "^7.1",
+        "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"
+        "phpunit/phpunit": "~8.0|~9.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/docker/php/Dockerfile-80 b/docker/php/Dockerfile-80
@@ -0,0 +1,23 @@
+FROM php:8.0-alpine
+
+MAINTAINER Peter Lai <alk03073135@gmail.com>
+
+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
diff --git a/phpunit.xml b/phpunit.xml
@@ -7,8 +7,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false">
+         stopOnFailure="false">
 
     <testsuite name="Web3.php unit test">
         <directory suffix="Test.php">./test/unit</directory>
diff --git a/src/Utils.php b/src/Utils.php
@@ -529,7 +529,7 @@ public static function toBn($number)
                 $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/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 @@ public function setUp()
 
     /**
      * tearDown
-     * 
-     * @return void
      */
-    public function tearDown() {}
-}
+    public function tearDown(): void {}
+}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -19,7 +19,7 @@ class OptionalQuantityFormatterTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->formatter = new OptionalQuantityFormatter;
@@ -55,6 +55,8 @@ public function testFormat()
         $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');
     }
 }
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/test/unit/QuantityFormatterTest.php b/test/unit/QuantityFormatterTest.php
diff --git a/test/unit/QuantityValidatorTest.php b/test/unit/QuantityValidatorTest.php
diff --git a/test/unit/ShhApiTest.php b/test/unit/ShhApiTest.php
diff --git a/test/unit/ShhBatchTest.php b/test/unit/ShhBatchTest.php
diff --git a/test/unit/ShhFilterValidatorTest.php b/test/unit/ShhFilterValidatorTest.php
diff --git a/test/unit/ShhTest.php b/test/unit/ShhTest.php
diff --git a/test/unit/SolidityTypeTest.php b/test/unit/SolidityTypeTest.php
diff --git a/test/unit/StrTypeTest.php b/test/unit/StrTypeTest.php
diff --git a/test/unit/StringFormatterTest.php b/test/unit/StringFormatterTest.php
diff --git a/test/unit/StringValidatorTest.php b/test/unit/StringValidatorTest.php
diff --git a/test/unit/TagValidatorTest.php b/test/unit/TagValidatorTest.php
diff --git a/test/unit/TransactionFormatterTest.php b/test/unit/TransactionFormatterTest.php
diff --git a/test/unit/TransactionValidatorTest.php b/test/unit/TransactionValidatorTest.php
diff --git a/test/unit/UintegerTypeTest.php b/test/unit/UintegerTypeTest.php
diff --git a/test/unit/UtilsTest.php b/test/unit/UtilsTest.php
diff --git a/test/unit/Web3ApiTest.php b/test/unit/Web3ApiTest.php
diff --git a/test/unit/Web3BatchTest.php b/test/unit/Web3BatchTest.php
diff --git a/test/unit/Web3Test.php b/test/unit/Web3Test.php

Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,7 @@ public static function toBn($number)`
`529`	`529`	`$number = str_replace('-', '', $number, $count);`
`530`	`530`	`$negative1 = new BigNumber(-1);`
`531`	`531`	`}`
`532`		`- if (self::isZeroPrefixed($number) \|\| preg_match('/[a-f]+/', $number) === 1) {`
	`532`	`+ if (self::isZeroPrefixed($number) \|\| preg_match('/^[0-9a-f]+$/i', $number) === 1) {`
`533`	`533`	`$number = self::stripZero($number);`
`534`	`534`	`$bn = new BigNumber($number, 16);`
`535`	`535`	`} elseif (empty($number)) {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class AddressFormatterTest extends TestCase`
`19`	`19`	`*`
`20`	`20`	`* @return void`
`21`	`21`	`*/`
`22`		`- public function setUp()`
	`22`	`+ public function setUp(): void`
`23`	`23`	`{`
`24`	`24`	`parent::setUp();`
`25`	`25`	`$this->formatter = new AddressFormatter;`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class AddressTypeTest extends TestCase`
`47`	`47`	`*`
`48`	`48`	`* @return void`
`49`	`49`	`*/`
`50`		`- public function setUp()`
	`50`	`+ public function setUp(): void`
`51`	`51`	`{`
`52`	`52`	`parent::setUp();`
`53`	`53`	`$this->solidityType = new Address;`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class AddressValidatorTest extends TestCase`
`19`	`19`	`*`
`20`	`20`	`* @return void`
`21`	`21`	`*/`
`22`		`- public function setUp()`
	`22`	`+ public function setUp(): void`
`23`	`23`	`{`
`24`	`24`	`parent::setUp();`
`25`	`25`	`$this->validator = new AddressValidator;`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class BigNumberFormatterTest extends TestCase`
`20`	`20`	`*`
`21`	`21`	`* @return void`
`22`	`22`	`*/`
`23`		`- public function setUp()`
	`23`	`+ public function setUp(): void`
`24`	`24`	`{`
`25`	`25`	`parent::setUp();`
`26`	`26`	`$this->formatter = new BigNumberFormatter;`