Minor improvements and corrections

Author: Florian Krämer

src/File.php

@@ -58,7 +58,7 @@ class File implements FileInterface
  protected ?string $extension = null;
 
  /**
- * @var string
+ * @var string|null
  */
  protected ?string $path = null;
 
@@ -245,7 +245,7 @@ public function withResource($resource): FileInterface
  public function belongsToModel(string $model, $modelId): FileInterface
  {
  $this->model = $model;
- $this->modelId = $modelId;
+ $this->modelId = (string)$modelId;
 
  return $this;
  }

src/Utility/StreamWrapper.php

@@ -17,7 +17,8 @@
 
 use InvalidArgumentException;
 use Psr\Http\Message\StreamInterface;
-use RuntimeException;
+
+use function \Phauthentic\Infrastructure\Storage\fopen;
 
 /**
  * Converts Guzzle streams into PHP stream resources.
@@ -55,14 +56,7 @@ public static function getResource(StreamInterface $stream)
  );
  }
 
- $result = \fopen('guzzle://stream', $mode, false, self::createStreamContext($stream));
-
- if ($result === false) {
- throw new RuntimeException(\sprintf(
- 'Failed to open guzzle://stream with mode %s',
- $mode
- ));
- }
+ $result = fopen('guzzle://stream', $mode, false, self::createStreamContext($stream));
 
  return $result;
  }

src/functions.php

@@ -21,6 +21,12 @@
 /**
  * The original php function has mixed return values, either a resource or
  * boolean false. But we want an exception.
+ *
+ * @param string $filename
+ * @param string $mode
+ * @param bool $useIncludePath
+ * @param mixed $context
+ * @return resource
  */
 function fopen(string $filename, string $mode, bool $useIncludePath = true, $context = null)
 {
@@ -32,7 +38,7 @@ function fopen(string $filename, string $mode, bool $useIncludePath = true, $con
 
  if ($result === false) {
  throw new RuntimeException(sprintf(
- 'Failed to open file `%s` with fopen()',
+ 'Failed to open resource `%s`',
  $filename
  ));
  }