Merge branch '2.x' into 3.x

# Conflicts: # composer.json
arokettu · Sep 25, 2021 · 50188f0 · 50188f0
2 parents 435eb35 + c76b7b2
commit 50188f0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,12 @@
 
 ## 2.x
 
+### 2.7.1
+
+*Sep 25, 2021*
+
+* Future compatible stream check
+
 ### 2.7.0
 
 *Sep 17, 2021*
@@ -98,6 +104,12 @@
 
 ## 1.x
 
+### 1.7.1
+
+*Sep 25, 2021*
+
+* Future compatible stream check
+
 ### 1.7.0
 
 *Sep 17, 2021*

diff --git a/composer.json b/composer.json
@@ -32,7 +32,8 @@
         }
     },
     "require": {
-        "php": "^8.1"
+        "php": "^8.1",
+        "arokettu/is-resource": "^1.0"
     },
     "require-dev": {
         "ext-gmp": "*",

diff --git a/src/Engine/Decoder.php b/src/Engine/Decoder.php
@@ -8,6 +8,8 @@
 use SandFox\Bencode\Exceptions\ParseErrorException;
 use SandFox\Bencode\Util\IntUtil;
 
+use function Arokettu\IsResource\try_get_resource_type;
+
 /**
  * @internal
  */
@@ -36,7 +38,7 @@ public function __construct(
         private \Closure $dictHandler,
         private \Closure $bigIntHandler,
     ) {
-        if (!\is_resource($this->stream) || get_resource_type($this->stream) !== 'stream') {
+        if (try_get_resource_type($stream) !== 'stream') {
             throw new InvalidArgumentException('Input is not a valid stream');
         }
     }

diff --git a/src/Engine/Encoder.php b/src/Engine/Encoder.php
@@ -11,6 +11,8 @@
 use SandFox\Bencode\Types\DictType;
 use SandFox\Bencode\Types\ListType;
 
+use function Arokettu\IsResource\try_get_resource_type;
+
 /**
  * @internal
  */
@@ -28,7 +30,7 @@ public function __construct(
         private bool $useJsonSerializable,
         private bool $useStringable,
     ) {
-        if (!\is_resource($this->stream) || get_resource_type($this->stream) !== 'stream') {
+        if (try_get_resource_type($this->stream) !== 'stream') {
             throw new InvalidArgumentException('Output is not a valid stream');
         }
     }