Support binary content which have in memory path (sonata-project#1001)

simonchrz · May 25, 2016 · 4b87b5e · 4b87b5e
1 parent 1ef5010
commit 4b87b5e
Show file tree

Hide file tree

Showing 2 changed files with 85 additions and 2 deletions.
diff --git a/Provider/FileProvider.php b/Provider/FileProvider.php
@@ -318,8 +318,10 @@ protected function setFileContents(MediaInterface $media, $contents = null)
  return;
  }
 
- if ($media->getBinaryContent() instanceof File) {
- $file->setContent(file_get_contents($media->getBinaryContent()->getRealPath()), $metadata);
+ $binaryContent = $media->getBinaryContent();
+ if ($binaryContent instanceof File) {
+ $path = $binaryContent->getRealPath() ?: $binaryContent->getPathname();
+ $file->setContent(file_get_contents($path), $metadata);
 
  return;
  }

diff --git a/Tests/Provider/FileProviderTest.php b/Tests/Provider/FileProviderTest.php
@@ -224,4 +224,85 @@ public function mediaProvider()
  array(null, $media3),
  );
  }
+
+ public function testBinaryContentWithRealPath()
+ {
+ $media = $this->getMock('Sonata\MediaBundle\Model\MediaInterface');
+
+ $media->expects($this->any())
+ ->method('getProviderReference')
+ ->willReturn('provider');
+
+ $media->expects($this->any())
+ ->method('getId')
+ ->willReturn(10000);
+
+ $media->expects($this->any())
+ ->method('getContext')
+ ->willReturn('context');
+
+ $binaryContent = $this->getMockBuilder('Symfony\Component\HttpFoundation\File\File')
+ ->setMethods(array('getRealPath', 'getPathname'))
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $binaryContent->expects($this->atLeastOnce())
+ ->method('getRealPath')
+ ->willReturn(__DIR__.'/../fixtures/file.txt');
+
+ $binaryContent->expects($this->never())
+ ->method('getPathname');
+
+ $media->expects($this->any())
+ ->method('getBinaryContent')
+ ->willReturn($binaryContent);
+
+ $provider = $this->getProvider();
+
+ $setFileContents = new \ReflectionMethod('Sonata\MediaBundle\Provider\FileProvider', 'setFileContents');
+ $setFileContents->setAccessible(true);
+
+ $setFileContents->invoke($provider, $media);
+ }
+
+ public function testBinaryContentStreamWrapped()
+ {
+ $media = $this->getMock('Sonata\MediaBundle\Model\MediaInterface');
+
+ $media->expects($this->any())
+ ->method('getProviderReference')
+ ->willReturn('provider');
+
+ $media->expects($this->any())
+ ->method('getId')
+ ->willReturn(10000);
+
+ $media->expects($this->any())
+ ->method('getContext')
+ ->willReturn('context');
+
+ $binaryContent = $this->getMockBuilder('Symfony\Component\HttpFoundation\File\File')
+ ->setMethods(array('getRealPath', 'getPathname'))
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $binaryContent->expects($this->atLeastOnce())
+ ->method('getRealPath')
+ ->willReturn(false);
+
+ $binaryContent->expects($this->atLeastOnce())
+ ->method('getPathname')
+ ->willReturn(__DIR__.'/../fixtures/file.txt');
+
+ $media->expects($this->any())
+ ->method('getBinaryContent')
+ ->willReturn($binaryContent);
+
+ $provider = $this->getProvider();
+
+ $setFileContents = new \ReflectionMethod('Sonata\MediaBundle\Provider\FileProvider', 'setFileContents');
+ $setFileContents->setAccessible(true);
+
+ $setFileContents->invoke($provider, $media);
+ }
 }