nextcloud / server

tests/lib/Preview/MovieTest.php

Indentation +17 added lines, -17 removed lines

@@ -18,23 +18,23 @@
  * @package Test\Preview
  */
 class MovieTest extends Provider {
-	protected function setUp(): void {
-		$binaryFinder = Server::get(IBinaryFinder::class);
-		$movieBinary = $binaryFinder->findBinaryPath('avconv');
-		if (!is_string($movieBinary)) {
-			$movieBinary = $binaryFinder->findBinaryPath('ffmpeg');
-		}
+    protected function setUp(): void {
+        $binaryFinder = Server::get(IBinaryFinder::class);
+        $movieBinary = $binaryFinder->findBinaryPath('avconv');
+        if (!is_string($movieBinary)) {
+            $movieBinary = $binaryFinder->findBinaryPath('ffmpeg');
+        }
 
-		if (is_string($movieBinary)) {
-			parent::setUp();
+        if (is_string($movieBinary)) {
+            parent::setUp();
 
-			$fileName = 'testimage.mp4';
-			$this->imgPath = $this->prepareTestFile($fileName, \OC::$SERVERROOT . '/tests/data/' . $fileName);
-			$this->width = 560;
-			$this->height = 320;
-			$this->provider = new \OC\Preview\Movie(['movieBinary' => $movieBinary]);
-		} else {
-			$this->markTestSkipped('No Movie provider present');
-		}
-	}
+            $fileName = 'testimage.mp4';
+            $this->imgPath = $this->prepareTestFile($fileName, \OC::$SERVERROOT . '/tests/data/' . $fileName);
+            $this->width = 560;
+            $this->height = 320;
+            $this->provider = new \OC\Preview\Movie(['movieBinary' => $movieBinary]);
+        } else {
+            $this->markTestSkipped('No Movie provider present');
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 			parent::setUp();
 
 			$fileName = 'testimage.mp4';
-			$this->imgPath = $this->prepareTestFile($fileName, \OC::$SERVERROOT . '/tests/data/' . $fileName);
+			$this->imgPath = $this->prepareTestFile($fileName, \OC::$SERVERROOT.'/tests/data/'.$fileName);
 			$this->width = 560;
 			$this->height = 320;
 			$this->provider = new \OC\Preview\Movie(['movieBinary' => $movieBinary]);

lib/private/Preview/ProviderV2.php

Indentation +87 added lines, -87 removed lines

@@ -18,91 +18,91 @@
 use Psr\Log\LoggerInterface;
 
 abstract class ProviderV2 implements IProviderV2 {
-	protected array $tmpFiles = [];
-
-	public function __construct(
-		protected array $options = [],
-	) {
-	}
-
-	/**
-	 * @return string Regex with the mimetypes that are supported by this provider
-	 */
-	abstract public function getMimeType(): string ;
-
-	/**
-	 * Check if a preview can be generated for $path
-	 *
-	 * @param FileInfo $file
-	 * @return bool
-	 */
-	public function isAvailable(FileInfo $file): bool {
-		return true;
-	}
-
-	/**
-	 * get thumbnail for file at path $path
-	 *
-	 * @param File $file
-	 * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image
-	 * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
-	 * @return null|\OCP\IImage null if no preview was generated
-	 * @since 17.0.0
-	 */
-	abstract public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage;
-
-	protected function useTempFile(File $file): bool {
-		return $file->isEncrypted() || !$file->getStorage()->isLocal();
-	}
-
-	/**
-	 * Get a path to either the local file or temporary file
-	 *
-	 * @param File $file
-	 * @param ?int $maxSize maximum size for temporary files
-	 */
-	protected function getLocalFile(File $file, ?int $maxSize = null): string|false {
-		if ($this->useTempFile($file)) {
-			$absPath = Server::get(ITempManager::class)->getTemporaryFile();
-
-			if ($absPath === false) {
-				Server::get(LoggerInterface::class)->error(
-					'Failed to get local file to generate thumbnail for: ' . $file->getPath(),
-					['app' => 'core']
-				);
-				return false;
-			}
-
-			$content = $file->fopen('r');
-			if ($content === false) {
-				return false;
-			}
-
-			if ($maxSize) {
-				$content = stream_get_contents($content, $maxSize);
-			}
-
-			file_put_contents($absPath, $content);
-			$this->tmpFiles[] = $absPath;
-			return $absPath;
-		} else {
-			$path = $file->getStorage()->getLocalFile($file->getInternalPath());
-			if (is_string($path)) {
-				return $path;
-			} else {
-				return false;
-			}
-		}
-	}
-
-	/**
-	 * Clean any generated temporary files
-	 */
-	protected function cleanTmpFiles(): void {
-		foreach ($this->tmpFiles as $tmpFile) {
-			unlink($tmpFile);
-		}
-
-		$this->tmpFiles = [];
-	}
+    protected array $tmpFiles = [];
+
+    public function __construct(
+        protected array $options = [],
+    ) {
+    }
+
+    /**
+     * @return string Regex with the mimetypes that are supported by this provider
+     */
+    abstract public function getMimeType(): string ;
+
+    /**
+     * Check if a preview can be generated for $path
+     *
+     * @param FileInfo $file
+     * @return bool
+     */
+    public function isAvailable(FileInfo $file): bool {
+        return true;
+    }
+
+    /**
+     * get thumbnail for file at path $path
+     *
+     * @param File $file
+     * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image
+     * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
+     * @return null|\OCP\IImage null if no preview was generated
+     * @since 17.0.0
+     */
+    abstract public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage;
+
+    protected function useTempFile(File $file): bool {
+        return $file->isEncrypted() || !$file->getStorage()->isLocal();
+    }
+
+    /**
+     * Get a path to either the local file or temporary file
+     *
+     * @param File $file
+     * @param ?int $maxSize maximum size for temporary files
+     */
+    protected function getLocalFile(File $file, ?int $maxSize = null): string|false {
+        if ($this->useTempFile($file)) {
+            $absPath = Server::get(ITempManager::class)->getTemporaryFile();
+
+            if ($absPath === false) {
+                Server::get(LoggerInterface::class)->error(
+                    'Failed to get local file to generate thumbnail for: ' . $file->getPath(),
+                    ['app' => 'core']
+                );
+                return false;
+            }
+
+            $content = $file->fopen('r');
+            if ($content === false) {
+                return false;
+            }
+
+            if ($maxSize) {
+                $content = stream_get_contents($content, $maxSize);
+            }
+
+            file_put_contents($absPath, $content);
+            $this->tmpFiles[] = $absPath;
+            return $absPath;
+        } else {
+            $path = $file->getStorage()->getLocalFile($file->getInternalPath());
+            if (is_string($path)) {
+                return $path;
+            } else {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * Clean any generated temporary files
+     */
+    protected function cleanTmpFiles(): void {
+        foreach ($this->tmpFiles as $tmpFile) {
+            unlink($tmpFile);
+        }
+
+        $this->tmpFiles = [];
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
 	/**
 	 * @return string Regex with the mimetypes that are supported by this provider
 	 */
-	abstract public function getMimeType(): string ;
+	abstract public function getMimeType(): string;
 
 	/**
 	 * Check if a preview can be generated for $path
@@ -61,13 +61,13 @@ 
 	 * @param File $file
 	 * @param ?int $maxSize maximum size for temporary files
 	 */
-	protected function getLocalFile(File $file, ?int $maxSize = null): string|false {
+	protected function getLocalFile(File $file, ?int $maxSize = null): string | false {
 		if ($this->useTempFile($file)) {
 			$absPath = Server::get(ITempManager::class)->getTemporaryFile();
 
 			if ($absPath === false) {
 				Server::get(LoggerInterface::class)->error(
-					'Failed to get local file to generate thumbnail for: ' . $file->getPath(),
+					'Failed to get local file to generate thumbnail for: '.$file->getPath(),
 					['app' => 'core']
 				);
 				return false;

lib/private/Preview/Movie.php

Indentation +169 added lines, -169 removed lines

@@ -17,173 +17,173 @@
 use Psr\Log\LoggerInterface;
 
 class Movie extends ProviderV2 {
-	private IConfig $config;
-
-	private ?string $binary = null;
-
-	public function __construct(array $options = []) {
-		parent::__construct($options);
-		$this->config = Server::get(IConfig::class);
-	}
-
-	public function getMimeType(): string {
-		return '/video\/.*/';
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function isAvailable(FileInfo $file): bool {
-		if (is_null($this->binary)) {
-			if (isset($this->options['movieBinary'])) {
-				$this->binary = $this->options['movieBinary'];
-			}
-		}
-		return is_string($this->binary);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-		// TODO: use proc_open() and stream the source file ?
-
-		if (!$this->isAvailable($file)) {
-			return null;
-		}
-
-		$result = null;
-		if ($this->useTempFile($file)) {
-			// try downloading 5 MB first as it's likely that the first frames are present there
-			// in some cases this doesn't work for example when the moov atom is at the
-			// end of the file, so if it fails we fall back to getting the full file
-			$sizeAttempts = [5242880, null];
-		} else {
-			// size is irrelevant, only attempt once
-			$sizeAttempts = [null];
-		}
-
-		foreach ($sizeAttempts as $size) {
-			$absPath = $this->getLocalFile($file, $size);
-			if ($absPath === false) {
-				Server::get(LoggerInterface::class)->error(
-					'Failed to get local file to generate thumbnail for: ' . $file->getPath(),
-					['app' => 'core']
-				);
-				return null;
-			}
-
-			$result = $this->generateThumbNail($maxX, $maxY, $absPath, 5);
-			if ($result === null) {
-				$result = $this->generateThumbNail($maxX, $maxY, $absPath, 1);
-				if ($result === null) {
-					$result = $this->generateThumbNail($maxX, $maxY, $absPath, 0);
-				}
-			}
-
-			$this->cleanTmpFiles();
-
-			if ($result !== null) {
-				break;
-			}
-		}
-
-		return $result;
-	}
-
-	private function useHdr(string $absPath): bool {
-		// load ffprobe path from configuration, otherwise generate binary path using ffmpeg binary path
-		$ffprobe_binary = $this->config->getSystemValue('preview_ffprobe_path', null) ?? (pathinfo($this->binary, PATHINFO_DIRNAME) . '/ffprobe');
-		// run ffprobe on the video file to get value of "color_transfer"
-		$test_hdr_cmd = [$ffprobe_binary,'-select_streams', 'v:0',
-			'-show_entries', 'stream=color_transfer',
-			'-of', 'default=noprint_wrappers=1:nokey=1',
-			$absPath];
-		$test_hdr_proc = proc_open($test_hdr_cmd, [1 => ['pipe', 'w'], 2 => ['pipe', 'w']], $test_hdr_pipes);
-		if ($test_hdr_proc === false) {
-			return false;
-		}
-		$test_hdr_stdout = trim(stream_get_contents($test_hdr_pipes[1]));
-		$test_hdr_stderr = trim(stream_get_contents($test_hdr_pipes[2]));
-		proc_close($test_hdr_proc);
-		// search build options for libzimg (provides zscale filter)
-		$ffmpeg_libzimg_installed = strpos($test_hdr_stderr, '--enable-libzimg');
-		// Only values of "smpte2084" and "arib-std-b67" indicate an HDR video.
-		// Only return true if video is detected as HDR and libzimg is installed.
-		if (($test_hdr_stdout === 'smpte2084' || $test_hdr_stdout === 'arib-std-b67') && $ffmpeg_libzimg_installed !== false) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	private function generateThumbNail(int $maxX, int $maxY, string $absPath, int $second): ?IImage {
-		$tmpPath = Server::get(ITempManager::class)->getTemporaryFile();
-
-		if ($tmpPath === false) {
-			Server::get(LoggerInterface::class)->error(
-				'Failed to get local file to generate thumbnail for: ' . $absPath,
-				['app' => 'core']
-			);
-			return null;
-		}
-
-		$binaryType = substr(strrchr($this->binary, '/'), 1);
-
-		if ($binaryType === 'avconv') {
-			$cmd = [$this->binary, '-y', '-ss', (string)$second,
-				'-i', $absPath,
-				'-an', '-f', 'mjpeg', '-vframes', '1', '-vsync', '1',
-				$tmpPath];
-		} elseif ($binaryType === 'ffmpeg') {
-			if ($this->useHdr($absPath)) {
-				// Force colorspace to '2020_ncl' because some videos are
-				// tagged incorrectly as 'reserved' resulting in fail if not forced.
-				$cmd = [$this->binary, '-y', '-ss', (string)$second,
-					'-i', $absPath,
-					'-f', 'mjpeg', '-vframes', '1',
-					'-vf', 'zscale=min=2020_ncl:t=linear:npl=100,format=gbrpf32le,zscale=p=bt709,tonemap=tonemap=hable:desat=0,zscale=t=bt709:m=bt709:r=tv,format=yuv420p',
-					$tmpPath];
-			} else {
-				// always default to generating preview using non-HDR command
-				$cmd = [$this->binary, '-y', '-ss', (string)$second,
-					'-i', $absPath,
-					'-f', 'mjpeg', '-vframes', '1',
-					$tmpPath];
-			}
-		} else {
-			// Not supported
-			unlink($tmpPath);
-			return null;
-		}
-
-		$proc = proc_open($cmd, [1 => ['pipe', 'w'], 2 => ['pipe', 'w']], $pipes);
-		$returnCode = -1;
-		$output = '';
-		if (is_resource($proc)) {
-			$stdout = trim(stream_get_contents($pipes[1]));
-			$stderr = trim(stream_get_contents($pipes[2]));
-			$returnCode = proc_close($proc);
-			$output = $stdout . $stderr;
-		}
-
-		if ($returnCode === 0) {
-			$image = new \OCP\Image();
-			$image->loadFromFile($tmpPath);
-			if ($image->valid()) {
-				unlink($tmpPath);
-				$image->scaleDownToFit($maxX, $maxY);
-
-				return $image;
-			}
-		}
-
-		if ($second === 0) {
-			$logger = Server::get(LoggerInterface::class);
-			$logger->info('Movie preview generation failed Output: {output}', ['app' => 'core', 'output' => $output]);
-		}
-
-		unlink($tmpPath);
-		return null;
-	}
+    private IConfig $config;
+
+    private ?string $binary = null;
+
+    public function __construct(array $options = []) {
+        parent::__construct($options);
+        $this->config = Server::get(IConfig::class);
+    }
+
+    public function getMimeType(): string {
+        return '/video\/.*/';
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isAvailable(FileInfo $file): bool {
+        if (is_null($this->binary)) {
+            if (isset($this->options['movieBinary'])) {
+                $this->binary = $this->options['movieBinary'];
+            }
+        }
+        return is_string($this->binary);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
+        // TODO: use proc_open() and stream the source file ?
+
+        if (!$this->isAvailable($file)) {
+            return null;
+        }
+
+        $result = null;
+        if ($this->useTempFile($file)) {
+            // try downloading 5 MB first as it's likely that the first frames are present there
+            // in some cases this doesn't work for example when the moov atom is at the
+            // end of the file, so if it fails we fall back to getting the full file
+            $sizeAttempts = [5242880, null];
+        } else {
+            // size is irrelevant, only attempt once
+            $sizeAttempts = [null];
+        }
+
+        foreach ($sizeAttempts as $size) {
+            $absPath = $this->getLocalFile($file, $size);
+            if ($absPath === false) {
+                Server::get(LoggerInterface::class)->error(
+                    'Failed to get local file to generate thumbnail for: ' . $file->getPath(),
+                    ['app' => 'core']
+                );
+                return null;
+            }
+
+            $result = $this->generateThumbNail($maxX, $maxY, $absPath, 5);
+            if ($result === null) {
+                $result = $this->generateThumbNail($maxX, $maxY, $absPath, 1);
+                if ($result === null) {
+                    $result = $this->generateThumbNail($maxX, $maxY, $absPath, 0);
+                }
+            }
+
+            $this->cleanTmpFiles();
+
+            if ($result !== null) {
+                break;
+            }
+        }
+
+        return $result;
+    }
+
+    private function useHdr(string $absPath): bool {
+        // load ffprobe path from configuration, otherwise generate binary path using ffmpeg binary path
+        $ffprobe_binary = $this->config->getSystemValue('preview_ffprobe_path', null) ?? (pathinfo($this->binary, PATHINFO_DIRNAME) . '/ffprobe');
+        // run ffprobe on the video file to get value of "color_transfer"
+        $test_hdr_cmd = [$ffprobe_binary,'-select_streams', 'v:0',
+            '-show_entries', 'stream=color_transfer',
+            '-of', 'default=noprint_wrappers=1:nokey=1',
+            $absPath];
+        $test_hdr_proc = proc_open($test_hdr_cmd, [1 => ['pipe', 'w'], 2 => ['pipe', 'w']], $test_hdr_pipes);
+        if ($test_hdr_proc === false) {
+            return false;
+        }
+        $test_hdr_stdout = trim(stream_get_contents($test_hdr_pipes[1]));
+        $test_hdr_stderr = trim(stream_get_contents($test_hdr_pipes[2]));
+        proc_close($test_hdr_proc);
+        // search build options for libzimg (provides zscale filter)
+        $ffmpeg_libzimg_installed = strpos($test_hdr_stderr, '--enable-libzimg');
+        // Only values of "smpte2084" and "arib-std-b67" indicate an HDR video.
+        // Only return true if video is detected as HDR and libzimg is installed.
+        if (($test_hdr_stdout === 'smpte2084' || $test_hdr_stdout === 'arib-std-b67') && $ffmpeg_libzimg_installed !== false) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    private function generateThumbNail(int $maxX, int $maxY, string $absPath, int $second): ?IImage {
+        $tmpPath = Server::get(ITempManager::class)->getTemporaryFile();
+
+        if ($tmpPath === false) {
+            Server::get(LoggerInterface::class)->error(
+                'Failed to get local file to generate thumbnail for: ' . $absPath,
+                ['app' => 'core']
+            );
+            return null;
+        }
+
+        $binaryType = substr(strrchr($this->binary, '/'), 1);
+
+        if ($binaryType === 'avconv') {
+            $cmd = [$this->binary, '-y', '-ss', (string)$second,
+                '-i', $absPath,
+                '-an', '-f', 'mjpeg', '-vframes', '1', '-vsync', '1',
+                $tmpPath];
+        } elseif ($binaryType === 'ffmpeg') {
+            if ($this->useHdr($absPath)) {
+                // Force colorspace to '2020_ncl' because some videos are
+                // tagged incorrectly as 'reserved' resulting in fail if not forced.
+                $cmd = [$this->binary, '-y', '-ss', (string)$second,
+                    '-i', $absPath,
+                    '-f', 'mjpeg', '-vframes', '1',
+                    '-vf', 'zscale=min=2020_ncl:t=linear:npl=100,format=gbrpf32le,zscale=p=bt709,tonemap=tonemap=hable:desat=0,zscale=t=bt709:m=bt709:r=tv,format=yuv420p',
+                    $tmpPath];
+            } else {
+                // always default to generating preview using non-HDR command
+                $cmd = [$this->binary, '-y', '-ss', (string)$second,
+                    '-i', $absPath,
+                    '-f', 'mjpeg', '-vframes', '1',
+                    $tmpPath];
+            }
+        } else {
+            // Not supported
+            unlink($tmpPath);
+            return null;
+        }
+
+        $proc = proc_open($cmd, [1 => ['pipe', 'w'], 2 => ['pipe', 'w']], $pipes);
+        $returnCode = -1;
+        $output = '';
+        if (is_resource($proc)) {
+            $stdout = trim(stream_get_contents($pipes[1]));
+            $stderr = trim(stream_get_contents($pipes[2]));
+            $returnCode = proc_close($proc);
+            $output = $stdout . $stderr;
+        }
+
+        if ($returnCode === 0) {
+            $image = new \OCP\Image();
+            $image->loadFromFile($tmpPath);
+            if ($image->valid()) {
+                unlink($tmpPath);
+                $image->scaleDownToFit($maxX, $maxY);
+
+                return $image;
+            }
+        }
+
+        if ($second === 0) {
+            $logger = Server::get(LoggerInterface::class);
+            $logger->info('Movie preview generation failed Output: {output}', ['app' => 'core', 'output' => $output]);
+        }
+
+        unlink($tmpPath);
+        return null;
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -67,7 +67,7 @@ 
 			$absPath = $this->getLocalFile($file, $size);
 			if ($absPath === false) {
 				Server::get(LoggerInterface::class)->error(
-					'Failed to get local file to generate thumbnail for: ' . $file->getPath(),
+					'Failed to get local file to generate thumbnail for: '.$file->getPath(),
 					['app' => 'core']
 				);
 				return null;
@@ -93,9 +93,9 @@ 
 
 	private function useHdr(string $absPath): bool {
 		// load ffprobe path from configuration, otherwise generate binary path using ffmpeg binary path
-		$ffprobe_binary = $this->config->getSystemValue('preview_ffprobe_path', null) ?? (pathinfo($this->binary, PATHINFO_DIRNAME) . '/ffprobe');
+		$ffprobe_binary = $this->config->getSystemValue('preview_ffprobe_path', null) ?? (pathinfo($this->binary, PATHINFO_DIRNAME).'/ffprobe');
 		// run ffprobe on the video file to get value of "color_transfer"
-		$test_hdr_cmd = [$ffprobe_binary,'-select_streams', 'v:0',
+		$test_hdr_cmd = [$ffprobe_binary, '-select_streams', 'v:0',
 			'-show_entries', 'stream=color_transfer',
 			'-of', 'default=noprint_wrappers=1:nokey=1',
 			$absPath];
@@ -122,7 +122,7 @@ 
 
 		if ($tmpPath === false) {
 			Server::get(LoggerInterface::class)->error(
-				'Failed to get local file to generate thumbnail for: ' . $absPath,
+				'Failed to get local file to generate thumbnail for: '.$absPath,
 				['app' => 'core']
 			);
 			return null;
@@ -131,7 +131,7 @@ 
 		$binaryType = substr(strrchr($this->binary, '/'), 1);
 
 		if ($binaryType === 'avconv') {
-			$cmd = [$this->binary, '-y', '-ss', (string)$second,
+			$cmd = [$this->binary, '-y', '-ss', (string) $second,
 				'-i', $absPath,
 				'-an', '-f', 'mjpeg', '-vframes', '1', '-vsync', '1',
 				$tmpPath];
@@ -139,14 +139,14 @@ 
 			if ($this->useHdr($absPath)) {
 				// Force colorspace to '2020_ncl' because some videos are
 				// tagged incorrectly as 'reserved' resulting in fail if not forced.
-				$cmd = [$this->binary, '-y', '-ss', (string)$second,
+				$cmd = [$this->binary, '-y', '-ss', (string) $second,
 					'-i', $absPath,
 					'-f', 'mjpeg', '-vframes', '1',
 					'-vf', 'zscale=min=2020_ncl:t=linear:npl=100,format=gbrpf32le,zscale=p=bt709,tonemap=tonemap=hable:desat=0,zscale=t=bt709:m=bt709:r=tv,format=yuv420p',
 					$tmpPath];
 			} else {
 				// always default to generating preview using non-HDR command
-				$cmd = [$this->binary, '-y', '-ss', (string)$second,
+				$cmd = [$this->binary, '-y', '-ss', (string) $second,
 					'-i', $absPath,
 					'-f', 'mjpeg', '-vframes', '1',
 					$tmpPath];
@@ -164,7 +164,7 @@ 
 			$stdout = trim(stream_get_contents($pipes[1]));
 			$stderr = trim(stream_get_contents($pipes[2]));
 			$returnCode = proc_close($proc);
-			$output = $stdout . $stderr;
+			$output = $stdout.$stderr;
 		}
 
 		if ($returnCode === 0) {