🚿

Author: codemasher

src/CurlUtils/CurlHandle.php

@@ -293,7 +293,7 @@ public function init():CurlHandle{
 		}
 
 		// overwrite the default values with $curl_options
-		foreach($this->options->curl_options as $k => $v){
+		foreach($this->options->curl_options ?? [] as $k => $v){
 			// skip some options that are only set automatically
 			if(in_array($k, [CURLOPT_HTTPHEADER, CURLOPT_CUSTOMREQUEST, CURLOPT_NOBODY], true)){
 				continue;
@@ -317,6 +317,7 @@ public function init():CurlHandle{
 	 * @param int      $length
 	 *
 	 * @return string
+	 * @noinspection PhpUnusedParameterInspection
 	 */
 	public function readfunction($curl, $stream, int $length):string{
 		return $this->request->getBody()->read($length);
@@ -329,6 +330,7 @@ public function readfunction($curl, $stream, int $length):string{
 	 * @param string   $data
 	 *
 	 * @return int
+	 * @noinspection PhpUnusedParameterInspection
 	 */
 	public function writefunction($curl, string $data):int{
 		return $this->response->getBody()->write($data);
@@ -341,6 +343,7 @@ public function writefunction($curl, string $data):int{
 	 * @param string   $line
 	 *
 	 * @return int
+	 * @noinspection PhpUnusedParameterInspection
 	 */
 	public function headerfunction($curl, string $line):int{
 		$str    = trim($line);

src/Psr17/RequestFactory.php

@@ -14,7 +14,7 @@
 use Fig\Http\Message\RequestMethodInterface;
 use Psr\Http\Message\{RequestFactoryInterface, RequestInterface};
 
-class RequestFactory implements RequestFactoryInterface, RequestMethodInterface{
+final class RequestFactory implements RequestFactoryInterface, RequestMethodInterface{
 
 	/**
 	 * @inheritDoc

src/Psr17/StreamFactory.php

@@ -14,7 +14,7 @@
 use Psr\Http\Message\{StreamFactoryInterface, StreamInterface};
 use InvalidArgumentException, RuntimeException;
 
-use function fopen, in_array, is_file;
+use function fopen, in_array, is_file, is_readable;
 
 final class StreamFactory implements StreamFactoryInterface{
 
@@ -36,7 +36,7 @@ public function createStream(string $content = ''):StreamInterface{
 	 */
 	public function createStreamFromFile(string $filename, string $mode = 'r'):StreamInterface{
 
-		if(empty($filename) || !is_file($filename)){
+		if(empty($filename) || !is_file($filename) || !is_readable($filename)){
 			throw new RuntimeException('invalid file');
 		}
 

src/Psr7/Stream.php

@@ -63,20 +63,17 @@ public function __toString(){
 			return '';
 		}
 
-		try{
+		if($this->isSeekable()){
+			$this->seek(0);
+		}
 
-			if($this->isSeekable()){
-				$this->seek(0);
-			}
+		$contents = stream_get_contents($this->stream);
 
-			return (string)stream_get_contents($this->stream);
-		}
-		// @codeCoverageIgnoreStart
-		catch(Exception $e){
-			throw new RuntimeException('Stream::__toString exception: '.$e->getMessage());
+		if($contents !== false){
+			return $contents;
 		}
-		// @codeCoverageIgnoreEnd
 
+		throw new RuntimeException('stream_get_contents() error'); // @codeCoverageIgnore
 	}
 
 	/**