Fixed issue with false positive detection of valid json string (#209)

* Fixed false positive detection of valid json strings * CS Fixes * Added phive install step to github workflows
coduo · Sep 27, 2020 · d7d13a5 · d7d13a5
1 parent 48f1767
commit d7d13a5
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml
@@ -31,9 +31,13 @@ jobs:
         uses: "shivammathur/setup-php@v2"
         with:
           coverage: "pcov"
+          tools: phive, composer:v2
           php-version: "${{ matrix.php-version }}"
           ini-values: memory_limit=-1
 
+      - name: "Install tools"
+        run: "phive install --trust-gpg-keys E82B2FB314E9906E,CF1A108D0E7AE720,8A03EA3B385DBAA1,C5095986493B4AA0 --force-accept-unsigned"
+
       - name: "Cache dependencies"
         uses: "actions/cache@v2"
         with:

diff --git a/.github/workflows/static-analyze.yml b/.github/workflows/static-analyze.yml
@@ -33,7 +33,10 @@ jobs:
           coverage: "pcov"
           php-version: "${{ matrix.php-version }}"
           ini-values: memory_limit=-1
-          tools: composer:v2
+          tools: phive, composer:v2
+
+      - name: "Install tools"
+        run: "phive install --trust-gpg-keys E82B2FB314E9906E,CF1A108D0E7AE720,8A03EA3B385DBAA1,C5095986493B4AA0 --force-accept-unsigned"
 
       - name: "Install lowest dependencies"
         if: ${{ matrix.dependencies == 'lowest' }}

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -37,7 +37,10 @@ jobs:
           coverage: "pcov"
           php-version: "${{ matrix.php-version }}"
           ini-values: memory_limit=-1
-          tools: composer:v2
+          tools: phive, composer:v2
+
+      - name: "Install tools"
+        run: "phive install --trust-gpg-keys E82B2FB314E9906E,CF1A108D0E7AE720,8A03EA3B385DBAA1,C5095986493B4AA0 --force-accept-unsigned"
 
       - name: "Install lowest dependencies"
         if: ${{ matrix.dependencies == 'lowest' }}

diff --git a/src/Matcher/Pattern/Assert/Json.php b/src/Matcher/Pattern/Assert/Json.php
@@ -18,7 +18,13 @@ public static function isValid($value) : bool
             return false;
         }
 
-        if (null === \json_decode($value) && JSON_ERROR_NONE !== \json_last_error()) {
+        $result = \json_decode($value);
+
+        if (\is_float($result) && \is_infinite($result)) {
+            return false;
+        }
+
+        if (null === $result && JSON_ERROR_NONE !== \json_last_error()) {
             return false;
         }
 

diff --git a/tests/Matcher/JsonMatcherTest.php b/tests/Matcher/JsonMatcherTest.php
@@ -111,6 +111,10 @@ public static function positiveMatches()
                 '[{"name": "Norbert"},{"name":"Michał"},{"name":"Bob"},{"name":"Martin"}]',
                 '"@[email protected]({\"name\": \"@string@\"})"',
             ],
+            [
+                '{"something": "5e61188283825"}',
+                '{"something": "@string@"}',
+            ],
         ];
     }