ImageMagick class updates and tests (#3115)

ImageMagick class updates and tests

.travis.yml

@@ -42,6 +42,8 @@ before_install:
   - mysql -e "CREATE DATABASE IF NOT EXISTS test;" -uroot;
   - mysql -e "SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = 'test';" -uroot
   - psql -c 'CREATE DATABASE test;' -U postgres
+  - sudo apt-get install ghostscript
+  - yes | pecl install imagick
 
 before_script:
   - echo 'extension = memcached.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini

system/Images/Handlers/ImageMagickHandler.php

@@ -106,7 +106,9 @@ public function _resize(bool $maintainRatio = false)
 			$escape = '';
 		}
 
-		$action = $maintainRatio === true ? ' -resize ' . $this->width . 'x' . $this->height . ' "' . $source . '" "' . $destination . '"' : ' -resize ' . $this->width . 'x' . $this->height . "{$escape}! \"" . $source . '" "' . $destination . '"';
+		$action = $maintainRatio === true
+			? ' -resize ' . ($this->width ?? 0) . 'x' . ($this->height ?? 0) . ' "' . $source . '" "' . $destination . '"'
+			: ' -resize ' . ($this->width ?? 0) . 'x' . ($this->height ?? 0) . "{$escape}! \"" . $source . '" "' . $destination . '"';
 
 		$this->process($action);
 
@@ -126,7 +128,13 @@ public function _crop()
 		$source      = ! empty($this->resource) ? $this->resource : $this->image()->getPathname();
 		$destination = $this->getResourcePath();
 
-		$action = ' -crop ' . $this->width . 'x' . $this->height . '+' . $this->xAxis . '+' . $this->yAxis . ' "' . $source . '" "' . $destination . '"';
+		$extent = ' ';
+		if ($this->xAxis >= $this->width || $this->yAxis > $this->height)
+		{
+			$extent = ' -background transparent -extent ' . ($this->width ?? 0) . 'x' . ($this->height ?? 0) . ' ';
+		}
+
+		$action = ' -crop ' . ($this->width ?? 0) . 'x' . ($this->height ?? 0) . '+' . ($this->xAxis ?? 0) . '+' . ($this->yAxis ?? 0) . $extent . escapeshellarg($source) . ' ' . escapeshellarg($destination);
 
 		$this->process($action);
 
@@ -151,7 +159,7 @@ protected function _rotate(int $angle)
 		$source      = ! empty($this->resource) ? $this->resource : $this->image()->getPathname();
 		$destination = $this->getResourcePath();
 
-		$action = ' ' . $angle . ' "' . $source . '" "' . $destination . '"';
+		$action = ' ' . $angle . ' ' . escapeshellarg($source) . ' ' . escapeshellarg($destination);
 
 		$this->process($action);
 
@@ -172,12 +180,12 @@ protected function _rotate(int $angle)
 	 */
 	public function _flatten(int $red = 255, int $green = 255, int $blue = 255)
 	{
-		$flatten = "-background RGB({$red},{$green},{$blue}) -flatten";
+		$flatten = "-background 'rgb({$red},{$green},{$blue})' -flatten";
 
 		$source      = ! empty($this->resource) ? $this->resource : $this->image()->getPathname();
 		$destination = $this->getResourcePath();
 
-		$action = ' ' . $flatten . ' "' . $source . '" "' . $destination . '"';
+		$action = ' ' . $flatten . ' ' . escapeshellarg($source) . ' ' . escapeshellarg($destination);
 
 		$this->process($action);
 
@@ -201,7 +209,7 @@ public function _flip(string $direction)
 		$source      = ! empty($this->resource) ? $this->resource : $this->image()->getPathname();
 		$destination = $this->getResourcePath();
 
-		$action = ' ' . $angle . ' "' . $source . '" "' . $destination . '"';
+		$action = ' ' . $angle . ' ' . escapeshellarg($source) . ' ' . escapeshellarg($destination);
 
 		$this->process($action);
 
@@ -300,7 +308,7 @@ public function save(string $target = null, int $quality = 90): bool
 
 		// Copy the file through ImageMagick so that it has
 		// a chance to convert file format.
-		$action = '"' . $this->resource . '" "' . $target . '"';
+		$action = escapeshellarg($this->resource) . ' ' . escapeshellarg($target);
 
 		$result = $this->process($action, $quality);
 
@@ -335,6 +343,11 @@ protected function getResourcePath()
 
 		$this->resource = WRITEPATH . 'cache/' . time() . '_' . bin2hex(random_bytes(10)) . '.png';
 
+		$name = basename($this->resource);
+		$path = pathinfo($this->resource, PATHINFO_DIRNAME);
+
+		$this->image()->copy($path, $name);
+
 		return $this->resource;
 	}
 
@@ -462,7 +475,7 @@ protected function _text(string $text, array $options = [])
 	 */
 	public function _getWidth()
 	{
-		return imagesx($this->resource);
+		return imagesx(imagecreatefromstring(file_get_contents($this->resource)));
 	}
 
 	/**
@@ -472,7 +485,7 @@ public function _getWidth()
 	 */
 	public function _getHeight()
 	{
-		return imagesy($this->resource);
+		return imagesy(imagecreatefromstring(file_get_contents($this->resource)));
 	}
 
 }