fabarea / media

Tests/Functional/Form/FileUploadTest.php

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 	public function setUp() {
 		parent::setUp();
 
-        $this->fixture = $this->getMock('Fab\Media\Form\FileUpload', array('addLanguage'));
+		$this->fixture = $this->getMock('Fab\Media\Form\FileUpload', array('addLanguage'));
 		$this->fakeName = uniqid('name');
 		$this->fakePrefix= uniqid('prefix');
 	}

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
 
 use Fab\Media\Tests\Functional\AbstractFunctionalTestCase;
 
-require_once dirname(dirname(__FILE__)) . '/AbstractFunctionalTestCase.php';
+require_once dirname(dirname(__FILE__)).'/AbstractFunctionalTestCase.php';
 
 /**
  * Test case for class \Fab\Media\Form\FileUpload.
@@ -43,7 +43,7 @@ 
 
         $this->fixture = $this->getMock('Fab\Media\Form\FileUpload', array('addLanguage'));
 		$this->fakeName = uniqid('name');
-		$this->fakePrefix= uniqid('prefix');
+		$this->fakePrefix = uniqid('prefix');
 	}
 
 	public function tearDown() {
@@ -83,7 +83,7 @@ 
 		$method->setAccessible(TRUE);
 
 		$basePart = uniqid();
-		$fakePrefix = $basePart . '[foo]';
+		$fakePrefix = $basePart.'[foo]';
 		$actual = $method->invokeArgs($this->fixture, array($fakePrefix));
 		$this->assertSame($basePart, $actual);
 	}

Tests/Feature/bootstrap/FeatureContext.php

Indentation +10 added lines, -10 removed lines

@@ -14,16 +14,16 @@
  */
 class FeatureContext extends MinkContext
 {
-    /**
-     * Initializes context.
-     * Every scenario gets it's own context object.
-     *
-     * @param array $parameters context parameters (set them up through behat.yml)
-     */
-    public function __construct(array $parameters)
-    {
-        // Initialize your context here
-    }
+	/**
+	 * Initializes context.
+	 * Every scenario gets it's own context object.
+	 *
+	 * @param array $parameters context parameters (set them up through behat.yml)
+	 */
+	public function __construct(array $parameters)
+	{
+		// Initialize your context here
+	}
 
 	/**
 	 * @Given /^I wait "([^"]*)" seconds$/

Classes/View/Plugin/LinkCreatorPlugin.php

Indentation +40 added lines, -40 removed lines

@@ -27,50 +27,50 @@
 class LinkCreatorPlugin extends AbstractComponentView
 {
 
-    /**
-     * Renders a hidden link for link creator.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $result = '';
-        if ($this->getModuleLoader()->hasPlugin('linkCreator')) {
+	/**
+	 * Renders a hidden link for link creator.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$result = '';
+		if ($this->getModuleLoader()->hasPlugin('linkCreator')) {
 
-            // Load Require JS code
-            $this->loadRequireJsCode();
+			// Load Require JS code
+			$this->loadRequireJsCode();
 
-            $result = sprintf('<a href="%s" id="btn-linkCreator-current" class="btn btn-linkCreator" style="display: none"></a>',
-                $this->getLinkCreatorUri()
-            );
-        };
-        return $result;
-    }
+			$result = sprintf('<a href="%s" id="btn-linkCreator-current" class="btn btn-linkCreator" style="display: none"></a>',
+				$this->getLinkCreatorUri()
+			);
+		};
+		return $result;
+	}
 
-    /**
-     * @return string
-     */
-    protected function getLinkCreatorUri()
-    {
-        $urlParameters = array(
-            MediaModule::getParameterPrefix() => array(
-                'controller' => 'LinkCreator',
-                'action' => 'show',
-            ),
-        );
-        return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
-    }
+	/**
+	 * @return string
+	 */
+	protected function getLinkCreatorUri()
+	{
+		$urlParameters = array(
+			MediaModule::getParameterPrefix() => array(
+				'controller' => 'LinkCreator',
+				'action' => 'show',
+			),
+		);
+		return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
+	}
 
-    /**
-     * @return void
-     */
-    protected function loadRequireJsCode()
-    {
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+	/**
+	 * @return void
+	 */
+	protected function loadRequireJsCode()
+	{
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
 
-        $configuration['paths']['Fab/Media'] = '../typo3conf/ext/media/Resources/Public/JavaScript';
-        $pageRenderer->addRequireJsConfiguration($configuration);
-        $pageRenderer->loadRequireJsModule('Fab/Media/PluginLinkCreator');
-    }
+		$configuration['paths']['Fab/Media'] = '../typo3conf/ext/media/Resources/Public/JavaScript';
+		$pageRenderer->addRequireJsConfiguration($configuration);
+		$pageRenderer->loadRequireJsModule('Fab/Media/PluginLinkCreator');
+	}
 
 }

Classes/View/Plugin/ImageEditorPlugin.php

Indentation +40 added lines, -40 removed lines

@@ -27,50 +27,50 @@
 class ImageEditorPlugin extends AbstractComponentView
 {
 
-    /**
-     * Renders a hidden link for image editor.
-     *
-     * @return string
-     */
-    public function render()
-    {
+	/**
+	 * Renders a hidden link for image editor.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
 
-        $result = '';
-        if ($this->getModuleLoader()->hasPlugin('imageEditor')) {
+		$result = '';
+		if ($this->getModuleLoader()->hasPlugin('imageEditor')) {
 
-            // Load Require JS code
-            $this->loadRequireJsCode();
+			// Load Require JS code
+			$this->loadRequireJsCode();
 
-            $result = sprintf('<a href="%s" id="btn-imageEditor-current" class="btn btn-imageEditor" style="display: none"></a>',
-                $this->getImageEditorUri()
-            );
-        };
-        return $result;
-    }
+			$result = sprintf('<a href="%s" id="btn-imageEditor-current" class="btn btn-imageEditor" style="display: none"></a>',
+				$this->getImageEditorUri()
+			);
+		};
+		return $result;
+	}
 
-    /**
-     * @return string
-     */
-    protected function getImageEditorUri()
-    {
-        $urlParameters = array(
-            MediaModule::getParameterPrefix() => array(
-                'controller' => 'ImageEditor',
-                'action' => 'show',
-            ),
-        );
-        return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
-    }
+	/**
+	 * @return string
+	 */
+	protected function getImageEditorUri()
+	{
+		$urlParameters = array(
+			MediaModule::getParameterPrefix() => array(
+				'controller' => 'ImageEditor',
+				'action' => 'show',
+			),
+		);
+		return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
+	}
 
-    /**
-     * @return void
-     */
-    protected function loadRequireJsCode()
-    {
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+	/**
+	 * @return void
+	 */
+	protected function loadRequireJsCode()
+	{
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
 
-        $configuration['paths']['Fab/Media'] = '../typo3conf/ext/media/Resources/Public/JavaScript';
-        $pageRenderer->addRequireJsConfiguration($configuration);
-        $pageRenderer->loadRequireJsModule('Fab/Media/PluginImageEditor');
-    }
+		$configuration['paths']['Fab/Media'] = '../typo3conf/ext/media/Resources/Public/JavaScript';
+		$pageRenderer->addRequireJsConfiguration($configuration);
+		$pageRenderer->loadRequireJsModule('Fab/Media/PluginImageEditor');
+	}
 }

Classes/Controller/LinkCreatorController.php

Indentation +27 added lines, -27 removed lines

@@ -23,32 +23,32 @@
 class LinkCreatorController extends ActionController
 {
 
-    /**
-     * Initializes the controller before invoking an action method.
-     */
-    public function initializeAction()
-    {
-
-        // Configure property mapping to retrieve the file object.
-        if ($this->arguments->hasArgument('file')) {
-
-            /** @var \Fab\Media\TypeConverter\FileConverter $typeConverter */
-            $typeConverter = $this->objectManager->get('Fab\Media\TypeConverter\FileConverter');
-
-            $propertyMappingConfiguration = $this->arguments->getArgument('file')->getPropertyMappingConfiguration();
-            $propertyMappingConfiguration->setTypeConverter($typeConverter);
-        }
-    }
-
-    /**
-     * Handle GUI for creating a link in the RTE.
-     *
-     * @param File $file
-     * @return void
-     */
-    public function showAction(File $file)
-    {
-        $this->view->assign('file', $file);
-    }
+	/**
+	 * Initializes the controller before invoking an action method.
+	 */
+	public function initializeAction()
+	{
+
+		// Configure property mapping to retrieve the file object.
+		if ($this->arguments->hasArgument('file')) {
+
+			/** @var \Fab\Media\TypeConverter\FileConverter $typeConverter */
+			$typeConverter = $this->objectManager->get('Fab\Media\TypeConverter\FileConverter');
+
+			$propertyMappingConfiguration = $this->arguments->getArgument('file')->getPropertyMappingConfiguration();
+			$propertyMappingConfiguration->setTypeConverter($typeConverter);
+		}
+	}
+
+	/**
+	 * Handle GUI for creating a link in the RTE.
+	 *
+	 * @param File $file
+	 * @return void
+	 */
+	public function showAction(File $file)
+	{
+		$this->view->assign('file', $file);
+	}
 
 }

Classes/View/Plugin/FilePickerPlugin.php

Indentation +25 added lines, -25 removed lines

@@ -25,30 +25,30 @@
 class FilePickerPlugin extends AbstractComponentView
 {
 
-    /**
-     * Renders a hidden link for file picker.
-     *
-     * @return string
-     */
-    public function render()
-    {
-
-        if ($this->getModuleLoader()->hasPlugin('filePicker')) {
-            $this->loadRequireJsCode();
-        };
-        return '';
-    }
-
-    /**
-     * @return void
-     */
-    protected function loadRequireJsCode()
-    {
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-
-        $configuration['paths']['Fab/Media'] = '../typo3conf/ext/media/Resources/Public/JavaScript';
-        $pageRenderer->addRequireJsConfiguration($configuration);
-        $pageRenderer->loadRequireJsModule('Fab/Media/PluginFilePicker');
-    }
+	/**
+	 * Renders a hidden link for file picker.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+
+		if ($this->getModuleLoader()->hasPlugin('filePicker')) {
+			$this->loadRequireJsCode();
+		};
+		return '';
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function loadRequireJsCode()
+	{
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+
+		$configuration['paths']['Fab/Media'] = '../typo3conf/ext/media/Resources/Public/JavaScript';
+		$pageRenderer->addRequireJsConfiguration($configuration);
+		$pageRenderer->loadRequireJsModule('Fab/Media/PluginFilePicker');
+	}
 
 }

Classes/Utility/ImagePresetUtility.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
     {
         $size = ConfigurationUtility::getInstance()->get($preset);
         if (is_null($size)) {
-            throw new \Fab\Media\Exception\EmptyValueException('No value for preset: ' . $preset, 1362501066);
+            throw new \Fab\Media\Exception\EmptyValueException('No value for preset: '.$preset, 1362501066);
         }
 
         $this->currentPreset = $preset;

Indentation +80 added lines, -80 removed lines

@@ -16,92 +16,92 @@
 class ImagePresetUtility implements \TYPO3\CMS\Core\SingletonInterface
 {
 
-    /**
-     * @var array
-     */
-    protected $store = [];
+	/**
+	 * @var array
+	 */
+	protected $store = [];
 
-    /**
-     * @var string
-     */
-    protected $currentPreset = '';
+	/**
+	 * @var string
+	 */
+	protected $currentPreset = '';
 
-    /**
-     * Returns a class instance
-     *
-     * @return \Fab\Media\Utility\ImagePresetUtility|object
-     */
-    static public function getInstance()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Utility\ImagePresetUtility::class);
-    }
+	/**
+	 * Returns a class instance
+	 *
+	 * @return \Fab\Media\Utility\ImagePresetUtility|object
+	 */
+	static public function getInstance()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Utility\ImagePresetUtility::class);
+	}
 
-    /**
-     * Set the current preset value. Preset values come from the settings and can be:
-     * image_thumbnail, image_mini, image_small, image_medium, image_large
-     *
-     * @throws \Fab\Media\Exception\EmptyValueException
-     * @param string $preset image_thumbnail, image_mini, ...
-     * @return \Fab\Media\Utility\ImagePresetUtility
-     */
-    public function preset($preset)
-    {
-        $size = ConfigurationUtility::getInstance()->get($preset);
-        if (is_null($size)) {
-            throw new \Fab\Media\Exception\EmptyValueException('No value for preset: ' . $preset, 1362501066);
-        }
+	/**
+	 * Set the current preset value. Preset values come from the settings and can be:
+	 * image_thumbnail, image_mini, image_small, image_medium, image_large
+	 *
+	 * @throws \Fab\Media\Exception\EmptyValueException
+	 * @param string $preset image_thumbnail, image_mini, ...
+	 * @return \Fab\Media\Utility\ImagePresetUtility
+	 */
+	public function preset($preset)
+	{
+		$size = ConfigurationUtility::getInstance()->get($preset);
+		if (is_null($size)) {
+			throw new \Fab\Media\Exception\EmptyValueException('No value for preset: ' . $preset, 1362501066);
+		}
 
-        $this->currentPreset = $preset;
-        if (!isset($this->store[$this->currentPreset])) {
-            // @todo use object Dimension instead
-            $dimensions = GeneralUtility::trimExplode('x', $size);
-            $this->store[$this->currentPreset]['width'] = empty($dimensions[0]) ? 0 : $dimensions[0];
-            $this->store[$this->currentPreset]['height'] = empty($dimensions[1]) ? 0 : $dimensions[1];
-        }
-        return $this;
-    }
+		$this->currentPreset = $preset;
+		if (!isset($this->store[$this->currentPreset])) {
+			// @todo use object Dimension instead
+			$dimensions = GeneralUtility::trimExplode('x', $size);
+			$this->store[$this->currentPreset]['width'] = empty($dimensions[0]) ? 0 : $dimensions[0];
+			$this->store[$this->currentPreset]['height'] = empty($dimensions[1]) ? 0 : $dimensions[1];
+		}
+		return $this;
+	}
 
-    /**
-     * @return array
-     */
-    public function getStore()
-    {
-        return $this->store;
-    }
+	/**
+	 * @return array
+	 */
+	public function getStore()
+	{
+		return $this->store;
+	}
 
-    /**
-     * @param array $store
-     */
-    public function setStore($store)
-    {
-        $this->store = $store;
-    }
+	/**
+	 * @param array $store
+	 */
+	public function setStore($store)
+	{
+		$this->store = $store;
+	}
 
-    /**
-     * Returns width of the current preset.
-     *
-     * @throws \Fab\Media\Exception\InvalidKeyInArrayException
-     * @return int
-     */
-    public function getWidth()
-    {
-        if (empty($this->store[$this->currentPreset])) {
-            throw new \Fab\Media\Exception\InvalidKeyInArrayException('No existing values for current preset. Have you set a preset?', 1362501853);
-        }
-        return (int)$this->store[$this->currentPreset]['width'];
-    }
+	/**
+	 * Returns width of the current preset.
+	 *
+	 * @throws \Fab\Media\Exception\InvalidKeyInArrayException
+	 * @return int
+	 */
+	public function getWidth()
+	{
+		if (empty($this->store[$this->currentPreset])) {
+			throw new \Fab\Media\Exception\InvalidKeyInArrayException('No existing values for current preset. Have you set a preset?', 1362501853);
+		}
+		return (int)$this->store[$this->currentPreset]['width'];
+	}
 
-    /**
-     * Returns height of the current preset.
-     *
-     * @throws \Fab\Media\Exception\InvalidKeyInArrayException
-     * @return int
-     */
-    public function getHeight()
-    {
-        if (empty($this->store[$this->currentPreset])) {
-            throw new \Fab\Media\Exception\InvalidKeyInArrayException('No existing values for current preset. Have you set a preset?', 1362501853);
-        }
-        return (int)$this->store[$this->currentPreset]['height'];
-    }
+	/**
+	 * Returns height of the current preset.
+	 *
+	 * @throws \Fab\Media\Exception\InvalidKeyInArrayException
+	 * @return int
+	 */
+	public function getHeight()
+	{
+		if (empty($this->store[$this->currentPreset])) {
+			throw new \Fab\Media\Exception\InvalidKeyInArrayException('No existing values for current preset. Have you set a preset?', 1362501853);
+		}
+		return (int)$this->store[$this->currentPreset]['height'];
+	}
 }

Classes/Thumbnail/AbstractThumbnailProcessor.php

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
     public function prefixUri($uri)
     {
         if ($this->isFrontendMode() && $this->getFrontendObject()->absRefPrefix) {
-            $uri = $this->getFrontendObject()->absRefPrefix . $uri;
+            $uri = $this->getFrontendObject()->absRefPrefix.$uri;
         }
         return $uri;
     }

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/ImageThumbnailProcessor.php

Spacing +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
 
         return sprintf('<img src="%s%s" title="%s" alt="%s" %s/>',
             $result,
-            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->processedFile->getProperty('tstamp') : '',
+            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator.$this->processedFile->getProperty('tstamp') : '',
             $this->getTitle(),
             $this->getTitle(),
             $this->renderAttributes()
@@ -146,7 +146,7 @@ 
 
         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->getAppendTimeStamp() && !$this->thumbnailService->getAnchorUri() ? $parameterSeparator.$file->getProperty('tstamp') : '',
             $this->thumbnailService->getTarget(),
             $file->getUid(),
             $result

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();
+	}
 
 }