Load a WMF file from a string (#5)

Author: Progi1984

docs/changes/0.1.1.md

@@ -0,0 +1,14 @@
+# 0.1.1
+
+## Enhancements
+
+- Load a WMF file from a string in [#5](https://github.com/PHPOffice/WMF/pull/5) by [@Progi1984](https://github/Progi1984)
+
+## Bug fixes
+
+- N/A
+
+## Miscellaneous
+
+- N/A
+ 

mkdocs.yml

@@ -43,7 +43,8 @@ nav:
  - WMF: 'usage/wmf.md'
  - Credits: 'credits.md'
  - Releases:
- - '0.1.0 (WIP)': 'changes/0.1.0.md'
+ - '0.1.1 (WIP)': 'changes/0.1.1.md'
+ - '0.1.0': 'changes/0.1.0.md'
  - Developers:
  - 'Coveralls': 'https://coveralls.io/github/PHPOffice/WMF'
  - 'Code Coverage': 'coverage/index.html'

src/WMF/Reader/ReaderInterface.php

@@ -9,6 +9,8 @@ interface ReaderInterface
 {
  public function load(string $filename): bool;
 
+ public function loadFromString(string $content): bool;
+
  public function save(string $filename, string $format): bool;
 
  public function getMediaType(): string;

src/WMF/Reader/WMF/GD.php

@@ -72,13 +72,25 @@ public function isWMF(string $filename): bool
  return $key == (int) 0x9AC6CDD7;
  }
 
- /**
- * @see https://github.com/affinitybridge/mpdf/blob/master/src/Image/Wmf.php
- */
  public function load(string $filename): bool
  {
  $this->content = file_get_contents($filename);
 
+ return $this->loadContent();
+ }
+
+ public function loadFromString(string $content): bool
+ {
+ $this->content = $content;
+
+ return $this->loadContent();
+ }
+
+ /**
+ * @see https://github.com/affinitybridge/mpdf/blob/master/src/Image/Wmf.php
+ */
+ private function loadContent(): bool
+ {
  $this->pos = 0;
  $this->gdiObjects = [];
  $k = 72 / 25.4;

src/WMF/Reader/WMF/Imagick.php

@@ -16,11 +16,21 @@ class Imagick extends ReaderAbstract
  protected $im;
 
  public function load(string $filename): bool
+ {
+ return $this->loadContent($filename, false);
+ }
+
+ public function loadFromString(string $content): bool
+ {
+ return $this->loadContent($content, true);
+ }
+
+ private function loadContent(string $content, bool $isBlob): bool
  {
  try {
  $this->im = new ImagickBase();
 
- return $this->im->readImage($filename);
+ return $isBlob ? $this->im->readImageBlob($content) : $this->im->readImage($content);
  } catch (ImagickException $e) {
  $this->im->clear();
 

src/WMF/Reader/WMF/Magic.php

@@ -32,6 +32,11 @@ public function load(string $filename): bool
  return $this->reader->load($filename);
  }
 
+ public function loadFromString(string $content): bool
+ {
+ return $this->reader->loadFromString($content);
+ }
+
  public function save(string $filename, string $format): bool
  {
  return $this->reader->save($filename, $format);

tests/WMF/Reader/WMF/GDTest.php

@@ -20,6 +20,15 @@ public function testLoad(string $file): void
  $this->assertTrue($reader->load($this->getResourceDir() . $file));
  }
 
+ /**
+ * @dataProvider dataProviderFilesWMF
+ */
+ public function testLoadFromString(string $file): void
+ {
+ $reader = new GD();
+ $this->assertTrue($reader->loadFromString(file_get_contents($this->getResourceDir() . $file)));
+ }
+
  /**
  * @dataProvider dataProviderFilesWMF
  */

tests/WMF/Reader/WMF/ImagickTest.php

@@ -20,6 +20,15 @@ public function testLoad(string $file): void
  $this->assertTrue($reader->load($this->getResourceDir() . $file));
  }
 
+ /**
+ * @dataProvider dataProviderFilesWMF
+ */
+ public function testLoadFromString(string $file): void
+ {
+ $reader = new ImagickReader();
+ $this->assertTrue($reader->loadFromString(file_get_contents($this->getResourceDir() . $file)));
+ }
+
  /**
  * @dataProvider dataProviderFilesWMF
  */

tests/WMF/Reader/WMF/MagicTest.php

@@ -18,6 +18,15 @@ public function testLoad(string $file): void
  $this->assertTrue($reader->load($this->getResourceDir() . $file));
  }
 
+ /**
+ * @dataProvider dataProviderFilesWMF
+ */
+ public function testLoadFromString(string $file): void
+ {
+ $reader = new Magic();
+ $this->assertTrue($reader->loadFromString(file_get_contents($this->getResourceDir() . $file)));
+ }
+
  /**
  * @dataProvider dataProviderFilesWMF
  */