fabarea / media

Classes/Thumbnail/AbstractThumbnailProcessor.php

Indentation +151 added lines, -151 removed lines

@@ -19,155 +19,155 @@
 abstract class AbstractThumbnailProcessor implements ThumbnailProcessorInterface
 {
 
-    /**
-     * @var ThumbnailService
-     */
-    protected $thumbnailService;
-
-    /**
-     * Store a Processed File along the processing.
-     *
-     * @var \TYPO3\CMS\Core\Resource\ProcessedFile
-     */
-    protected $processedFile;
-
-    /**
-     * Define what are the rendering steps for a thumbnail.
-     *
-     * @var array
-     */
-    protected $renderingSteps = [
-        ThumbnailInterface::OUTPUT_URI => 'renderUri',
-        ThumbnailInterface::OUTPUT_IMAGE => 'renderTagImage',
-        ThumbnailInterface::OUTPUT_IMAGE_WRAPPED => 'renderTagAnchor',
-    ];
-
-    /**
-     * @param ThumbnailService $thumbnailService
-     * @return $this
-     */
-    public function setThumbnailService(ThumbnailService $thumbnailService)
-    {
-        $this->thumbnailService = $thumbnailService;
-        return $this;
-    }
-
-    /**
-     * Return what needs to be rendered
-     *
-     * @return array
-     */
-    protected function getRenderingSteps()
-    {
-        $position = array_search($this->thumbnailService->getOutputType(), array_keys($this->renderingSteps));
-        return array_slice($this->renderingSteps, 0, $position + 1);
-    }
-
-
-    /**
-     * Render additional attribute for this DOM element.
-     *
-     * @return string
-     */
-    protected function renderAttributes()
-    {
-        $result = '';
-        $attributes = $this->thumbnailService->getAttributes();
-        if (is_array($attributes)) {
-            foreach ($attributes as $attribute => $value) {
-                $result .= sprintf('%s="%s" ',
-                    htmlspecialchars($attribute),
-                    htmlspecialchars($value)
-                );
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * @return array
-     * @throws \Fab\Media\Exception\InvalidKeyInArrayException
-     * @throws \Fab\Media\Exception\EmptyValueException
-     */
-    protected function getConfiguration()
-    {
-        $configuration = $this->thumbnailService->getConfiguration();
-        if (!$configuration) {
-            $dimension = ImagePresetUtility::getInstance()->preset('image_thumbnail');
-            $configuration = array(
-                'width' => $dimension->getWidth(),
-                'height' => $dimension->getHeight(),
-            );
-        }
-        return $configuration;
-    }
-
-    /**
-     * Returns a path to an icon given an extension.
-     *
-     * @param string $extension File extension
-     * @return string
-     */
-    protected function getIcon($extension)
-    {
-        $resource = Path::getRelativePath(sprintf('Icons/MimeType/%s.png', $extension));
-
-        // If file is not found, fall back to a default icon
-        if (Path::notExists($resource)) {
-            $resource = Path::getRelativePath('Icons/MissingMimeTypeIcon.png');
-        }
-
-        return $resource;
-    }
-
-    /**
-     * @param string $uri
-     * @return string
-     */
-    public function prefixUri($uri)
-    {
-        if ($this->isFrontendMode() && $this->getFrontendObject()->absRefPrefix) {
-            $uri = $this->getFrontendObject()->absRefPrefix . $uri;
-        }
-        return $uri;
-    }
-
-    /**
-     * Returns true whether an thumbnail can be generated
-     *
-     * @param string $extension File extension
-     * @return boolean
-     */
-    protected function isThumbnailPossible($extension)
-    {
-        return GeneralUtility::inList($GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'], strtolower($extension));
-    }
-
-    /**
-     * @return File
-     */
-    protected function getFile()
-    {
-        return $this->thumbnailService->getFile();
-    }
-
-    /**
-     * Returns whether the current mode is Frontend
-     *
-     * @return bool
-     */
-    protected function isFrontendMode()
-    {
-        return TYPO3_MODE === 'FE';
-    }
-
-    /**
-     * Returns an instance of the Frontend object.
-     *
-     * @return \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController
-     */
-    protected function getFrontendObject()
-    {
-        return $GLOBALS['TSFE'];
-    }
+	/**
+	 * @var ThumbnailService
+	 */
+	protected $thumbnailService;
+
+	/**
+	 * Store a Processed File along the processing.
+	 *
+	 * @var \TYPO3\CMS\Core\Resource\ProcessedFile
+	 */
+	protected $processedFile;
+
+	/**
+	 * Define what are the rendering steps for a thumbnail.
+	 *
+	 * @var array
+	 */
+	protected $renderingSteps = [
+		ThumbnailInterface::OUTPUT_URI => 'renderUri',
+		ThumbnailInterface::OUTPUT_IMAGE => 'renderTagImage',
+		ThumbnailInterface::OUTPUT_IMAGE_WRAPPED => 'renderTagAnchor',
+	];
+
+	/**
+	 * @param ThumbnailService $thumbnailService
+	 * @return $this
+	 */
+	public function setThumbnailService(ThumbnailService $thumbnailService)
+	{
+		$this->thumbnailService = $thumbnailService;
+		return $this;
+	}
+
+	/**
+	 * Return what needs to be rendered
+	 *
+	 * @return array
+	 */
+	protected function getRenderingSteps()
+	{
+		$position = array_search($this->thumbnailService->getOutputType(), array_keys($this->renderingSteps));
+		return array_slice($this->renderingSteps, 0, $position + 1);
+	}
+
+
+	/**
+	 * Render additional attribute for this DOM element.
+	 *
+	 * @return string
+	 */
+	protected function renderAttributes()
+	{
+		$result = '';
+		$attributes = $this->thumbnailService->getAttributes();
+		if (is_array($attributes)) {
+			foreach ($attributes as $attribute => $value) {
+				$result .= sprintf('%s="%s" ',
+					htmlspecialchars($attribute),
+					htmlspecialchars($value)
+				);
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * @return array
+	 * @throws \Fab\Media\Exception\InvalidKeyInArrayException
+	 * @throws \Fab\Media\Exception\EmptyValueException
+	 */
+	protected function getConfiguration()
+	{
+		$configuration = $this->thumbnailService->getConfiguration();
+		if (!$configuration) {
+			$dimension = ImagePresetUtility::getInstance()->preset('image_thumbnail');
+			$configuration = array(
+				'width' => $dimension->getWidth(),
+				'height' => $dimension->getHeight(),
+			);
+		}
+		return $configuration;
+	}
+
+	/**
+	 * Returns a path to an icon given an extension.
+	 *
+	 * @param string $extension File extension
+	 * @return string
+	 */
+	protected function getIcon($extension)
+	{
+		$resource = Path::getRelativePath(sprintf('Icons/MimeType/%s.png', $extension));
+
+		// If file is not found, fall back to a default icon
+		if (Path::notExists($resource)) {
+			$resource = Path::getRelativePath('Icons/MissingMimeTypeIcon.png');
+		}
+
+		return $resource;
+	}
+
+	/**
+	 * @param string $uri
+	 * @return string
+	 */
+	public function prefixUri($uri)
+	{
+		if ($this->isFrontendMode() && $this->getFrontendObject()->absRefPrefix) {
+			$uri = $this->getFrontendObject()->absRefPrefix . $uri;
+		}
+		return $uri;
+	}
+
+	/**
+	 * Returns true whether an thumbnail can be generated
+	 *
+	 * @param string $extension File extension
+	 * @return boolean
+	 */
+	protected function isThumbnailPossible($extension)
+	{
+		return GeneralUtility::inList($GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'], strtolower($extension));
+	}
+
+	/**
+	 * @return File
+	 */
+	protected function getFile()
+	{
+		return $this->thumbnailService->getFile();
+	}
+
+	/**
+	 * Returns whether the current mode is Frontend
+	 *
+	 * @return bool
+	 */
+	protected function isFrontendMode()
+	{
+		return TYPO3_MODE === 'FE';
+	}
+
+	/**
+	 * Returns an instance of the Frontend object.
+	 *
+	 * @return \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController
+	 */
+	protected function getFrontendObject()
+	{
+		return $GLOBALS['TSFE'];
+	}
 }

Classes/Thumbnail/ThumbnailService.php

Indentation +308 added lines, -308 removed lines

@@ -20,313 +20,313 @@
 class ThumbnailService
 {
 
-    /**
-     * @var array
-     */
-    protected $allowedOutputTypes = array(
-        ThumbnailInterface::OUTPUT_IMAGE,
-        ThumbnailInterface::OUTPUT_IMAGE_WRAPPED,
-        ThumbnailInterface::OUTPUT_URI,
-    );
-
-    /**
-     * Configure the output of the thumbnail service whether it is wrapped or not.
-     * Default output is: ThumbnailInterface::OUTPUT_IMAGE
-     *
-     * @var string
-     */
-    protected $outputType = ThumbnailInterface::OUTPUT_IMAGE;
-
-    /**
-     * @var File
-     */
-    protected $file;
-
-    /**
-     * Define width, height and all sort of attributes to render a thumbnail.
-     * @see TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::Image
-     * @var array
-     */
-    protected $configuration = [];
-
-    /**
-     * Define width, height and all sort of attributes to render the anchor file
-     * which is wrapping the image
-     *
-     * @see TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::Image
-     * @var array
-     */
-    protected $configurationWrap = [];
-
-    /**
-     * DOM attributes to add to the image preview.
-     *
-     * @var array
-     */
-    protected $attributes = [
-        'class' => 'thumbnail',
-    ];
-
-    /**
-     * Define in which window will the thumbnail be opened.
-     * Does only apply if the thumbnail is wrapped (with an anchor).
-     *
-     * @var string
-     */
-    protected $target = ThumbnailInterface::TARGET_BLANK;
-
-    /**
-     * URI of the wrapping anchor pointing to the file.
-     * replacing the "?" <a href="?">...</a>
-     * The URI is automatically computed if not set.
-     * @var string
-     */
-    protected $anchorUri;
-
-    /**
-     * Whether a time stamp is appended to the image.
-     * Appending the time stamp can prevent caching
-     *
-     * @var bool
-     */
-    protected $appendTimeStamp = false;
-
-    /**
-     * Define the processing type for the thumbnail.
-     * As instance for image the default is ProcessedFile::CONTEXT_IMAGECROPSCALEMASK.
-     *
-     * @var string
-     */
-    protected $processingType;
-
-    /**
-     * Constructor
-     *
-     * @param File $file
-     */
-    public function __construct(File $file = null)
-    {
-        $this->file = $file;
-    }
-
-    /**
-     * Render a thumbnail of a media
-     *
-     * @throws MissingTcaConfigurationException
-     * @return string
-     * @throws \InvalidArgumentException
-     */
-    public function create()
-    {
-
-        if (!$this->file) {
-            throw new MissingTcaConfigurationException('Missing File object. Forgotten to set a file?', 1355933144);
-        }
-
-        // Default class name
-        $className = 'Fab\Media\Thumbnail\FallBackThumbnailProcessor';
-        if (File::FILETYPE_IMAGE === $this->file->getType()) {
-            $className = 'Fab\Media\Thumbnail\ImageThumbnailProcessor';
-        } elseif (File::FILETYPE_AUDIO === $this->file->getType()) {
-            $className = 'Fab\Media\Thumbnail\AudioThumbnailProcessor';
-        } elseif (File::FILETYPE_VIDEO === $this->file->getType()) {
-            $className = 'Fab\Media\Thumbnail\VideoThumbnailProcessor';
-        } elseif (File::FILETYPE_APPLICATION === $this->file->getType() || File::FILETYPE_TEXT === $this->file->getType()) {
-            $className = 'Fab\Media\Thumbnail\ApplicationThumbnailProcessor';
-        }
-
-        /** @var $processorInstance \Fab\Media\Thumbnail\ThumbnailProcessorInterface */
-        $processorInstance = GeneralUtility::makeInstance($className);
-
-        $thumbnail = '';
-        if ($this->file->exists()) {
-            $thumbnail = $processorInstance->setThumbnailService($this)->create();
-        } else {
-            $logger = Logger::getInstance($this);
-            $logger->warning(sprintf('Resource not found for File uid "%s" at %s', $this->file->getUid(), $this->file->getIdentifier()));
-        }
-
-        return $thumbnail;
-    }
-
-    /**
-     * @return array
-     */
-    public function getConfigurationWrap()
-    {
-        return $this->configurationWrap;
-    }
-
-    /**
-     * @param array $configurationWrap
-     * @return $this
-     */
-    public function setConfigurationWrap($configurationWrap)
-    {
-        $this->configurationWrap = $configurationWrap;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getFile()
-    {
-        return $this->file;
-    }
-
-    /**
-     * @return array
-     */
-    public function getConfiguration()
-    {
-        return $this->configuration;
-    }
-
-    /**
-     * @param array|ThumbnailConfiguration $configuration
-     * @return $this
-     */
-    public function setConfiguration($configuration)
-    {
-        if ($configuration instanceof ThumbnailConfiguration) {
-            $configurationObject = $configuration;
-            $configuration = [];
-
-            if ($configurationObject->getWidth() > 0) {
-                $configuration['width'] = $configurationObject->getWidth();
-            }
-
-            if ($configurationObject->getHeight() > 0) {
-                $configuration['height'] = $configurationObject->getHeight();
-            }
-
-            if ($configurationObject->getStyle()) {
-                $this->attributes['style'] = $configurationObject->getStyle();
-            }
-
-            if ($configurationObject->getClassName()) {
-                $this->attributes['class'] = $configurationObject->getClassName();
-            }
-        }
-
-        $this->configuration = $configuration;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getAttributes()
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * @param array $attributes
-     * @return $this
-     */
-    public function setAttributes($attributes)
-    {
-        $this->attributes = $attributes;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getOutputType()
-    {
-        return $this->outputType;
-    }
-
-    /**
-     * @throws InvalidKeyInArrayException
-     * @param string $outputType
-     * @return $this
-     */
-    public function setOutputType($outputType)
-    {
-        if (!in_array($outputType, $this->allowedOutputTypes)) {
-            throw new InvalidKeyInArrayException(
-                sprintf('Output type "%s" is not allowed', $outputType),
-                1373020076
-            );
-        }
-        $this->outputType = $outputType;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTarget()
-    {
-        return $this->target;
-    }
-
-    /**
-     * @param string $target
-     * @return $this
-     */
-    public function setTarget($target)
-    {
-        $this->target = $target;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getAnchorUri()
-    {
-        return $this->anchorUri;
-    }
-
-    /**
-     * @param string $anchorUri
-     * @return $this
-     */
-    public function setAnchorUri($anchorUri)
-    {
-        $this->anchorUri = $anchorUri;
-        return $this;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function getAppendTimeStamp()
-    {
-        return $this->appendTimeStamp;
-    }
-
-    /**
-     * @param boolean $appendTimeStamp
-     * @return $this
-     */
-    public function setAppendTimeStamp($appendTimeStamp)
-    {
-        $this->appendTimeStamp = (bool)$appendTimeStamp;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getProcessingType()
-    {
-        $this->processingType;
-    }
-
-    /**
-     * @param string $processingType
-     * @return $this
-     */
-    public function setProcessingType($processingType)
-    {
-        $this->processingType = $processingType;
-        return $this;
-    }
+	/**
+	 * @var array
+	 */
+	protected $allowedOutputTypes = array(
+		ThumbnailInterface::OUTPUT_IMAGE,
+		ThumbnailInterface::OUTPUT_IMAGE_WRAPPED,
+		ThumbnailInterface::OUTPUT_URI,
+	);
+
+	/**
+	 * Configure the output of the thumbnail service whether it is wrapped or not.
+	 * Default output is: ThumbnailInterface::OUTPUT_IMAGE
+	 *
+	 * @var string
+	 */
+	protected $outputType = ThumbnailInterface::OUTPUT_IMAGE;
+
+	/**
+	 * @var File
+	 */
+	protected $file;
+
+	/**
+	 * Define width, height and all sort of attributes to render a thumbnail.
+	 * @see TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::Image
+	 * @var array
+	 */
+	protected $configuration = [];
+
+	/**
+	 * Define width, height and all sort of attributes to render the anchor file
+	 * which is wrapping the image
+	 *
+	 * @see TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::Image
+	 * @var array
+	 */
+	protected $configurationWrap = [];
+
+	/**
+	 * DOM attributes to add to the image preview.
+	 *
+	 * @var array
+	 */
+	protected $attributes = [
+		'class' => 'thumbnail',
+	];
+
+	/**
+	 * Define in which window will the thumbnail be opened.
+	 * Does only apply if the thumbnail is wrapped (with an anchor).
+	 *
+	 * @var string
+	 */
+	protected $target = ThumbnailInterface::TARGET_BLANK;
+
+	/**
+	 * URI of the wrapping anchor pointing to the file.
+	 * replacing the "?" <a href="?">...</a>
+	 * The URI is automatically computed if not set.
+	 * @var string
+	 */
+	protected $anchorUri;
+
+	/**
+	 * Whether a time stamp is appended to the image.
+	 * Appending the time stamp can prevent caching
+	 *
+	 * @var bool
+	 */
+	protected $appendTimeStamp = false;
+
+	/**
+	 * Define the processing type for the thumbnail.
+	 * As instance for image the default is ProcessedFile::CONTEXT_IMAGECROPSCALEMASK.
+	 *
+	 * @var string
+	 */
+	protected $processingType;
+
+	/**
+	 * Constructor
+	 *
+	 * @param File $file
+	 */
+	public function __construct(File $file = null)
+	{
+		$this->file = $file;
+	}
+
+	/**
+	 * Render a thumbnail of a media
+	 *
+	 * @throws MissingTcaConfigurationException
+	 * @return string
+	 * @throws \InvalidArgumentException
+	 */
+	public function create()
+	{
+
+		if (!$this->file) {
+			throw new MissingTcaConfigurationException('Missing File object. Forgotten to set a file?', 1355933144);
+		}
+
+		// Default class name
+		$className = 'Fab\Media\Thumbnail\FallBackThumbnailProcessor';
+		if (File::FILETYPE_IMAGE === $this->file->getType()) {
+			$className = 'Fab\Media\Thumbnail\ImageThumbnailProcessor';
+		} elseif (File::FILETYPE_AUDIO === $this->file->getType()) {
+			$className = 'Fab\Media\Thumbnail\AudioThumbnailProcessor';
+		} elseif (File::FILETYPE_VIDEO === $this->file->getType()) {
+			$className = 'Fab\Media\Thumbnail\VideoThumbnailProcessor';
+		} elseif (File::FILETYPE_APPLICATION === $this->file->getType() || File::FILETYPE_TEXT === $this->file->getType()) {
+			$className = 'Fab\Media\Thumbnail\ApplicationThumbnailProcessor';
+		}
+
+		/** @var $processorInstance \Fab\Media\Thumbnail\ThumbnailProcessorInterface */
+		$processorInstance = GeneralUtility::makeInstance($className);
+
+		$thumbnail = '';
+		if ($this->file->exists()) {
+			$thumbnail = $processorInstance->setThumbnailService($this)->create();
+		} else {
+			$logger = Logger::getInstance($this);
+			$logger->warning(sprintf('Resource not found for File uid "%s" at %s', $this->file->getUid(), $this->file->getIdentifier()));
+		}
+
+		return $thumbnail;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getConfigurationWrap()
+	{
+		return $this->configurationWrap;
+	}
+
+	/**
+	 * @param array $configurationWrap
+	 * @return $this
+	 */
+	public function setConfigurationWrap($configurationWrap)
+	{
+		$this->configurationWrap = $configurationWrap;
+		return $this;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getFile()
+	{
+		return $this->file;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getConfiguration()
+	{
+		return $this->configuration;
+	}
+
+	/**
+	 * @param array|ThumbnailConfiguration $configuration
+	 * @return $this
+	 */
+	public function setConfiguration($configuration)
+	{
+		if ($configuration instanceof ThumbnailConfiguration) {
+			$configurationObject = $configuration;
+			$configuration = [];
+
+			if ($configurationObject->getWidth() > 0) {
+				$configuration['width'] = $configurationObject->getWidth();
+			}
+
+			if ($configurationObject->getHeight() > 0) {
+				$configuration['height'] = $configurationObject->getHeight();
+			}
+
+			if ($configurationObject->getStyle()) {
+				$this->attributes['style'] = $configurationObject->getStyle();
+			}
+
+			if ($configurationObject->getClassName()) {
+				$this->attributes['class'] = $configurationObject->getClassName();
+			}
+		}
+
+		$this->configuration = $configuration;
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getAttributes()
+	{
+		return $this->attributes;
+	}
+
+	/**
+	 * @param array $attributes
+	 * @return $this
+	 */
+	public function setAttributes($attributes)
+	{
+		$this->attributes = $attributes;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getOutputType()
+	{
+		return $this->outputType;
+	}
+
+	/**
+	 * @throws InvalidKeyInArrayException
+	 * @param string $outputType
+	 * @return $this
+	 */
+	public function setOutputType($outputType)
+	{
+		if (!in_array($outputType, $this->allowedOutputTypes)) {
+			throw new InvalidKeyInArrayException(
+				sprintf('Output type "%s" is not allowed', $outputType),
+				1373020076
+			);
+		}
+		$this->outputType = $outputType;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getTarget()
+	{
+		return $this->target;
+	}
+
+	/**
+	 * @param string $target
+	 * @return $this
+	 */
+	public function setTarget($target)
+	{
+		$this->target = $target;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getAnchorUri()
+	{
+		return $this->anchorUri;
+	}
+
+	/**
+	 * @param string $anchorUri
+	 * @return $this
+	 */
+	public function setAnchorUri($anchorUri)
+	{
+		$this->anchorUri = $anchorUri;
+		return $this;
+	}
+
+	/**
+	 * @return boolean
+	 */
+	public function getAppendTimeStamp()
+	{
+		return $this->appendTimeStamp;
+	}
+
+	/**
+	 * @param boolean $appendTimeStamp
+	 * @return $this
+	 */
+	public function setAppendTimeStamp($appendTimeStamp)
+	{
+		$this->appendTimeStamp = (bool)$appendTimeStamp;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getProcessingType()
+	{
+		$this->processingType;
+	}
+
+	/**
+	 * @param string $processingType
+	 * @return $this
+	 */
+	public function setProcessingType($processingType)
+	{
+		$this->processingType = $processingType;
+		return $this;
+	}
 
 }

Classes/Thumbnail/VideoThumbnailProcessor.php

Indentation +92 added lines, -92 removed lines

@@ -17,96 +17,96 @@
 class VideoThumbnailProcessor extends AbstractThumbnailProcessor
 {
 
-    /**
-     * Render a thumbnail of a resource of type video.
-     *
-     * @return string
-     */
-    public function create()
-    {
-        $steps = $this->getRenderingSteps();
-
-        $result = '';
-        while ($step = array_shift($steps)) {
-            $result = $this->$step($result);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Render the URI of the thumbnail.
-     *
-     * @return string
-     */
-    public function renderUri()
-    {
-
-        $relativePath = sprintf('Icons/MimeType/%s.png', $this->getFile()->getProperty('extension'));
-        $fileNameAndPath = GeneralUtility::getFileAbsFileName('EXT:media/Resources/Public/' . $relativePath);
-        if (!file_exists($fileNameAndPath)) {
-            $relativePath = 'Icons/UnknownMimeType.png';
-        }
-
-        $uri = Path::getRelativePath($relativePath);
-        return $this->prefixUri($uri);
-    }
-
-    /**
-     * Render the tag image which is the main one for a thumbnail.
-     *
-     * @param string $result
-     * @return string
-     */
-    public function renderTagImage($result)
-    {
-
-        // Variable $result corresponds to an URL in this case.
-        // Analyse the URL and compute the adequate separator between arguments.
-        $parameterSeparator = strpos($result, '?') === false ? '?' : '&';
-
-        return sprintf(
-            '<img src="%s%s" title="%s" alt="%s" %s/>',
-            $result,
-            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->getFile()->getProperty('tstamp') : '',
-            $this->getTitle(),
-            $this->getTitle(),
-            $this->renderAttributes()
-        );
-    }
-
-    /**
-     * Compute and return the title of the file.
-     *
-     * @return string
-     */
-    protected function getTitle()
-    {
-        $result = $this->getFile()->getProperty('title');
-        if (!$result) {
-            $result = $this->getFile()->getName();
-        }
-        return htmlspecialchars($result);
-    }
-
-    /**
-     * Render a wrapping anchor around the thumbnail.
-     *
-     * @param string $result
-     * @return string
-     */
-    public function renderTagAnchor($result)
-    {
-
-        $file = $this->getFile();
-
-        return sprintf(
-            '<a href="%s%s" target="%s" data-uid="%s">%s</a>',
-            $this->thumbnailService->getAnchorUri() ? $this->thumbnailService->getAnchorUri() : $file->getPublicUrl(true),
-            $this->thumbnailService->getAppendTimeStamp() ? '?' . $file->getProperty('tstamp') : '',
-            $this->thumbnailService->getTarget(),
-            $file->getUid(),
-            $result
-        );
-    }
+	/**
+	 * Render a thumbnail of a resource of type video.
+	 *
+	 * @return string
+	 */
+	public function create()
+	{
+		$steps = $this->getRenderingSteps();
+
+		$result = '';
+		while ($step = array_shift($steps)) {
+			$result = $this->$step($result);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Render the URI of the thumbnail.
+	 *
+	 * @return string
+	 */
+	public function renderUri()
+	{
+
+		$relativePath = sprintf('Icons/MimeType/%s.png', $this->getFile()->getProperty('extension'));
+		$fileNameAndPath = GeneralUtility::getFileAbsFileName('EXT:media/Resources/Public/' . $relativePath);
+		if (!file_exists($fileNameAndPath)) {
+			$relativePath = 'Icons/UnknownMimeType.png';
+		}
+
+		$uri = Path::getRelativePath($relativePath);
+		return $this->prefixUri($uri);
+	}
+
+	/**
+	 * Render the tag image which is the main one for a thumbnail.
+	 *
+	 * @param string $result
+	 * @return string
+	 */
+	public function renderTagImage($result)
+	{
+
+		// Variable $result corresponds to an URL in this case.
+		// Analyse the URL and compute the adequate separator between arguments.
+		$parameterSeparator = strpos($result, '?') === false ? '?' : '&';
+
+		return sprintf(
+			'<img src="%s%s" title="%s" alt="%s" %s/>',
+			$result,
+			$this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->getFile()->getProperty('tstamp') : '',
+			$this->getTitle(),
+			$this->getTitle(),
+			$this->renderAttributes()
+		);
+	}
+
+	/**
+	 * Compute and return the title of the file.
+	 *
+	 * @return string
+	 */
+	protected function getTitle()
+	{
+		$result = $this->getFile()->getProperty('title');
+		if (!$result) {
+			$result = $this->getFile()->getName();
+		}
+		return htmlspecialchars($result);
+	}
+
+	/**
+	 * Render a wrapping anchor around the thumbnail.
+	 *
+	 * @param string $result
+	 * @return string
+	 */
+	public function renderTagAnchor($result)
+	{
+
+		$file = $this->getFile();
+
+		return sprintf(
+			'<a href="%s%s" target="%s" data-uid="%s">%s</a>',
+			$this->thumbnailService->getAnchorUri() ? $this->thumbnailService->getAnchorUri() : $file->getPublicUrl(true),
+			$this->thumbnailService->getAppendTimeStamp() ? '?' . $file->getProperty('tstamp') : '',
+			$this->thumbnailService->getTarget(),
+			$file->getUid(),
+			$result
+		);
+	}
 }

Classes/Thumbnail/ThumbnailConfiguration.php

Indentation +91 added lines, -91 removed lines

@@ -15,96 +15,96 @@
 class ThumbnailConfiguration
 {
 
-    /**
-     * @var int
-     */
-    protected $width = 0;
-
-    /**
-     * @var int
-     */
-    protected $height = 0;
-
-    /**
-     * @var string
-     */
-    protected $style = '';
-
-    /**
-     * @var string
-     */
-    protected $className = '';
-
-    /**
-     * @return int
-     */
-    public function getWidth()
-    {
-        return $this->width;
-    }
-
-    /**
-     * @param int $width
-     * @return $this
-     */
-    public function setWidth($width)
-    {
-        $this->width = $width;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getHeight()
-    {
-        return $this->height;
-    }
-
-    /**
-     * @param int $height
-     * @return $this
-     */
-    public function setHeight($height)
-    {
-        $this->height = $height;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getStyle()
-    {
-        return $this->style;
-    }
-
-    /**
-     * @param string $style
-     * @return $this
-     */
-    public function setStyle($style)
-    {
-        $this->style = $style;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getClassName()
-    {
-        return $this->className;
-    }
-
-    /**
-     * @param string $className
-     * @return $this
-     */
-    public function setClassName($className)
-    {
-        $this->className = $className;
-        return $this;
-    }
+	/**
+	 * @var int
+	 */
+	protected $width = 0;
+
+	/**
+	 * @var int
+	 */
+	protected $height = 0;
+
+	/**
+	 * @var string
+	 */
+	protected $style = '';
+
+	/**
+	 * @var string
+	 */
+	protected $className = '';
+
+	/**
+	 * @return int
+	 */
+	public function getWidth()
+	{
+		return $this->width;
+	}
+
+	/**
+	 * @param int $width
+	 * @return $this
+	 */
+	public function setWidth($width)
+	{
+		$this->width = $width;
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getHeight()
+	{
+		return $this->height;
+	}
+
+	/**
+	 * @param int $height
+	 * @return $this
+	 */
+	public function setHeight($height)
+	{
+		$this->height = $height;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getStyle()
+	{
+		return $this->style;
+	}
+
+	/**
+	 * @param string $style
+	 * @return $this
+	 */
+	public function setStyle($style)
+	{
+		$this->style = $style;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getClassName()
+	{
+		return $this->className;
+	}
+
+	/**
+	 * @param string $className
+	 * @return $this
+	 */
+	public function setClassName($className)
+	{
+		$this->className = $className;
+		return $this;
+	}
 
 }

Classes/Thumbnail/AudioThumbnailProcessor.php

Indentation +92 added lines, -92 removed lines

@@ -17,96 +17,96 @@
 class AudioThumbnailProcessor extends AbstractThumbnailProcessor
 {
 
-    /**
-     * Render a thumbnail of a resource of type audio.
-     *
-     * @return string
-     */
-    public function create()
-    {
-        $steps = $this->getRenderingSteps();
-
-        $result = '';
-        while ($step = array_shift($steps)) {
-            $result = $this->$step($result);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Render the URI of the thumbnail.
-     *
-     * @return string
-     */
-    public function renderUri()
-    {
-
-        $relativePath = sprintf('Icons/MimeType/%s.png', $this->getFile()->getProperty('extension'));
-        $fileNameAndPath = GeneralUtility::getFileAbsFileName('EXT:media/Resources/Public/' . $relativePath);
-        if (!file_exists($fileNameAndPath)) {
-            $relativePath = 'Icons/UnknownMimeType.png';
-        }
-
-        $uri = Path::getRelativePath($relativePath);
-        return $this->prefixUri($uri);
-    }
-
-    /**
-     * Render the tag image which is the main one for a thumbnail.
-     *
-     * @param string $result
-     * @return string
-     */
-    public function renderTagImage($result)
-    {
-
-        // Variable $result corresponds to an URL in this case.
-        // Analyse the URL and compute the adequate separator between arguments.
-        $parameterSeparator = strpos($result, '?') === false ? '?' : '&';
-
-        return sprintf(
-            '<img src="%s%s" title="%s" alt="%s" %s/>',
-            $result,
-            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->getFile()->getProperty('tstamp') : '',
-            $this->getTitle(),
-            $this->getTitle(),
-            $this->renderAttributes()
-        );
-    }
-
-    /**
-     * Compute and return the title of the file.
-     *
-     * @return string
-     */
-    protected function getTitle()
-    {
-        $result = $this->getFile()->getProperty('title');
-        if (!$result) {
-            $result = $this->getFile()->getName();
-        }
-        return htmlspecialchars($result);
-    }
-
-    /**
-     * Render a wrapping anchor around the thumbnail.
-     *
-     * @param string $result
-     * @return string
-     */
-    public function renderTagAnchor($result)
-    {
-
-        $file = $this->getFile();
-
-        return sprintf(
-            '<a href="%s%s" target="%s" data-uid="%s">%s</a>',
-            $this->thumbnailService->getAnchorUri() ? $this->thumbnailService->getAnchorUri() : $file->getPublicUrl(true),
-            $this->thumbnailService->getAppendTimeStamp() ? '?' . $file->getProperty('tstamp') : '',
-            $this->thumbnailService->getTarget(),
-            $file->getUid(),
-            $result
-        );
-    }
+	/**
+	 * Render a thumbnail of a resource of type audio.
+	 *
+	 * @return string
+	 */
+	public function create()
+	{
+		$steps = $this->getRenderingSteps();
+
+		$result = '';
+		while ($step = array_shift($steps)) {
+			$result = $this->$step($result);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Render the URI of the thumbnail.
+	 *
+	 * @return string
+	 */
+	public function renderUri()
+	{
+
+		$relativePath = sprintf('Icons/MimeType/%s.png', $this->getFile()->getProperty('extension'));
+		$fileNameAndPath = GeneralUtility::getFileAbsFileName('EXT:media/Resources/Public/' . $relativePath);
+		if (!file_exists($fileNameAndPath)) {
+			$relativePath = 'Icons/UnknownMimeType.png';
+		}
+
+		$uri = Path::getRelativePath($relativePath);
+		return $this->prefixUri($uri);
+	}
+
+	/**
+	 * Render the tag image which is the main one for a thumbnail.
+	 *
+	 * @param string $result
+	 * @return string
+	 */
+	public function renderTagImage($result)
+	{
+
+		// Variable $result corresponds to an URL in this case.
+		// Analyse the URL and compute the adequate separator between arguments.
+		$parameterSeparator = strpos($result, '?') === false ? '?' : '&';
+
+		return sprintf(
+			'<img src="%s%s" title="%s" alt="%s" %s/>',
+			$result,
+			$this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->getFile()->getProperty('tstamp') : '',
+			$this->getTitle(),
+			$this->getTitle(),
+			$this->renderAttributes()
+		);
+	}
+
+	/**
+	 * Compute and return the title of the file.
+	 *
+	 * @return string
+	 */
+	protected function getTitle()
+	{
+		$result = $this->getFile()->getProperty('title');
+		if (!$result) {
+			$result = $this->getFile()->getName();
+		}
+		return htmlspecialchars($result);
+	}
+
+	/**
+	 * Render a wrapping anchor around the thumbnail.
+	 *
+	 * @param string $result
+	 * @return string
+	 */
+	public function renderTagAnchor($result)
+	{
+
+		$file = $this->getFile();
+
+		return sprintf(
+			'<a href="%s%s" target="%s" data-uid="%s">%s</a>',
+			$this->thumbnailService->getAnchorUri() ? $this->thumbnailService->getAnchorUri() : $file->getPublicUrl(true),
+			$this->thumbnailService->getAppendTimeStamp() ? '?' . $file->getProperty('tstamp') : '',
+			$this->thumbnailService->getTarget(),
+			$file->getUid(),
+			$result
+		);
+	}
 }

Classes/Thumbnail/ApplicationThumbnailProcessor.php

Indentation +136 added lines, -136 removed lines

@@ -18,140 +18,140 @@
 class ApplicationThumbnailProcessor extends AbstractThumbnailProcessor
 {
 
-    /**
-     * Render a thumbnail of a resource of type application.
-     *
-     * @return string
-     */
-    public function create()
-    {
-
-        $steps = $this->getRenderingSteps();
-
-        $result = '';
-        while ($step = array_shift($steps)) {
-            $result = $this->$step($result);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Render the URI of the thumbnail.
-     *
-     * @return string
-     */
-    public function renderUri()
-    {
-        if ($this->isThumbnailPossible($this->getFile()->getExtension())) {
-            $this->processedFile = $this->getFile()->process($this->getProcessingType(), $this->getConfiguration());
-            $uri = $this->processedFile->getPublicUrl(true);
-
-            // Update time stamp of processed image at this stage. This is needed for the browser to get new version of the thumbnail.
-            if ($this->processedFile->getProperty('originalfilesha1') !== $this->getFile()->getProperty('sha1')) {
-                $this->processedFile->updateProperties(array('tstamp' => $this->getFile()->getProperty('tstamp')));
-            }
-        } else {
-            $uri = $this->getIcon($this->getFile()->getExtension());
-        }
-        return $this->prefixUri($uri);
-    }
-
-    /**
-     * Render the tag image which is the main one for a thumbnail.
-     *
-     * @param string $result
-     * @return string
-     */
-    public function renderTagImage($result)
-    {
-
-        // Variable $result corresponds to an URL in this case.
-        // Analyse the URL and compute the adequate separator between arguments.
-        $parameterSeparator = strpos($result, '?') === false ? '?' : '&';
-
-        return sprintf(
-            '<img src="%s%s" title="%s" alt="%s" %s/>',
-            $result,
-            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->getTimeStamp() : '',
-            $this->getTitle(),
-            $this->getTitle(),
-            $this->renderAttributes()
-        );
-    }
-
-    /**
-     * Compute and return the time stamp.
-     *
-     * @return int
-     */
-    protected function getTimeStamp()
-    {
-        $result = $this->getFile()->getProperty('tstamp');
-        if ($this->processedFile) {
-            $result = $this->processedFile->getProperty('tstamp');
-        }
-        return $result;
-    }
-
-    /**
-     * Compute and return the title of the file.
-     *
-     * @return string
-     */
-    protected function getTitle()
-    {
-        $result = $this->getFile()->getProperty('title');
-        if (empty($result)) {
-            $result = $this->getFile()->getName();
-        }
-        return htmlspecialchars($result);
-    }
-
-    /**
-     * Render a wrapping anchor around the thumbnail.
-     *
-     * @param string $result
-     * @return string
-     */
-    public function renderTagAnchor($result)
-    {
-        $uri = $this->thumbnailService->getAnchorUri();
-        if (!$uri) {
-            $uri = $this->getUri();
-        }
-
-        return sprintf(
-            '<a href="%s" target="_blank" data-uid="%s">%s</a>',
-            $uri,
-            $this->getFile()->getUid(),
-            $result
-        );
-    }
-
-    /**
-     * @return string
-     */
-    protected function getUri()
-    {
-        $urlParameters = array(
-            MediaModule::getParameterPrefix() => [
-                'controller' => 'Asset',
-                'action' => 'download',
-                'file' => $this->getFile()->getUid(),
-            ],
-        );
-        return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
-    }
-
-    /**
-     * @return string
-     */
-    public function getProcessingType()
-    {
-        if ($this->thumbnailService->getProcessingType() === null) {
-            return ProcessedFile::CONTEXT_IMAGECROPSCALEMASK;
-        }
-        return $this->thumbnailService->getProcessingType();
-    }
+	/**
+	 * Render a thumbnail of a resource of type application.
+	 *
+	 * @return string
+	 */
+	public function create()
+	{
+
+		$steps = $this->getRenderingSteps();
+
+		$result = '';
+		while ($step = array_shift($steps)) {
+			$result = $this->$step($result);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Render the URI of the thumbnail.
+	 *
+	 * @return string
+	 */
+	public function renderUri()
+	{
+		if ($this->isThumbnailPossible($this->getFile()->getExtension())) {
+			$this->processedFile = $this->getFile()->process($this->getProcessingType(), $this->getConfiguration());
+			$uri = $this->processedFile->getPublicUrl(true);
+
+			// Update time stamp of processed image at this stage. This is needed for the browser to get new version of the thumbnail.
+			if ($this->processedFile->getProperty('originalfilesha1') !== $this->getFile()->getProperty('sha1')) {
+				$this->processedFile->updateProperties(array('tstamp' => $this->getFile()->getProperty('tstamp')));
+			}
+		} else {
+			$uri = $this->getIcon($this->getFile()->getExtension());
+		}
+		return $this->prefixUri($uri);
+	}
+
+	/**
+	 * Render the tag image which is the main one for a thumbnail.
+	 *
+	 * @param string $result
+	 * @return string
+	 */
+	public function renderTagImage($result)
+	{
+
+		// Variable $result corresponds to an URL in this case.
+		// Analyse the URL and compute the adequate separator between arguments.
+		$parameterSeparator = strpos($result, '?') === false ? '?' : '&';
+
+		return sprintf(
+			'<img src="%s%s" title="%s" alt="%s" %s/>',
+			$result,
+			$this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->getTimeStamp() : '',
+			$this->getTitle(),
+			$this->getTitle(),
+			$this->renderAttributes()
+		);
+	}
+
+	/**
+	 * Compute and return the time stamp.
+	 *
+	 * @return int
+	 */
+	protected function getTimeStamp()
+	{
+		$result = $this->getFile()->getProperty('tstamp');
+		if ($this->processedFile) {
+			$result = $this->processedFile->getProperty('tstamp');
+		}
+		return $result;
+	}
+
+	/**
+	 * Compute and return the title of the file.
+	 *
+	 * @return string
+	 */
+	protected function getTitle()
+	{
+		$result = $this->getFile()->getProperty('title');
+		if (empty($result)) {
+			$result = $this->getFile()->getName();
+		}
+		return htmlspecialchars($result);
+	}
+
+	/**
+	 * Render a wrapping anchor around the thumbnail.
+	 *
+	 * @param string $result
+	 * @return string
+	 */
+	public function renderTagAnchor($result)
+	{
+		$uri = $this->thumbnailService->getAnchorUri();
+		if (!$uri) {
+			$uri = $this->getUri();
+		}
+
+		return sprintf(
+			'<a href="%s" target="_blank" data-uid="%s">%s</a>',
+			$uri,
+			$this->getFile()->getUid(),
+			$result
+		);
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getUri()
+	{
+		$urlParameters = array(
+			MediaModule::getParameterPrefix() => [
+				'controller' => 'Asset',
+				'action' => 'download',
+				'file' => $this->getFile()->getUid(),
+			],
+		);
+		return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getProcessingType()
+	{
+		if ($this->thumbnailService->getProcessingType() === null) {
+			return ProcessedFile::CONTEXT_IMAGECROPSCALEMASK;
+		}
+		return $this->thumbnailService->getProcessingType();
+	}
 }

Classes/Thumbnail/ImageThumbnailProcessor.php

Indentation +175 added lines, -175 removed lines

@@ -16,180 +16,180 @@
 class ImageThumbnailProcessor extends AbstractThumbnailProcessor
 {
 
-    /**
-     * @var array
-     */
-    protected $defaultConfigurationWrap = array(
-        'width' => 0,
-        'height' => 0,
-    );
-
-    /**
-     * Render a thumbnail of a resource of type image.
-     *
-     * @return string
-     */
-    public function create()
-    {
-        $steps = $this->getRenderingSteps();
-
-        $result = '';
-        while ($step = array_shift($steps)) {
-            $result = $this->$step($result);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Render the URI of the thumbnail.
-     *
-     * @return string
-     * @throws \Fab\Media\Exception\EmptyValueException
-     */
-    public function renderUri()
-    {
-
-        // Makes sure the width and the height of the thumbnail is not bigger than the actual file
-        $configuration = $this->getConfiguration();
-        if (!empty($configuration['width']) && $configuration['width'] > $this->getFile()->getProperty('width')) {
-            $configuration['width'] = $this->getFile()->getProperty('width');
-        }
-        if (!empty($configuration['height']) && $configuration['height'] > $this->getFile()->getProperty('height')) {
-            $configuration['height'] = $this->getFile()->getProperty('height');
-        }
-
-        $configuration = $this->computeFinalImageDimension($configuration);
-        $this->processedFile = $this->getFile()->process($this->getProcessingType(), $configuration);
-        $uri = $this->processedFile->getPublicUrl(true);
-
-        // Update time stamp of processed image at this stage. This is needed for the browser to get new version of the thumbnail.
-        if ($this->processedFile->getProperty('originalfilesha1') !== $this->getFile()->getProperty('sha1')) {
-            $this->processedFile->updateProperties(array('tstamp' => $this->getFile()->getProperty('tstamp')));
-        }
-
-        return $this->prefixUri($uri);
-    }
-
-    /**
-     * Render the tag image which is the main one for a thumbnail.
-     *
-     * @param string $result
-     * @return string
-     */
-    public function renderTagImage($result)
-    {
-
-        // Variable $result corresponds to an URL in this case.
-        // Analyse the URL and compute the adequate separator between arguments.
-        $parameterSeparator = strpos($result, '?') === false ? '?' : '&';
-
-        return sprintf('<img src="%s%s" title="%s" alt="%s" %s/>',
-            $result,
-            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->processedFile->getProperty('tstamp') : '',
-            $this->getTitle(),
-            $this->getTitle(),
-            $this->renderAttributes()
-        );
-    }
-
-    /**
-     * Compute and return the title of the file.
-     *
-     * @return string
-     */
-    protected function getTitle()
-    {
-        $result = $this->getFile()->getProperty('title');
-        if (!$result) {
-            $result = $this->getFile()->getName();
-        }
-        return htmlspecialchars($result);
-    }
-
-    /**
-     * Render a wrapping anchor around the thumbnail.
-     *
-     * @param string $result
-     * @return string
-     */
-    public function renderTagAnchor($result)
-    {
-
-        $file = $this->getFile();
-
-        // Perhaps the wrapping file must be processed
-        $configurationWrap = $this->thumbnailService->getConfigurationWrap();
-
-        // Make sure we have configurationWrap initialized correctly
-        if (!empty($configurationWrap['width']) || !empty($configurationWrap['height'])) {
-            $configurationWrap = array_merge($this->defaultConfigurationWrap, $configurationWrap);
-
-            // It looks maxW or maxH does not work as expected with CONTEXT_IMAGEPREVIEW...
-            // ... uses "width" and "height" instead.
-            if ($configurationWrap['width'] < $this->getFile()->getProperty('width')
-                || $configurationWrap['height'] < $this->getFile()->getProperty('height')
-            ) {
-                $configurationWrap = $this->computeFinalImageDimension($configurationWrap);
-                $file = $this->getFile()->process($this->getProcessingType(), $configurationWrap);
-            }
-        }
-
-        // Analyse the current $url and compute the adequate separator between arguments.
-        $url = $this->thumbnailService->getAnchorUri() ? $this->thumbnailService->getAnchorUri() : $file->getPublicUrl(true);
-        $parameterSeparator = strpos($url, '?') === false ? '?' : '&';
-
-        return sprintf('<a href="%s%s" target="%s" data-uid="%s">%s</a>',
-            $url,
-            $this->thumbnailService->getAppendTimeStamp() && !$this->thumbnailService->getAnchorUri() ? $parameterSeparator . $file->getProperty('tstamp') : '',
-            $this->thumbnailService->getTarget(),
-            $file->getUid(),
-            $result
-        );
-    }
-
-    /**
-     * Compute the final configuration for the image preview.
-     * Keep ratio of width / height for the image.
-     *
-     * @param array $configuration
-     * @return array
-     */
-    protected function computeFinalImageDimension(array $configuration)
-    {
-        $ratio = $this->computeImageRatio();
-
-        if ($ratio > 1) {
-            $configuration['height'] = round($configuration['width'] / $ratio);
-        } else {
-            $configuration['width'] = round($configuration['height'] * $ratio);
-        }
-        return $configuration;
-    }
-
-    /**
-     * Compute the width / height ratio of the image.
-     *
-     * @return null|float
-     */
-    protected function computeImageRatio()
-    {
-        $ratio = null;
-        if ($this->getFile()->getProperty('width') > 0 && $this->getFile()->getProperty('height') > 0) {
-            $ratio = $this->getFile()->getProperty('width') / $this->getFile()->getProperty('height');
-        }
-        return $ratio;
-    }
-
-    /**
-     * @return string
-     */
-    public function getProcessingType()
-    {
-        if ($this->thumbnailService->getProcessingType() === null) {
-            return ProcessedFile::CONTEXT_IMAGECROPSCALEMASK;
-        }
-        return $this->thumbnailService->getProcessingType();
-    }
+	/**
+	 * @var array
+	 */
+	protected $defaultConfigurationWrap = array(
+		'width' => 0,
+		'height' => 0,
+	);
+
+	/**
+	 * Render a thumbnail of a resource of type image.
+	 *
+	 * @return string
+	 */
+	public function create()
+	{
+		$steps = $this->getRenderingSteps();
+
+		$result = '';
+		while ($step = array_shift($steps)) {
+			$result = $this->$step($result);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Render the URI of the thumbnail.
+	 *
+	 * @return string
+	 * @throws \Fab\Media\Exception\EmptyValueException
+	 */
+	public function renderUri()
+	{
+
+		// Makes sure the width and the height of the thumbnail is not bigger than the actual file
+		$configuration = $this->getConfiguration();
+		if (!empty($configuration['width']) && $configuration['width'] > $this->getFile()->getProperty('width')) {
+			$configuration['width'] = $this->getFile()->getProperty('width');
+		}
+		if (!empty($configuration['height']) && $configuration['height'] > $this->getFile()->getProperty('height')) {
+			$configuration['height'] = $this->getFile()->getProperty('height');
+		}
+
+		$configuration = $this->computeFinalImageDimension($configuration);
+		$this->processedFile = $this->getFile()->process($this->getProcessingType(), $configuration);
+		$uri = $this->processedFile->getPublicUrl(true);
+
+		// Update time stamp of processed image at this stage. This is needed for the browser to get new version of the thumbnail.
+		if ($this->processedFile->getProperty('originalfilesha1') !== $this->getFile()->getProperty('sha1')) {
+			$this->processedFile->updateProperties(array('tstamp' => $this->getFile()->getProperty('tstamp')));
+		}
+
+		return $this->prefixUri($uri);
+	}
+
+	/**
+	 * Render the tag image which is the main one for a thumbnail.
+	 *
+	 * @param string $result
+	 * @return string
+	 */
+	public function renderTagImage($result)
+	{
+
+		// Variable $result corresponds to an URL in this case.
+		// Analyse the URL and compute the adequate separator between arguments.
+		$parameterSeparator = strpos($result, '?') === false ? '?' : '&';
+
+		return sprintf('<img src="%s%s" title="%s" alt="%s" %s/>',
+			$result,
+			$this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->processedFile->getProperty('tstamp') : '',
+			$this->getTitle(),
+			$this->getTitle(),
+			$this->renderAttributes()
+		);
+	}
+
+	/**
+	 * Compute and return the title of the file.
+	 *
+	 * @return string
+	 */
+	protected function getTitle()
+	{
+		$result = $this->getFile()->getProperty('title');
+		if (!$result) {
+			$result = $this->getFile()->getName();
+		}
+		return htmlspecialchars($result);
+	}
+
+	/**
+	 * Render a wrapping anchor around the thumbnail.
+	 *
+	 * @param string $result
+	 * @return string
+	 */
+	public function renderTagAnchor($result)
+	{
+
+		$file = $this->getFile();
+
+		// Perhaps the wrapping file must be processed
+		$configurationWrap = $this->thumbnailService->getConfigurationWrap();
+
+		// Make sure we have configurationWrap initialized correctly
+		if (!empty($configurationWrap['width']) || !empty($configurationWrap['height'])) {
+			$configurationWrap = array_merge($this->defaultConfigurationWrap, $configurationWrap);
+
+			// It looks maxW or maxH does not work as expected with CONTEXT_IMAGEPREVIEW...
+			// ... uses "width" and "height" instead.
+			if ($configurationWrap['width'] < $this->getFile()->getProperty('width')
+				|| $configurationWrap['height'] < $this->getFile()->getProperty('height')
+			) {
+				$configurationWrap = $this->computeFinalImageDimension($configurationWrap);
+				$file = $this->getFile()->process($this->getProcessingType(), $configurationWrap);
+			}
+		}
+
+		// Analyse the current $url and compute the adequate separator between arguments.
+		$url = $this->thumbnailService->getAnchorUri() ? $this->thumbnailService->getAnchorUri() : $file->getPublicUrl(true);
+		$parameterSeparator = strpos($url, '?') === false ? '?' : '&';
+
+		return sprintf('<a href="%s%s" target="%s" data-uid="%s">%s</a>',
+			$url,
+			$this->thumbnailService->getAppendTimeStamp() && !$this->thumbnailService->getAnchorUri() ? $parameterSeparator . $file->getProperty('tstamp') : '',
+			$this->thumbnailService->getTarget(),
+			$file->getUid(),
+			$result
+		);
+	}
+
+	/**
+	 * Compute the final configuration for the image preview.
+	 * Keep ratio of width / height for the image.
+	 *
+	 * @param array $configuration
+	 * @return array
+	 */
+	protected function computeFinalImageDimension(array $configuration)
+	{
+		$ratio = $this->computeImageRatio();
+
+		if ($ratio > 1) {
+			$configuration['height'] = round($configuration['width'] / $ratio);
+		} else {
+			$configuration['width'] = round($configuration['height'] * $ratio);
+		}
+		return $configuration;
+	}
+
+	/**
+	 * Compute the width / height ratio of the image.
+	 *
+	 * @return null|float
+	 */
+	protected function computeImageRatio()
+	{
+		$ratio = null;
+		if ($this->getFile()->getProperty('width') > 0 && $this->getFile()->getProperty('height') > 0) {
+			$ratio = $this->getFile()->getProperty('width') / $this->getFile()->getProperty('height');
+		}
+		return $ratio;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getProcessingType()
+	{
+		if ($this->thumbnailService->getProcessingType() === null) {
+			return ProcessedFile::CONTEXT_IMAGECROPSCALEMASK;
+		}
+		return $this->thumbnailService->getProcessingType();
+	}
 
 }

Classes/Dimension.php

Indentation +35 added lines, -35 removed lines

@@ -16,39 +16,39 @@
 class Dimension
 {
 
-    /**
-     * @var int
-     */
-    protected $width = 0;
-
-    /**
-     * @var int
-     */
-    protected $height = 0;
-
-    /**
-     * @param string $dimension
-     */
-    public function __construct($dimension)
-    {
-        $dimensions = GeneralUtility::trimExplode('x', $dimension);
-        $this->width = empty($dimensions[0]) ? 0 : $dimensions[0];
-        $this->height = empty($dimensions[1]) ? 0 : $dimensions[1];
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getWidth()
-    {
-        return $this->width;
-    }
-
-    /**
-     * @return int
-     */
-    public function getHeight()
-    {
-        return $this->height;
-    }
+	/**
+	 * @var int
+	 */
+	protected $width = 0;
+
+	/**
+	 * @var int
+	 */
+	protected $height = 0;
+
+	/**
+	 * @param string $dimension
+	 */
+	public function __construct($dimension)
+	{
+		$dimensions = GeneralUtility::trimExplode('x', $dimension);
+		$this->width = empty($dimensions[0]) ? 0 : $dimensions[0];
+		$this->height = empty($dimensions[1]) ? 0 : $dimensions[1];
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getWidth()
+	{
+		return $this->width;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getHeight()
+	{
+		return $this->height;
+	}
 }

Classes/Form/AbstractFormField.php

Indentation +262 added lines, -262 removed lines

@@ -18,267 +18,267 @@
 abstract class AbstractFormField implements FormFieldInterface
 {
 
-    /**
-     * @var string
-     */
-    protected $template = '';
-
-    /**
-     * @var string
-     */
-    protected $value = '';
-
-    /**
-     * @var string
-     */
-    protected $name = '';
-
-    /**
-     * @var string
-     */
-    protected $id = '';
-
-    /**
-     * @var string
-     */
-    protected $prefix = '';
-
-    /**
-     * @var string
-     */
-    protected $label = '';
-
-    /**
-     * Store what child element will contain this element.
-     *
-     * @var array
-     */
-    protected $items = [];
-
-    /**
-     * Attributes in sense of DOM attribute, e.g. class, style, etc...
-     *
-     * @var array
-     */
-    protected $attributes = [];
-
-    /**
-     * @return string
-     */
-    public function render()
-    {
-        return $this->template;
-    }
-
-    /**
-     * Render the label if possible. Otherwise return an empty string.
-     *
-     * @return string
-     */
-    public function renderLabel()
-    {
-        $result = '';
-        if ($this->label) {
-            $template = '<label class="control-label" for="%s">%s</label>';
-
-            if (strpos($this->label, 'LLL:') === 0) {
-                $this->label = LocalizationUtility::translate($this->label, '');
-            }
-
-            $result = sprintf($template,
-                $this->getId(),
-                $this->label
-            );
-        }
-        return $result;
-    }
-
-    /**
-     * Render additional attribute for this DOM element.
-     *
-     * @return string
-     */
-    public function renderAttributes()
-    {
-        $result = '';
-        if (!empty($this->attributes)) {
-            foreach ($this->attributes as $attribute => $value) {
-                $result .= sprintf('%s="%s" ',
-                    htmlspecialchars($attribute),
-                    htmlspecialchars($value)
-                );
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Add an additional (DOM) attribute to be added to this template.
-     *
-     * @throws InvalidStringException
-     * @param array $attribute associative array that contains attribute => value
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function addAttribute(array $attribute)
-    {
-        if (!empty($attribute)) {
-            reset($attribute);
-            $key = key($attribute);
-            if (!is_string($key)) {
-                throw new InvalidStringException('Not an associative array. Is not a key: ' . $key, 1356478742);
-            }
-
-            $this->attributes[$key] = $attribute[$key];
-        }
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTemplate()
-    {
-        return $this->template;
-    }
-
-    /**
-     * @param string $template
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setTemplate($template)
-    {
-        $this->template = $template;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLabel()
-    {
-        return $this->label;
-    }
-
-    /**
-     * @param string $label
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setLabel($label)
-    {
-        $this->label = $label;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPrefix()
-    {
-        return $this->prefix;
-    }
-
-    /**
-     * @param string $prefix
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setPrefix($prefix)
-    {
-        $this->prefix = $prefix;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getItems()
-    {
-        return $this->items;
-    }
-
-    /**
-     * @param array $items
-     */
-    public function setItems($items)
-    {
-        $this->items = $items;
-    }
-
-    /**
-     * @return string
-     */
-    public function getValue()
-    {
-        return htmlspecialchars($this->value);
-    }
-
-    /**
-     * @param string $value
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setValue($value)
-    {
-        $this->value = $value;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        $result = $this->name;
-        if ($this->getPrefix()) {
-            $result = sprintf('%s[%s]', $this->getPrefix(), $this->name);
-        }
-        return $result;
-    }
-
-    /**
-     * @param string $name
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getId()
-    {
-        if ($this->id === '') {
-            $this->id = DomElement::getInstance()->formatId($this->getName());
-        }
-        return $this->id;
-    }
-
-    /**
-     * @param string $id
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setId($id)
-    {
-        $this->id = $id;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getAttributes()
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * @param array $attributes
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setAttributes($attributes)
-    {
-        $this->attributes = $attributes;
-        return $this;
-    }
+	/**
+	 * @var string
+	 */
+	protected $template = '';
+
+	/**
+	 * @var string
+	 */
+	protected $value = '';
+
+	/**
+	 * @var string
+	 */
+	protected $name = '';
+
+	/**
+	 * @var string
+	 */
+	protected $id = '';
+
+	/**
+	 * @var string
+	 */
+	protected $prefix = '';
+
+	/**
+	 * @var string
+	 */
+	protected $label = '';
+
+	/**
+	 * Store what child element will contain this element.
+	 *
+	 * @var array
+	 */
+	protected $items = [];
+
+	/**
+	 * Attributes in sense of DOM attribute, e.g. class, style, etc...
+	 *
+	 * @var array
+	 */
+	protected $attributes = [];
+
+	/**
+	 * @return string
+	 */
+	public function render()
+	{
+		return $this->template;
+	}
+
+	/**
+	 * Render the label if possible. Otherwise return an empty string.
+	 *
+	 * @return string
+	 */
+	public function renderLabel()
+	{
+		$result = '';
+		if ($this->label) {
+			$template = '<label class="control-label" for="%s">%s</label>';
+
+			if (strpos($this->label, 'LLL:') === 0) {
+				$this->label = LocalizationUtility::translate($this->label, '');
+			}
+
+			$result = sprintf($template,
+				$this->getId(),
+				$this->label
+			);
+		}
+		return $result;
+	}
+
+	/**
+	 * Render additional attribute for this DOM element.
+	 *
+	 * @return string
+	 */
+	public function renderAttributes()
+	{
+		$result = '';
+		if (!empty($this->attributes)) {
+			foreach ($this->attributes as $attribute => $value) {
+				$result .= sprintf('%s="%s" ',
+					htmlspecialchars($attribute),
+					htmlspecialchars($value)
+				);
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * Add an additional (DOM) attribute to be added to this template.
+	 *
+	 * @throws InvalidStringException
+	 * @param array $attribute associative array that contains attribute => value
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function addAttribute(array $attribute)
+	{
+		if (!empty($attribute)) {
+			reset($attribute);
+			$key = key($attribute);
+			if (!is_string($key)) {
+				throw new InvalidStringException('Not an associative array. Is not a key: ' . $key, 1356478742);
+			}
+
+			$this->attributes[$key] = $attribute[$key];
+		}
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getTemplate()
+	{
+		return $this->template;
+	}
+
+	/**
+	 * @param string $template
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setTemplate($template)
+	{
+		$this->template = $template;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLabel()
+	{
+		return $this->label;
+	}
+
+	/**
+	 * @param string $label
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setLabel($label)
+	{
+		$this->label = $label;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getPrefix()
+	{
+		return $this->prefix;
+	}
+
+	/**
+	 * @param string $prefix
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setPrefix($prefix)
+	{
+		$this->prefix = $prefix;
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getItems()
+	{
+		return $this->items;
+	}
+
+	/**
+	 * @param array $items
+	 */
+	public function setItems($items)
+	{
+		$this->items = $items;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getValue()
+	{
+		return htmlspecialchars($this->value);
+	}
+
+	/**
+	 * @param string $value
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setValue($value)
+	{
+		$this->value = $value;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		$result = $this->name;
+		if ($this->getPrefix()) {
+			$result = sprintf('%s[%s]', $this->getPrefix(), $this->name);
+		}
+		return $result;
+	}
+
+	/**
+	 * @param string $name
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setName($name)
+	{
+		$this->name = $name;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getId()
+	{
+		if ($this->id === '') {
+			$this->id = DomElement::getInstance()->formatId($this->getName());
+		}
+		return $this->id;
+	}
+
+	/**
+	 * @param string $id
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setId($id)
+	{
+		$this->id = $id;
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getAttributes()
+	{
+		return $this->attributes;
+	}
+
+	/**
+	 * @param array $attributes
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setAttributes($attributes)
+	{
+		$this->attributes = $attributes;
+		return $this;
+	}
 
 }