Merge pull request #150 from clue-labs/php7.4

jsor · web-flow · commit d753b1032086 · 2020-01-13T09:24:07.000+01:00
Avoid unneeded warning when decoding invalid data on PHP 7.4
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,8 @@ php:
   - 7.0
   - 7.1
   - 7.2
+  - 7.3
+  - 7.4
   - nightly # ignore errors, see below
   - hhvm # ignore errors, see below
 
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     },
     "require-dev": {
         "clue/block-react": "^1.2",
-        "phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35",
+        "phpunit/phpunit": "^7.0 || ^6.4 || ^5.7 || ^4.8.35",
         "react/promise-stream": "^1.1"
     },
     "autoload": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="tests/bootstrap.php"
 >
     <testsuites>
diff --git a/src/ChunkedStreamDecoder.php b/src/ChunkedStreamDecoder.php
@@ -111,7 +111,7 @@ protected function iterateBuffer()
                 }
             }
             $this->nextChunkIsLength = false;
-            if (dechex(hexdec($lengthChunk)) !== strtolower($lengthChunk)) {
+            if (dechex(@hexdec($lengthChunk)) !== strtolower($lengthChunk)) {
                 $this->emit('error', array(
                     new Exception('Unable to validate "' . $lengthChunk . '" as chunk length header'),
                 ));

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`convertWarningsToExceptions="true"`
`9`	`9`	`processIsolation="false"`
`10`	`10`	`stopOnFailure="false"`
`11`		`- syntaxCheck="false"`
`12`	`11`	`bootstrap="tests/bootstrap.php"`
`13`	`12`	`>`
`14`	`13`	`<testsuites>`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ protected function iterateBuffer()`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`	`$this->nextChunkIsLength = false;`
`114`		`- if (dechex(hexdec($lengthChunk)) !== strtolower($lengthChunk)) {`
	`114`	`+ if (dechex(@hexdec($lengthChunk)) !== strtolower($lengthChunk)) {`
`115`	`115`	`$this->emit('error', array(`
`116`	`116`	`new Exception('Unable to validate "' . $lengthChunk . '" as chunk length header'),`
`117`	`117`	`));`