Merge pull request #264 from srdante/patch-1

Fix Test Caching

.github/workflows/php.yml

@@ -1,6 +1,6 @@
 name: PHP
 
-on: ["push", "pull_request"]
+on: ["push", "pull_request", "workflow_dispatch"]
 
 jobs:
   build_and_test:
@@ -37,9 +37,9 @@ jobs:
       uses: actions/cache@v2
       with:
         path: vendor
-        key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+        key: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
         restore-keys: |
-          ${{ runner.os }}-php-
+          ${{ runner.os }}-php-${{ matrix.php-version }}-
 
     - name: Install dependencies
       if: steps.composer-cache.outputs.cache-hit != 'true'

.gitignore

@@ -7,5 +7,3 @@ composer.phar
 # Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
 composer.lock
-
-docker/app

README.md

@@ -18,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"
 ```
 
 
@@ -217,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.
@@ -229,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.

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.3 | ^7.0",
-        "PHP": "^7.1 | ^8.0",
+        "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 | ~8.0"
+        "phpunit/phpunit": "~8.0|~9.0"
     },
     "autoload": {
         "psr-4": {

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/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)) {

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

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

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

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