stream mode constant cleanup

Author: codemasher

src/Psr17/StreamFactory.php

@@ -14,7 +14,7 @@
 use Psr\Http\Message\{StreamFactoryInterface, StreamInterface};
 use InvalidArgumentException, RuntimeException;
 
-use function fopen, is_file;
+use function fopen, in_array, is_file;
 
 final class StreamFactory implements StreamFactoryInterface{
 
@@ -40,7 +40,7 @@ public function createStreamFromFile(string $filename, string $mode = 'r'):Strea
 			throw new RuntimeException('invalid file');
 		}
 
-		if(!isset(STREAM_MODES_WRITE[$mode]) && !isset(STREAM_MODES_READ[$mode])){
+		if(!in_array($mode, STREAM_MODES_WRITE) && !in_array($mode, STREAM_MODES_READ)){
 			throw new InvalidArgumentException('invalid mode');
 		}
 

src/Psr17/factory_helpers.php

@@ -12,38 +12,13 @@
 use chillerlan\HTTP\Psr7\Stream;
 use InvalidArgumentException;
 
-use function is_scalar, method_exists;
+use function in_array, is_scalar, method_exists;
 
 const CHILLERLAN_PSR17_INCLUDES = true;
 
-const STREAM_MODES_READ_WRITE = [
-	'a+'  => true,
-	'c+'  => true,
-	'c+b' => true,
-	'c+t' => true,
-	'r+'  => true,
-	'r+b' => true,
-	'r+t' => true,
-	'w+'  => true,
-	'w+b' => true,
-	'w+t' => true,
-	'x+'  => true,
-	'x+b' => true,
-	'x+t' => true,
-];
-
-const STREAM_MODES_READ = STREAM_MODES_READ_WRITE + [
-	'r'   => true,
-	'rb'  => true,
-	'rt'  => true,
-];
-
-const STREAM_MODES_WRITE = STREAM_MODES_READ_WRITE + [
-	'a'   => true,
-	'rw'  => true,
-	'w'   => true,
-	'wb'  => true,
-];
+const STREAM_MODES_READ_WRITE = ['a+', 'c+', 'c+b', 'c+t', 'r+' , 'r+b', 'r+t', 'w+' , 'w+b', 'w+t', 'x+' , 'x+b', 'x+t'];
+const STREAM_MODES_READ = [...STREAM_MODES_READ_WRITE, 'r', 'rb', 'rt'];
+const STREAM_MODES_WRITE = [...STREAM_MODES_READ_WRITE, 'a', 'rw', 'w', 'wb'];
 
 /**
  * Create a new writable stream from a string.
@@ -58,7 +33,7 @@
  */
 function create_stream(string $content = '', string $mode = 'r+', bool $rewind = true):StreamInterface{
 
-	if(!isset(STREAM_MODES_WRITE[$mode])){
+	if(!in_array($mode, STREAM_MODES_WRITE)){
 		throw new InvalidArgumentException('invalid mode');
 	}
 

src/Psr7/Stream.php

@@ -12,7 +12,8 @@
 
 use Exception, InvalidArgumentException, RuntimeException;
 
-use function clearstatcache, fclose, feof, fread, fstat, ftell, fwrite, is_resource, stream_get_contents, stream_get_meta_data;
+use function clearstatcache, fclose, feof, fread, fstat, ftell, fwrite, in_array,
+	is_resource, stream_get_contents, stream_get_meta_data;
 
 use const SEEK_SET;
 use const chillerlan\HTTP\Psr17\{STREAM_MODES_READ, STREAM_MODES_WRITE};
@@ -48,8 +49,8 @@ public function __construct($stream){
 		$meta = stream_get_meta_data($this->stream);
 
 		$this->seekable = $meta['seekable'];
-		$this->readable = isset(STREAM_MODES_READ[$meta['mode']]);
-		$this->writable = isset(STREAM_MODES_WRITE[$meta['mode']]);
+		$this->readable = in_array($meta['mode'], STREAM_MODES_READ);
+		$this->writable = in_array($meta['mode'], STREAM_MODES_WRITE);
 		$this->uri      = $meta['uri'] ?? null;
 	}