Merge pull request #264 from srdante/patch-1

Fix Test Caching

.github/workflows/php.yml

@@ -0,0 +1,49 @@
+name: PHP
+
+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", "8.0"]
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+          php-version: ${{ matrix.php-version }}
+
+    - name: PHP version
+      run: |
+        php --version
+
+    - name: Install nodejs and ganache-cli
+      run: |
+        sudo apt-get update -y
+        sudo apt-get install -y nodejs
+        sudo npm install -g ganache-cli
+
+    - uses: actions/checkout@v2
+
+    - name: Validate composer.json and composer.lock
+      run: composer validate
+
+    - name: Cache Composer packages
+      id: composer-cache
+      uses: actions/cache@v2
+      with:
+        path: vendor
+        key: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-php-${{ matrix.php-version }}-
+
+    - name: Install dependencies
+      if: steps.composer-cache.outputs.cache-hit != 'true'
+      run: composer install --prefer-dist --no-progress --no-suggest
+
+    - name: Run test suite
+      run: sudo scripts/test.sh

.travis.yml

@@ -5,6 +5,8 @@ language: php
 php:
   - 7.1
   - 7.2
+  - 7.3
+  - 7.4
 
 before_install:
   - nvm install 8
@@ -24,4 +26,4 @@ script:
   - scripts/test.sh
 
 after_success:
-    - bash <(curl -s https://codecov.io/bash) -t 8436848f-9a99-4b49-be60-629d7ff9a62c
+    - bash <(curl -s https://codecov.io/bash) -t 76a0abaf-bbc4-4829-b5b8-474f10a6b9e9

README.md

@@ -1,9 +1,10 @@
 # web3.php
 
-[![Build Status](https://travis-ci.org/sc0Vu/web3.php.svg?branch=master)](https://travis-ci.org/sc0Vu/web3.php)
-[![codecov](https://codecov.io/gh/sc0Vu/web3.php/branch/master/graph/badge.svg)](https://codecov.io/gh/sc0Vu/web3.php)
+[![PHP](https://github.com/web3p/web3.php/actions/workflows/php.yml/badge.svg)](https://github.com/web3p/web3.php/actions/workflows/php.yml)
+[![Build Status](https://travis-ci.org/web3p/web3.php.svg?branch=master)](https://travis-ci.org/web3p/web3.php)
+[![codecov](https://codecov.io/gh/web3p/web3.php/branch/master/graph/badge.svg)](https://codecov.io/gh/web3p/web3.php)
 [![Join the chat at https://gitter.im/web3-php/web3.php](https://img.shields.io/badge/gitter-join%20chat-brightgreen.svg)](https://gitter.im/web3-php/web3.php)
-[![Licensed under the MIT License](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/sc0Vu/web3.php/blob/master/LICENSE)
+[![Licensed under the MIT License](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/web3p/web3.php/blob/master/LICENSE)
 
 
 A php interface for interacting with the Ethereum blockchain and ecosystem.
@@ -17,13 +18,13 @@ Set minimum stability to dev
 
 Then
 ```
-composer require sc0vu/web3.php dev-master
+composer require web3p/web3.php dev-master
 ```
 
 Or you can add this line in composer.json
 
 ```
-"sc0vu/web3.php": "dev-master"
+"web3p/web3.php": "dev-master"
 ```
 
 
@@ -216,7 +217,7 @@ If you are using docker as development machain, you can try [ethdock](https://gi
 
 1. Clone the repo and install packages.
 ```
-git clone https://github.com/sc0Vu/web3.php.git && cd web3.php && composer install
+git clone https://github.com/web3p/web3.php.git && cd web3.php && composer install
 ```
 
 2. Run test script.
@@ -228,7 +229,7 @@ vendor/bin/phpunit
 
 1. Clone the repo and run docker container.
 ```
-git clone https://github.com/sc0Vu/web3.php.git
+git clone https://github.com/web3p/web3.php.git
 ```
 
 2. Copy web3.php to web3.php/docker/app directory and start container.
@@ -283,5 +284,12 @@ mv /usr/local/etc/php/conf.d/extension-config-name to/directory
 
 Todo.
 
+# Contribution
+
+Thank you to all the people who already contributed to web3.php!
+<a href="https://github.com/web3p/web3.php/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=web3p/web3.php" />
+</a>
+
 # License
 MIT

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "sc0vu/web3.php",
+    "name": "web3p/web3.php",
     "description": "Ethereum web3 interface.",
     "type": "library",
     "license": "MIT",
@@ -10,14 +10,14 @@
         }
     ],
     "require": {
-        "guzzlehttp/guzzle": "~6.0",
-        "PHP": "^7.1",
+        "guzzlehttp/guzzle": "^6.3|^7.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"
+        "phpunit/phpunit": "~8.0|~9.0"
     },
     "autoload": {
         "psr-4": {

docker/php/Dockerfile-71

@@ -1,4 +1,4 @@
-FROM php:7.1.14-alpine
+FROM php:7.1-alpine
 
 MAINTAINER Peter Lai <alk03073135@gmail.com>
 
@@ -8,6 +8,10 @@ COPY composer-setup.php composer-setup.php
 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
 

docker/php/Dockerfile-72

@@ -1,4 +1,4 @@
-FROM php:7.2.2-alpine
+FROM php:7.2-alpine
 
 MAINTAINER Peter Lai <alk03073135@gmail.com>
 
@@ -8,6 +8,10 @@ COPY composer-setup.php composer-setup.php
 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
 

docker/php/Dockerfile-73

@@ -0,0 +1,23 @@
+FROM php:7.3-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

docker/php/Dockerfile-74

@@ -0,0 +1,23 @@
+FROM php:7.4-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

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

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>

src/Contract.php

@@ -28,8 +28,10 @@ use Web3\Contracts\Types\Str;
 use Web3\Contracts\Types\Uinteger;
 use Web3\Validators\AddressValidator;
 use Web3\Validators\HexValidator;
-use Web3\Formatters\AddressFormatter;
 use Web3\Validators\StringValidator;
+use Web3\Validators\TagValidator;
+use Web3\Validators\QuantityValidator;
+use Web3\Formatters\AddressFormatter;
 
 class Contract
 {
@@ -96,14 +98,22 @@ class Contract
      */
     protected $ethabi;
 
+    /**
+     * defaultBlock
+     *
+     * @var mixed
+     */
+    protected $defaultBlock;
+
     /**
      * construct
      *
      * @param string|\Web3\Providers\Provider $provider
      * @param string|\stdClass|array $abi
+     * @param mixed $defaultBlock
      * @return void
      */
-    public function __construct($provider, $abi)
+    public function __construct($provider, $abi, $defaultBlock = 'latest')
     {
         if (is_string($provider) && (filter_var($provider, FILTER_VALIDATE_URL) !== false)) {
             // check the uri schema
@@ -137,6 +147,11 @@ class Contract
                 }
             }
         }
+        if (TagValidator::validate($defaultBlock) || QuantityValidator::validate($defaultBlock)) {
+            $this->defaultBlock = $defaultBlock;
+        } else {
+            $this->$defaultBlock = 'latest';
+        }
         $this->abi = $abiArray;
         $this->eth = new Eth($this->provider);
         $this->ethabi = new Ethabi([
@@ -224,6 +239,32 @@ class Contract
         return $this;
     }
 
+    /**
+     * getDefaultBlock
+     * 
+     * @return string
+     */
+    public function getDefaultBlock()
+    {
+        return $this->defaultBlock;
+    }
+
+    /**
+     * setDefaultBlock
+     *
+     * @param mixed $defaultBlock
+     * @return $this
+     */
+    public function setDefaultBlock($defaultBlock)
+    {
+        if (TagValidator::validate($defaultBlock) || QuantityValidator::validate($defaultBlock)) {
+            $this->defaultBlock = $defaultBlock;
+        } else {
+            $this->$defaultBlock = 'latest';
+        }
+        return $this;
+    }
+
     /**
      * getFunctions
      *
@@ -563,47 +604,17 @@ class Contract
                 throw new \InvalidArgumentException('The last param must be callback function.');
             }
 
-            // check the last one in arguments is transaction object
+            // check the arguments
             $argsLen = count($arguments);
             $transaction = [];
-            $hasTransaction = false;
-
-            if ($argsLen > 0) {
-                $transaction = $arguments[$argsLen - 1];
-            }
-            if (
-                isset($transaction["from"]) ||
-                isset($transaction["to"]) ||
-                isset($transaction["gas"]) ||
-                isset($transaction["gasPrice"]) ||
-                isset($transaction["value"]) ||
-                isset($transaction["data"]) ||
-                isset($transaction["nonce"])
-            ) {
-                $hasTransaction = true;
-            } else {
-                $transaction = [];
-            }
-
+            $defaultBlock = $this->defaultBlock;
             $params = [];
             $data = "";
             $functionName = "";
             foreach ($functions as $function) {
-                if ($hasTransaction) {
-                    if ($argsLen - 1 !== count($function['inputs'])) {
-                        continue;
-                    } else {
-                        $paramsLen = $argsLen - 1;
-                    }
-                } else {
-                    if ($argsLen !== count($function['inputs'])) {
-                        continue;
-                    } else {
-                        $paramsLen = $argsLen;
-                    }
-                }
                 try {
-                    $params = array_splice($arguments, 0, $paramsLen);
+                    $paramsLen = count($function['inputs']);
+                    $params = array_slice($arguments, 0, $paramsLen);
                     $data = $this->ethabi->encodeParameters($function, $params);
                     $functionName = Utils::jsonMethodToString($function);
                 } catch (InvalidArgumentException $e) {
@@ -614,11 +625,40 @@ class Contract
             if (empty($data) || empty($functionName)) {
                 throw new InvalidArgumentException('Please make sure you have put all function params and callback.');
             }
+            // remove arguments
+            array_splice($arguments, 0, $paramsLen);
+            $argsLen -= $paramsLen;
+
+            if ($argsLen > 1) {
+                $defaultBlock = $arguments[$argsLen - 1];
+                $transaction = $arguments[$argsLen - 2];
+            } else if ($argsLen > 0) {
+                if (is_array($arguments[$argsLen - 1])) {
+                    $transaction = $arguments[$argsLen - 1];
+                } else {
+                    $defaultBlock = $arguments[$argsLen - 1];
+                }
+            }
+            if (!TagValidator::validate($defaultBlock) && !QuantityValidator::validate($defaultBlock)) {
+                $defaultBlock = $this->defaultBlock;
+            }
+            if (
+                !is_array($transaction) &&
+                !isset($transaction["from"]) &&
+                !isset($transaction["to"]) &&
+                !isset($transaction["gas"]) &&
+                !isset($transaction["gasPrice"]) &&
+                !isset($transaction["value"]) &&
+                !isset($transaction["data"]) &&
+                !isset($transaction["nonce"])
+            ) {
+                $transaction = [];
+            }
             $functionSignature = $this->ethabi->encodeFunctionSignature($functionName);
             $transaction['to'] = $this->toAddress;
             $transaction['data'] = $functionSignature . Utils::stripZero($data);
 
-            $this->eth->call($transaction, function ($err, $transaction) use ($callback, $function){
+            $this->eth->call($transaction, $defaultBlock, function ($err, $transaction) use ($callback, $function){
                 if ($err !== null) {
                     return call_user_func($callback, $err, null);
                 }
@@ -738,7 +778,7 @@ class Contract
                 $transaction['data'] = $functionSignature . Utils::stripZero($data);
             }
 
-            $this->eth->estimateGas($transaction, function ($err, $gas) use ($callback){
+            $this->eth->estimateGas($transaction, function ($err, $gas) use ($callback) {
                 if ($err !== null) {
                     return call_user_func($callback, $err, null);
                 }

src/Methods/Eth/NewBlockFilter.php

@@ -23,18 +23,14 @@ class NewBlockFilter extends EthMethod
      * 
      * @var array
      */
-    protected $validators = [
-        QuantityValidator::class
-    ];
+    protected $validators = [];
 
     /**
      * inputFormatters
      * 
      * @var array
      */
-    protected $inputFormatters = [
-        QuantityFormatter::class
-    ];
+    protected $inputFormatters = [];
 
     /**
      * outputFormatters

src/Utils.php

@@ -212,6 +212,31 @@ class Utils
         return true;
     }
 
+    /**
+     * toChecksumAddress
+     *
+     * @param string $value
+     * @return string
+     */
+    public static function toChecksumAddress($value)
+    {
+        if (!is_string($value)) {
+            throw new InvalidArgumentException('The value to toChecksumAddress function must be string.');
+        }
+        $value = self::stripZero(strtolower($value));
+        $hash = self::stripZero(self::sha3($value));
+        $ret = '0x';
+
+        for ($i = 0; $i < 40; $i++) {
+            if (intval($hash[$i], 16) >= 8) {
+                $ret .= strtoupper($value[$i]);
+            } else {
+                $ret .= $value[$i];
+            }
+        }
+        return $ret;
+    }
+
     /**
      * isHex
      * 
@@ -504,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)) {

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() {}
+    public function tearDown(): void {}
 }

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

test/unit/ContractTest.php

@@ -412,7 +412,7 @@ class ContractTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -1134,7 +1134,7 @@ class ContractTest extends TestCase
         $contract->at($contractAddress);
 
         foreach ($functions as $function) {
-            $contract->call($function['name'], function ($err, $res) use ($function) {
+            $contract->call($function['name'], [], 'latest', function ($err, $res) use ($function) {
                 if ($err !== null) {
                     echo 'Error when call ' . $function['name'] . '. Message: ' . $err->getMessage() . "\n";
                     return;
@@ -1468,13 +1468,22 @@ class ContractTest extends TestCase
                     // $this->assertEquals($contract->ethabi->encodeEventSignature($contract->events['Say']), $topics[0]);
                     $this->assertEquals('0x' . IntegerFormatter::format($testNumber), $topics[1]);
                 }
-                $contract->call('number', function ($err, $res) use ($testNumber) {
+                $blockNumber = Utils::toBn($transaction->blockNumber);
+                $contract->call('number', Utils::toHex($blockNumber, true), function ($err, $res) use ($testNumber) {
                     if ($err !== null) {
                         echo 'Error when call ' . $function['name'] . '. Message: ' . $err->getMessage() . "\n";
                         return;
                     }
                     $this->assertEquals((string) $testNumber, $res[0]->toString());
                 });
+                $blockNumber = $blockNumber->subtract(Utils::toBn(1));
+                $contract->call('number', Utils::toHex($blockNumber, true), function ($err, $res) use ($testNumber) {
+                    if ($err !== null) {
+                        echo 'Error when call ' . $function['name'] . '. Message: ' . $err->getMessage() . "\n";
+                        return;
+                    }
+                    $this->assertEquals((string) $testNumber-1, $res[0]->toString());
+                });
             });
         });
 

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;

test/unit/EthApiTest.php

@@ -21,7 +21,7 @@ class EthApiTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -439,7 +439,7 @@ class EthApiTest extends TestCase
             if ($err !== null) {
                 return $this->assertTrue($err !== null);
             }
-            // weired behavior, see https://github.com/sc0Vu/web3.php/issues/16
+            // weird behavior, see https://github.com/web3p/web3.php/issues/16
             $this->assertTrue($block !== null);
         });
     }
@@ -629,7 +629,7 @@ class EthApiTest extends TestCase
     {
         $eth = $this->eth;
 
-        $eth->newBlockFilter('0x01', function ($err, $filter) {
+        $eth->newBlockFilter(function ($err, $filter) {
             if ($err !== null) {
                 // infura banned us to new block filter
                 return $this->assertTrue($err !== null);

test/unit/EthBatchTest.php

@@ -20,7 +20,7 @@ class EthBatchTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

test/unit/EthTest.php

@@ -23,7 +23,7 @@ class EthTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

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
@@ -298,7 +298,7 @@ class EthabiTest extends TestCase
 
     /**
      * testIssue71
-     * test 33 bytes and 128 bytes string, see: https://github.com/sc0Vu/web3.php/issues/71
+     * test 33 bytes and 128 bytes string, see: https://github.com/web3p/web3.php/issues/71
      * string generated from: https://www.lipsum.com/
      * 
      * @return void

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;

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;

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;

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;

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;

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;

test/unit/NetApiTest.php

@@ -21,7 +21,7 @@ class NetApiTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

test/unit/NetBatchTest.php

@@ -20,7 +20,7 @@ class NetBatchTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

test/unit/NetTest.php

@@ -23,7 +23,7 @@ class NetTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

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;

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;

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 @@ 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');
     }
 }

test/unit/PersonalApiTest.php

@@ -27,7 +27,7 @@ class PersonalApiTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

test/unit/PersonalBatchTest.php

@@ -19,7 +19,7 @@ class PersonalBatchTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

test/unit/PersonalTest.php

@@ -23,7 +23,7 @@ class PersonalTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

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;

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;

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;

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;

test/unit/ShhApiTest.php

@@ -21,7 +21,7 @@ class ShhApiTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

test/unit/ShhBatchTest.php

@@ -19,7 +19,7 @@ class ShhBatchTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

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;

test/unit/ShhTest.php

@@ -23,7 +23,7 @@ class ShhTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

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();

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;

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;

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;

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;

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;

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;

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;

test/unit/UtilsTest.php

@@ -55,7 +55,7 @@ class UtilsTest extends TestCase
 
     /**
      * testIssue112Json
-     * see: https://github.com/sc0Vu/web3.php/issues/112
+     * see: https://github.com/web3p/web3.php/issues/112
      * 
      * @var string
      */
@@ -137,7 +137,7 @@ class UtilsTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
     }
@@ -291,6 +291,33 @@ class UtilsTest extends TestCase
         $isAddressChecksum = Utils::isAddressChecksum(new stdClass);
     }
 
+    /**
+     * testToChecksumAddress
+     *
+     * @return void
+     */
+    public function testToChecksumAddress()
+    {
+        $checksumAddressTest = [
+            // All caps
+            '0x52908400098527886E0F7030069857D2E4169EE7',
+            '0x8617E340B3D01FA5F11F306F4090FD50E238070D',
+            // All Lower
+            '0xde709f2102306220921060314715629080e2fb77',
+            '0x27b1fdb04752bbc536007a920d24acb045561c26',
+            // Normal
+            '0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed',
+            '0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359',
+            '0xdbF03B407c01E7cD3CBea99509d93f8DDDC8C6FB',
+            '0xD1220A0cf47c7B9Be7A2E6BA89F429762e7b9aDb'
+        ];
+
+        for ($i=0; $i<count($checksumAddressTest); $i++) {
+            $checksumAddress = Utils::toChecksumAddress(strtolower($checksumAddressTest[$i]));
+            $this->assertEquals($checksumAddressTest[$i], $checksumAddress);
+        }
+    }
+
     /**
      * testStripZero
      *

test/unit/Web3ApiTest.php

@@ -29,7 +29,7 @@ class Web3ApiTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
     }

test/unit/Web3BatchTest.php

@@ -28,7 +28,7 @@ class Web3BatchTest extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
     }

test/unit/Web3Test.php

@@ -37,7 +37,7 @@ class Web3Test extends TestCase
      * 
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
     }