fabarea / media

Configuration/TCA/Overrides/sys_file_storage.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 
 $tca = [
     'types' => [
-        0 => ['showitem' => $GLOBALS['TCA']['sys_file_storage']['types'][0]['showitem'] . ',
+        0 => ['showitem' => $GLOBALS['TCA']['sys_file_storage']['types'][0]['showitem'].',
 
 			--div--;LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:tab.upload_settings,
 			maximum_dimension_original_image, extension_allowed_file_type_1, extension_allowed_file_type_2, extension_allowed_file_type_3, extension_allowed_file_type_4, extension_allowed_file_type_5,
@@ -81,7 +81,7 @@ 
     $tcaForHiddenFolderTree = [
 
         'types' => [
-            0 => ['showitem' => $GLOBALS['TCA']['sys_file_storage']['types'][0]['showitem'] . ',
+            0 => ['showitem' => $GLOBALS['TCA']['sys_file_storage']['types'][0]['showitem'].',
 
 			--div--;LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:tab.media_mount_point,
 			mount_point_file_type_1, mount_point_file_type_2, mount_point_file_type_3, mount_point_file_type_4, mount_point_file_type_5,

Indentation +184 added lines, -184 removed lines

@@ -2,82 +2,82 @@ 
 if (!defined('TYPO3_MODE')) die ('Access denied.');
 
 $configuration = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-    TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class
+	TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class
 )->get('media');
 
 $tca = [
-    'types' => [
-        0 => ['showitem' => $GLOBALS['TCA']['sys_file_storage']['types'][0]['showitem'] . ',
+	'types' => [
+		0 => ['showitem' => $GLOBALS['TCA']['sys_file_storage']['types'][0]['showitem'] . ',
 
 			--div--;LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:tab.upload_settings,
 			maximum_dimension_original_image, extension_allowed_file_type_1, extension_allowed_file_type_2, extension_allowed_file_type_3, extension_allowed_file_type_4, extension_allowed_file_type_5,
 				',
-        ],
-    ],
-    'columns' => [
-        'maximum_dimension_original_image' => [
-            'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.maximum_dimension_original_image',
-            'config' => [
-                'type' => 'input',
-                'size' => 24,
-                'default' => '1920x1920',
-                'eval' => 'trim',
-            ],
-        ],
-        'extension_allowed_file_type_1' => [
-            'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.extension_allowed_file_type_1',
-            'config' => [
-                'type' => 'input',
-                'size' => 255,
-                'default' => 'txt, html',
-                'eval' => 'trim',
-            ],
-        ],
-        'extension_allowed_file_type_2' => [
-            'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.extension_allowed_file_type_2',
-            'config' => [
-                'type' => 'input',
-                'size' => 255,
-                'default' => 'jpg, jpeg, bmp, png, tiff, tif, gif, eps',
-                'eval' => 'trim',
-            ],
-        ],
-        'extension_allowed_file_type_3' => [
-            'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.extension_allowed_file_type_3',
-            'config' => [
-                'type' => 'input',
-                'size' => 255,
-                'default' => 'mp3, mp4, m4a, wma, f4a',
-                'eval' => 'trim',
-            ],
-        ],
-        'extension_allowed_file_type_4' => [
-            'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.extension_allowed_file_type_4',
-            'config' => [
-                'type' => 'input',
-                'size' => 255,
-                'default' => 'mov, avi, mpeg, mpg, mp4, m4v, flv, f4v, webm, wmv, ogv, 3gp',
-                'eval' => 'trim',
-            ],
-        ],
-        'extension_allowed_file_type_5' => [
-            'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.extension_allowed_file_type_5',
-            'config' => [
-                'type' => 'input',
-                'size' => 255,
-                'default' => 'pdf, zip, doc, docx, dotx, ppt, pptx, pps, ppsx, odt, xls, xlsx, xltx, rtf, xlt',
-                'eval' => 'trim',
-            ],
-        ],
-    ],
+		],
+	],
+	'columns' => [
+		'maximum_dimension_original_image' => [
+			'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.maximum_dimension_original_image',
+			'config' => [
+				'type' => 'input',
+				'size' => 24,
+				'default' => '1920x1920',
+				'eval' => 'trim',
+			],
+		],
+		'extension_allowed_file_type_1' => [
+			'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.extension_allowed_file_type_1',
+			'config' => [
+				'type' => 'input',
+				'size' => 255,
+				'default' => 'txt, html',
+				'eval' => 'trim',
+			],
+		],
+		'extension_allowed_file_type_2' => [
+			'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.extension_allowed_file_type_2',
+			'config' => [
+				'type' => 'input',
+				'size' => 255,
+				'default' => 'jpg, jpeg, bmp, png, tiff, tif, gif, eps',
+				'eval' => 'trim',
+			],
+		],
+		'extension_allowed_file_type_3' => [
+			'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.extension_allowed_file_type_3',
+			'config' => [
+				'type' => 'input',
+				'size' => 255,
+				'default' => 'mp3, mp4, m4a, wma, f4a',
+				'eval' => 'trim',
+			],
+		],
+		'extension_allowed_file_type_4' => [
+			'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.extension_allowed_file_type_4',
+			'config' => [
+				'type' => 'input',
+				'size' => 255,
+				'default' => 'mov, avi, mpeg, mpg, mp4, m4v, flv, f4v, webm, wmv, ogv, 3gp',
+				'eval' => 'trim',
+			],
+		],
+		'extension_allowed_file_type_5' => [
+			'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.extension_allowed_file_type_5',
+			'config' => [
+				'type' => 'input',
+				'size' => 255,
+				'default' => 'pdf, zip, doc, docx, dotx, ppt, pptx, pps, ppsx, odt, xls, xlsx, xltx, rtf, xlt',
+				'eval' => 'trim',
+			],
+		],
+	],
 ];
 
 $tcaForHiddenFolderTree = [];
 if (!$configuration['has_folder_tree']) {
-    $tcaForHiddenFolderTree = [
+	$tcaForHiddenFolderTree = [
 
-        'types' => [
-            0 => ['showitem' => $GLOBALS['TCA']['sys_file_storage']['types'][0]['showitem'] . ',
+		'types' => [
+			0 => ['showitem' => $GLOBALS['TCA']['sys_file_storage']['types'][0]['showitem'] . ',
 
 			--div--;LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:tab.media_mount_point,
 			mount_point_file_type_1, mount_point_file_type_2, mount_point_file_type_3, mount_point_file_type_4, mount_point_file_type_5,
@@ -86,126 +86,126 @@ 
 			maximum_dimension_original_image, extension_allowed_file_type_1, extension_allowed_file_type_2, extension_allowed_file_type_3, extension_allowed_file_type_4, extension_allowed_file_type_5,
 				',
 
-            ],
-        ],
-        'columns' => [
-            'mount_point_file_type_1' => [
-                'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.mount_point_file_type_1',
-                'config' => [
-                    'type' => 'group',
-                    'internal_type' => 'db',
-                    'allowed' => 'sys_filemounts',
-                    'size' => 1,
-                    'minitems' => 0,
-                    'maxitems' => 1,
-                    'wizards' => [
-                        'edit' => [
-                            'type' => 'popup',
-                            'module' => [
-                                'name' => 'wizard_edit',
-                            ],
-                            'icon' => 'edit2.gif',
-                            'popup_onlyOpenIfSelected' => 1,
-                            'notNewRecords' => 1,
-                            'JSopenParams' => 'height=500,width=800,status=0,menubar=0,scrollbars=1,resizable=yes'
-                        ],
-                    ],
-                ],
-            ],
-            'mount_point_file_type_2' => [
-                'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.mount_point_file_type_2',
-                'config' => [
-                    'type' => 'group',
-                    'internal_type' => 'db',
-                    'allowed' => 'sys_filemounts',
-                    'size' => 1,
-                    'minitems' => 0,
-                    'maxitems' => 1,
-                    'wizards' => [
-                        'edit' => [
-                            'type' => 'popup',
-                            'module' => [
-                                'name' => 'wizard_edit',
-                            ],
-                            'icon' => 'edit2.gif',
-                            'popup_onlyOpenIfSelected' => 1,
-                            'notNewRecords' => 1,
-                            'JSopenParams' => 'height=500,width=800,status=0,menubar=0,scrollbars=1,resizable=yes'
-                        ],
-                    ],
-                ],
-            ],
-            'mount_point_file_type_3' => [
-                'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.mount_point_file_type_3',
-                'config' => [
-                    'type' => 'group',
-                    'internal_type' => 'db',
-                    'allowed' => 'sys_filemounts',
-                    'size' => 1,
-                    'minitems' => 0,
-                    'maxitems' => 1,
-                    'wizards' => [
-                        'edit' => [
-                            'type' => 'popup',
-                            'module' => [
-                                'name' => 'wizard_edit',
-                            ],
-                            'icon' => 'edit2.gif',
-                            'popup_onlyOpenIfSelected' => 1,
-                            'notNewRecords' => 1,
-                            'JSopenParams' => 'height=500,width=800,status=0,menubar=0,scrollbars=1,resizable=yes'
-                        ],
-                    ],
-                ],
-            ],
-            'mount_point_file_type_4' => [
-                'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.mount_point_file_type_4',
-                'config' => [
-                    'type' => 'group',
-                    'internal_type' => 'db',
-                    'allowed' => 'sys_filemounts',
-                    'size' => 1,
-                    'minitems' => 0,
-                    'maxitems' => 1,
-                    'wizards' => [
-                        'edit' => [
-                            'type' => 'popup',
-                            'module' => [
-                                'name' => 'wizard_edit',
-                            ],
-                            'icon' => 'edit2.gif',
-                            'popup_onlyOpenIfSelected' => 1,
-                            'notNewRecords' => 1,
-                            'JSopenParams' => 'height=500,width=800,status=0,menubar=0,scrollbars=1,resizable=yes'
-                        ],
-                    ],
-                ],
-            ],
-            'mount_point_file_type_5' => [
-                'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.mount_point_file_type_5',
-                'config' => [
-                    'type' => 'group',
-                    'internal_type' => 'db',
-                    'allowed' => 'sys_filemounts',
-                    'size' => 1,
-                    'minitems' => 0,
-                    'maxitems' => 1,
-                    'wizards' => [
-                        'edit' => [
-                            'type' => 'popup',
-                            'module' => [
-                                'name' => 'wizard_edit',
-                            ],
-                            'icon' => 'edit2.gif',
-                            'popup_onlyOpenIfSelected' => 1,
-                            'notNewRecords' => 1,
-                            'JSopenParams' => 'height=500,width=800,status=0,menubar=0,scrollbars=1,resizable=yes'
-                        ],
-                    ],
-                ],
-            ],
-        ],
-    ];
+			],
+		],
+		'columns' => [
+			'mount_point_file_type_1' => [
+				'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.mount_point_file_type_1',
+				'config' => [
+					'type' => 'group',
+					'internal_type' => 'db',
+					'allowed' => 'sys_filemounts',
+					'size' => 1,
+					'minitems' => 0,
+					'maxitems' => 1,
+					'wizards' => [
+						'edit' => [
+							'type' => 'popup',
+							'module' => [
+								'name' => 'wizard_edit',
+							],
+							'icon' => 'edit2.gif',
+							'popup_onlyOpenIfSelected' => 1,
+							'notNewRecords' => 1,
+							'JSopenParams' => 'height=500,width=800,status=0,menubar=0,scrollbars=1,resizable=yes'
+						],
+					],
+				],
+			],
+			'mount_point_file_type_2' => [
+				'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.mount_point_file_type_2',
+				'config' => [
+					'type' => 'group',
+					'internal_type' => 'db',
+					'allowed' => 'sys_filemounts',
+					'size' => 1,
+					'minitems' => 0,
+					'maxitems' => 1,
+					'wizards' => [
+						'edit' => [
+							'type' => 'popup',
+							'module' => [
+								'name' => 'wizard_edit',
+							],
+							'icon' => 'edit2.gif',
+							'popup_onlyOpenIfSelected' => 1,
+							'notNewRecords' => 1,
+							'JSopenParams' => 'height=500,width=800,status=0,menubar=0,scrollbars=1,resizable=yes'
+						],
+					],
+				],
+			],
+			'mount_point_file_type_3' => [
+				'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.mount_point_file_type_3',
+				'config' => [
+					'type' => 'group',
+					'internal_type' => 'db',
+					'allowed' => 'sys_filemounts',
+					'size' => 1,
+					'minitems' => 0,
+					'maxitems' => 1,
+					'wizards' => [
+						'edit' => [
+							'type' => 'popup',
+							'module' => [
+								'name' => 'wizard_edit',
+							],
+							'icon' => 'edit2.gif',
+							'popup_onlyOpenIfSelected' => 1,
+							'notNewRecords' => 1,
+							'JSopenParams' => 'height=500,width=800,status=0,menubar=0,scrollbars=1,resizable=yes'
+						],
+					],
+				],
+			],
+			'mount_point_file_type_4' => [
+				'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.mount_point_file_type_4',
+				'config' => [
+					'type' => 'group',
+					'internal_type' => 'db',
+					'allowed' => 'sys_filemounts',
+					'size' => 1,
+					'minitems' => 0,
+					'maxitems' => 1,
+					'wizards' => [
+						'edit' => [
+							'type' => 'popup',
+							'module' => [
+								'name' => 'wizard_edit',
+							],
+							'icon' => 'edit2.gif',
+							'popup_onlyOpenIfSelected' => 1,
+							'notNewRecords' => 1,
+							'JSopenParams' => 'height=500,width=800,status=0,menubar=0,scrollbars=1,resizable=yes'
+						],
+					],
+				],
+			],
+			'mount_point_file_type_5' => [
+				'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_storage.mount_point_file_type_5',
+				'config' => [
+					'type' => 'group',
+					'internal_type' => 'db',
+					'allowed' => 'sys_filemounts',
+					'size' => 1,
+					'minitems' => 0,
+					'maxitems' => 1,
+					'wizards' => [
+						'edit' => [
+							'type' => 'popup',
+							'module' => [
+								'name' => 'wizard_edit',
+							],
+							'icon' => 'edit2.gif',
+							'popup_onlyOpenIfSelected' => 1,
+							'notNewRecords' => 1,
+							'JSopenParams' => 'height=500,width=800,status=0,menubar=0,scrollbars=1,resizable=yes'
+						],
+					],
+				],
+			],
+		],
+	];
 }
 
 // Merge first two possible TCA whether the folder tree is displayed or not.

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if (!defined('TYPO3_MODE')) die ('Access denied.');
+if (!defined('TYPO3_MODE')) {
+	die ('Access denied.');
+}
 
 $configuration = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
     TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class

Classes/Thumbnail/FallBackThumbnailProcessor.php

Indentation +41 added lines, -41 removed lines

@@ -15,48 +15,48 @@
 class FallBackThumbnailProcessor extends AbstractThumbnailProcessor
 {
 
-    /**
-     * Render a fallback thumbnail if no type was found for the given resource.
-     *
-     * @return string
-     */
-    public function create()
-    {
-        return sprintf(
-            '<img src="%s" hspace="2" class="" alt="" />',
-            Path::getRelativePath('Icons/UnknownMimeType.png')
-        );
-    }
+	/**
+	 * Render a fallback thumbnail if no type was found for the given resource.
+	 *
+	 * @return string
+	 */
+	public function create()
+	{
+		return sprintf(
+			'<img src="%s" hspace="2" class="" alt="" />',
+			Path::getRelativePath('Icons/UnknownMimeType.png')
+		);
+	}
 
-    /**
-     * Render the URI of the thumbnail.
-     *
-     * @return string
-     */
-    public function renderUri()
-    {
-        // Nothing to implement.
-    }
+	/**
+	 * Render the URI of the thumbnail.
+	 *
+	 * @return string
+	 */
+	public function renderUri()
+	{
+		// Nothing to implement.
+	}
 
-    /**
-     * Render the tag image which is the main one for a thumbnail.
-     *
-     * @param string $result
-     * @return string
-     */
-    public function renderTagImage($result)
-    {
-        // Nothing to implement.
-    }
+	/**
+	 * Render the tag image which is the main one for a thumbnail.
+	 *
+	 * @param string $result
+	 * @return string
+	 */
+	public function renderTagImage($result)
+	{
+		// Nothing to implement.
+	}
 
-    /**
-     * Render a wrapping anchor around the thumbnail.
-     *
-     * @param string $result
-     * @return string
-     */
-    public function renderTagAnchor($result)
-    {
-        // Nothing to implement.
-    }
+	/**
+	 * Render a wrapping anchor around the thumbnail.
+	 *
+	 * @param string $result
+	 * @return string
+	 */
+	public function renderTagAnchor($result)
+	{
+		// Nothing to implement.
+	}
 }

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

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
     {
 
         $relativePath = sprintf('Icons/MimeType/%s.png', $this->getFile()->getProperty('extension'));
-        $fileNameAndPath = GeneralUtility::getFileAbsFileName('EXT:media/Resources/Public/' . $relativePath);
+        $fileNameAndPath = GeneralUtility::getFileAbsFileName('EXT:media/Resources/Public/'.$relativePath);
         if (!file_exists($fileNameAndPath)) {
             $relativePath = 'Icons/UnknownMimeType.png';
         }
@@ -68,7 +68,7 @@ 
         return sprintf(
             '<img src="%s%s" title="%s" alt="%s" %s/>',
             $result,
-            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->getFile()->getProperty('tstamp') : '',
+            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator.$this->getFile()->getProperty('tstamp') : '',
             $this->getTitle(),
             $this->getTitle(),
             $this->renderAttributes()
@@ -103,7 +103,7 @@ 
         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->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
+		);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
     {
 
         $relativePath = sprintf('Icons/MimeType/%s.png', $this->getFile()->getProperty('extension'));
-        $fileNameAndPath = GeneralUtility::getFileAbsFileName('EXT:media/Resources/Public/' . $relativePath);
+        $fileNameAndPath = GeneralUtility::getFileAbsFileName('EXT:media/Resources/Public/'.$relativePath);
         if (!file_exists($fileNameAndPath)) {
             $relativePath = 'Icons/UnknownMimeType.png';
         }
@@ -68,7 +68,7 @@ 
         return sprintf(
             '<img src="%s%s" title="%s" alt="%s" %s/>',
             $result,
-            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->getFile()->getProperty('tstamp') : '',
+            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator.$this->getFile()->getProperty('tstamp') : '',
             $this->getTitle(),
             $this->getTitle(),
             $this->renderAttributes()
@@ -103,7 +103,7 @@ 
         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->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();
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
         return sprintf(
             '<img src="%s%s" title="%s" alt="%s" %s/>',
             $result,
-            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->getTimeStamp() : '',
+            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator.$this->getTimeStamp() : '',
             $this->getTitle(),
             $this->getTitle(),
             $this->renderAttributes()

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/TypeConverter/FileConverter.php

Indentation +39 added lines, -39 removed lines

@@ -19,43 +19,43 @@
 class FileConverter extends AbstractTypeConverter
 {
 
-    /**
-     * @var array<string>
-     */
-    protected $sourceTypes = array('int');
-
-    /**
-     * @var string
-     */
-    protected $targetType = 'TYPO3\CMS\Core\Resource\File';
-
-    /**
-     * @var integer
-     */
-    protected $priority = 1;
-
-    /**
-     * Actually convert from $source to $targetType
-     *
-     * @param string $source
-     * @param string $targetType
-     * @param array $convertedChildProperties
-     * @param PropertyMappingConfigurationInterface $configuration
-     * @return File
-     * @api
-     */
-    public function convertFrom($source, $targetType, array $convertedChildProperties = [], PropertyMappingConfigurationInterface $configuration = null)
-    {
-
-        /** @var $file File */
-        $file = ResourceFactory::getInstance()->getFileObject((int)$source);
-
-        if (!$file) {
-            $message = sprintf('File with identifier "%s" could not be found.', $file);
-            throw new \Exception($message, 1433529796);
-        }
-
-        $file->getType(); // force to internally know its mime-type.
-        return $file;
-    }
+	/**
+	 * @var array<string>
+	 */
+	protected $sourceTypes = array('int');
+
+	/**
+	 * @var string
+	 */
+	protected $targetType = 'TYPO3\CMS\Core\Resource\File';
+
+	/**
+	 * @var integer
+	 */
+	protected $priority = 1;
+
+	/**
+	 * Actually convert from $source to $targetType
+	 *
+	 * @param string $source
+	 * @param string $targetType
+	 * @param array $convertedChildProperties
+	 * @param PropertyMappingConfigurationInterface $configuration
+	 * @return File
+	 * @api
+	 */
+	public function convertFrom($source, $targetType, array $convertedChildProperties = [], PropertyMappingConfigurationInterface $configuration = null)
+	{
+
+		/** @var $file File */
+		$file = ResourceFactory::getInstance()->getFileObject((int)$source);
+
+		if (!$file) {
+			$message = sprintf('File with identifier "%s" could not be found.', $file);
+			throw new \Exception($message, 1433529796);
+		}
+
+		$file->getType(); // force to internally know its mime-type.
+		return $file;
+	}
 }
\ No newline at end of file