Exif reader: avoid converting stream to string to stream (#862)

php-imagine · Jul 30, 2024 · ce4748a · ce4748a
1 parent 3acdfa6
commit ce4748a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Image/Metadata/AbstractMetadataReader.php b/src/Image/Metadata/AbstractMetadataReader.php
@@ -100,7 +100,7 @@ abstract protected function extractFromFile($file);
     /**
      * Extracts metadata from raw data.
      *
-     * @param $data
+     * @param string $data
      *
      * @return array An associative array of metadata
      */
@@ -109,7 +109,7 @@ abstract protected function extractFromData($data);
     /**
      * Extracts metadata from a stream.
      *
-     * @param $resource
+     * @param resource $resource
      *
      * @return array An associative array of metadata
      */

diff --git a/src/Image/Metadata/ExifMetadataReader.php b/src/Image/Metadata/ExifMetadataReader.php
@@ -98,7 +98,7 @@ protected function extractFromData($data)
      */
     protected function extractFromStream($resource)
     {
-        return $this->doReadData(stream_get_contents($resource));
+        return PHP_VERSION_ID < 70200 ? $this->doReadData(stream_get_contents($resource)) : $this->extract($resource);
     }
 
     /**

diff --git a/src/Image/Metadata/MetadataReaderInterface.php b/src/Image/Metadata/MetadataReaderInterface.php
@@ -31,7 +31,7 @@ public function readFile($file);
      * Reads metadata from a binary string.
      *
      * @param string $data the binary string to read
-     * @param resource $originalResource an optional resource to gather stream metadata
+     * @param resource|null $originalResource an optional resource to gather stream metadata
      *
      * @return \Imagine\Image\Metadata\MetadataBag
      */