fabarea / media

Classes/Tool/ThumbnailGeneratorTool.php

Indentation +116 added lines, -116 removed lines

@@ -19,120 +19,120 @@
  */
 class ThumbnailGeneratorTool extends AbstractTool
 {
-    /**
-     * Display the title of the tool on the welcome screen.
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return 'Generate thumbnails';
-    }
-
-    /**
-     * Display the description of the tool in the welcome screen.
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/ThumbnailGenerator/Launcher.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('sitePath', Environment::getPublicPath() . '/');
-        return $view->render();
-    }
-
-    /**
-     * Do the job: analyse Index.
-     *
-     * @param array $arguments
-     * @return string
-     */
-    public function work(array $arguments = [])
-    {
-        $reports = [];
-
-        $limit = 500; // default value
-        $newOffset = 0;
-
-        // Possible clean up of missing files if the User has clicked so.
-        if (isset($arguments['limit']) && isset($arguments['offset'])) {
-            $limit = (int)$arguments['limit'];
-            $offset = (int)$arguments['offset'];
-
-            foreach ($this->getStorageRepository()->findAll() as $storage) {
-                if ($storage->isOnline()) {
-                    $thumbnailGenerator = $this->getThumbnailGenerator();
-                    $thumbnailGenerator
-                        ->setStorage($storage)
-                        ->generate($limit, $offset);
-
-                    $formattedResultSet = [];
-                    $resultSet = $thumbnailGenerator->getResultSet();
-                    $processedFileIdentifiers = $thumbnailGenerator->getNewProcessedFileIdentifiers();
-
-                    foreach ($processedFileIdentifiers as $fileIdentifier => $processedFileIdentifier) {
-                        $result = $resultSet[$fileIdentifier];
-                        $formattedResultSet[] = sprintf(
-                            '* File "%s": %s %s',
-                            $result['fileUid'],
-                            $result['fileIdentifier'],
-                            empty($result['thumbnailUri']) ? '' : ' -> ' . $result['thumbnailUri']
-                        );
-                    }
-
-                    $reports[] = array(
-                        'storage' => $storage,
-                        'isStorageOnline' => true,
-                        'resultSet' => $formattedResultSet,
-                        'numberOfProcessedFiles' => $thumbnailGenerator->getNumberOfProcessedFiles(),
-                        'numberOfTraversedFiles' => $thumbnailGenerator->getNumberOfTraversedFiles(),
-                        'numberOfMissingFiles' => $thumbnailGenerator->getNumberOfMissingFiles(),
-                        'totalNumberOfFiles' => $thumbnailGenerator->getTotalNumberOfFiles(),
-                    );
-                } else {
-                    $reports[] = array(
-                        'storage' => $storage,
-                        'isStorageOnline' => false,
-                    );
-                }
-            }
-
-            $newOffset = $limit + $offset;
-        }
-
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/ThumbnailGenerator/WorkResult.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-
-        $view->assign('limit', $limit);
-        $view->assign('offset', $newOffset);
-        $view->assign('reports', $reports);
-        return $view->render();
-    }
-
-    /**
-     * @return ThumbnailGenerator|object
-     */
-    protected function getThumbnailGenerator()
-    {
-        return GeneralUtility::makeInstance(ThumbnailGenerator::class);
-    }
-
-    /**
-     * @return StorageRepository|object
-     */
-    protected function getStorageRepository()
-    {
-        return GeneralUtility::makeInstance(StorageRepository::class);
-    }
-
-    /**
-     * Tell whether the tools should be displayed according to the context.
-     *
-     * @return bool
-     */
-    public function isShown()
-    {
-        return $this->getBackendUser()->isAdmin();
-    }
+	/**
+	 * Display the title of the tool on the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getTitle()
+	{
+		return 'Generate thumbnails';
+	}
+
+	/**
+	 * Display the description of the tool in the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getDescription()
+	{
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/ThumbnailGenerator/Launcher.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+		$view->assign('sitePath', Environment::getPublicPath() . '/');
+		return $view->render();
+	}
+
+	/**
+	 * Do the job: analyse Index.
+	 *
+	 * @param array $arguments
+	 * @return string
+	 */
+	public function work(array $arguments = [])
+	{
+		$reports = [];
+
+		$limit = 500; // default value
+		$newOffset = 0;
+
+		// Possible clean up of missing files if the User has clicked so.
+		if (isset($arguments['limit']) && isset($arguments['offset'])) {
+			$limit = (int)$arguments['limit'];
+			$offset = (int)$arguments['offset'];
+
+			foreach ($this->getStorageRepository()->findAll() as $storage) {
+				if ($storage->isOnline()) {
+					$thumbnailGenerator = $this->getThumbnailGenerator();
+					$thumbnailGenerator
+						->setStorage($storage)
+						->generate($limit, $offset);
+
+					$formattedResultSet = [];
+					$resultSet = $thumbnailGenerator->getResultSet();
+					$processedFileIdentifiers = $thumbnailGenerator->getNewProcessedFileIdentifiers();
+
+					foreach ($processedFileIdentifiers as $fileIdentifier => $processedFileIdentifier) {
+						$result = $resultSet[$fileIdentifier];
+						$formattedResultSet[] = sprintf(
+							'* File "%s": %s %s',
+							$result['fileUid'],
+							$result['fileIdentifier'],
+							empty($result['thumbnailUri']) ? '' : ' -> ' . $result['thumbnailUri']
+						);
+					}
+
+					$reports[] = array(
+						'storage' => $storage,
+						'isStorageOnline' => true,
+						'resultSet' => $formattedResultSet,
+						'numberOfProcessedFiles' => $thumbnailGenerator->getNumberOfProcessedFiles(),
+						'numberOfTraversedFiles' => $thumbnailGenerator->getNumberOfTraversedFiles(),
+						'numberOfMissingFiles' => $thumbnailGenerator->getNumberOfMissingFiles(),
+						'totalNumberOfFiles' => $thumbnailGenerator->getTotalNumberOfFiles(),
+					);
+				} else {
+					$reports[] = array(
+						'storage' => $storage,
+						'isStorageOnline' => false,
+					);
+				}
+			}
+
+			$newOffset = $limit + $offset;
+		}
+
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/ThumbnailGenerator/WorkResult.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+
+		$view->assign('limit', $limit);
+		$view->assign('offset', $newOffset);
+		$view->assign('reports', $reports);
+		return $view->render();
+	}
+
+	/**
+	 * @return ThumbnailGenerator|object
+	 */
+	protected function getThumbnailGenerator()
+	{
+		return GeneralUtility::makeInstance(ThumbnailGenerator::class);
+	}
+
+	/**
+	 * @return StorageRepository|object
+	 */
+	protected function getStorageRepository()
+	{
+		return GeneralUtility::makeInstance(StorageRepository::class);
+	}
+
+	/**
+	 * Tell whether the tools should be displayed according to the context.
+	 *
+	 * @return bool
+	 */
+	public function isShown()
+	{
+		return $this->getBackendUser()->isAdmin();
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
     {
         $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/ThumbnailGenerator/Launcher.html';
         $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('sitePath', Environment::getPublicPath() . '/');
+        $view->assign('sitePath', Environment::getPublicPath().'/');
         return $view->render();
     }
 
@@ -77,7 +77,7 @@ 
                             '* File "%s": %s %s',
                             $result['fileUid'],
                             $result['fileIdentifier'],
-                            empty($result['thumbnailUri']) ? '' : ' -> ' . $result['thumbnailUri']
+                            empty($result['thumbnailUri']) ? '' : ' -> '.$result['thumbnailUri']
                         );
                     }
 

Classes/Cache/CacheService.php

Indentation +211 added lines, -211 removed lines

@@ -25,235 +25,235 @@
  */
 class CacheService
 {
-    /**
-     * Traverse all files and initialize cache values.
-     */
-    public function warmUp(): int
-    {
-        /** @var QueryBuilder $queryBuilder */
-        $queryBuilder = $this->getQueryBuilder('sys_file');
-        $rows = $queryBuilder
-            ->select('*')
-            ->from('sys_file')
-            ->where('storage > 0')
-            ->execute()
-            ->fetchAllAssociative();
+	/**
+	 * Traverse all files and initialize cache values.
+	 */
+	public function warmUp(): int
+	{
+		/** @var QueryBuilder $queryBuilder */
+		$queryBuilder = $this->getQueryBuilder('sys_file');
+		$rows = $queryBuilder
+			->select('*')
+			->from('sys_file')
+			->where('storage > 0')
+			->execute()
+			->fetchAllAssociative();
 
-        $counter = 0;
-        foreach ($rows as $row) {
-            $fileIdentifier = $row['uid'];
-            $totalNumberOfReferences = $this->getFileReferenceService()->countTotalReferences($fileIdentifier);
+		$counter = 0;
+		foreach ($rows as $row) {
+			$fileIdentifier = $row['uid'];
+			$totalNumberOfReferences = $this->getFileReferenceService()->countTotalReferences($fileIdentifier);
 
-            $this->getDataService()->update(
-                'sys_file',
-                [
-                    'number_of_references' => $totalNumberOfReferences
-                ],
-                [
-                    'uid' => $fileIdentifier
-                ]
-            );
-            $counter++;
-        }
+			$this->getDataService()->update(
+				'sys_file',
+				[
+					'number_of_references' => $totalNumberOfReferences
+				],
+				[
+					'uid' => $fileIdentifier
+				]
+			);
+			$counter++;
+		}
 
-        return $counter;
-    }
+		return $counter;
+	}
 
-    /**
-     * Clear all possible cache related to a file.
-     * This method is useful when replacing a file for instance.
-     *
-     * @param File $file
-     * @return void
-     */
-    public function clearCache(File $file)
-    {
-        $this->clearCachePages($file);
-        $this->flushProcessedFiles($file);
-    }
+	/**
+	 * Clear all possible cache related to a file.
+	 * This method is useful when replacing a file for instance.
+	 *
+	 * @param File $file
+	 * @return void
+	 */
+	public function clearCache(File $file)
+	{
+		$this->clearCachePages($file);
+		$this->flushProcessedFiles($file);
+	}
 
-    /**
-     * Remove all processed files that belong to the given File object.
-     *
-     * @param File $file
-     * @return void
-     */
-    protected function flushProcessedFiles(File $file)
-    {
-        /** @var $processedFile \TYPO3\CMS\Core\Resource\ProcessedFile */
-        foreach ($this->getProcessedFileRepository()->findAllByOriginalFile($file) as $processedFile) {
-            if ($processedFile->exists()) {
-                $processedFile->delete(true);
-            }
+	/**
+	 * Remove all processed files that belong to the given File object.
+	 *
+	 * @param File $file
+	 * @return void
+	 */
+	protected function flushProcessedFiles(File $file)
+	{
+		/** @var $processedFile \TYPO3\CMS\Core\Resource\ProcessedFile */
+		foreach ($this->getProcessedFileRepository()->findAllByOriginalFile($file) as $processedFile) {
+			if ($processedFile->exists()) {
+				$processedFile->delete(true);
+			}
 
-            $this->getDataService()->delete(
-                'sys_file_processedfile',
-                [
-                    'uid' => (int)$processedFile->getUid()
-                ]
-            );
-        }
-    }
+			$this->getDataService()->delete(
+				'sys_file_processedfile',
+				[
+					'uid' => (int)$processedFile->getUid()
+				]
+			);
+		}
+	}
 
-    /**
-     * Return a processed file repository
-     *
-     * @return ProcessedFileRepository|object
-     */
-    protected function getProcessedFileRepository()
-    {
-        return GeneralUtility::makeInstance(ProcessedFileRepository::class);
-    }
+	/**
+	 * Return a processed file repository
+	 *
+	 * @return ProcessedFileRepository|object
+	 */
+	protected function getProcessedFileRepository()
+	{
+		return GeneralUtility::makeInstance(ProcessedFileRepository::class);
+	}
 
-    /**
-     * Returns the file references.
-     *
-     * @param File $file
-     * @return void
-     */
-    protected function clearCachePages($file)
-    {
-        /** @var $tce \TYPO3\CMS\Core\DataHandling\DataHandler */
-        $tce = GeneralUtility::makeInstance(DataHandler::class);
-        $tce->start([], []);
+	/**
+	 * Returns the file references.
+	 *
+	 * @param File $file
+	 * @return void
+	 */
+	protected function clearCachePages($file)
+	{
+		/** @var $tce \TYPO3\CMS\Core\DataHandling\DataHandler */
+		$tce = GeneralUtility::makeInstance(DataHandler::class);
+		$tce->start([], []);
 
-        #$pages = array_merge(
-        #    $this->findPagesWithFileReferences($file),
-        #    $this->findPagesWithSoftReferences($file)
-        #);
+		#$pages = array_merge(
+		#    $this->findPagesWithFileReferences($file),
+		#    $this->findPagesWithSoftReferences($file)
+		#);
 
-        // Previous code which does not work in TYPO3 CMS 7 LTS.
-        // It is adviced to use "registerPageCacheClearing" but how?
-        #foreach (array_unique($pages) as $page) {
-        #    $tce->clear_cache('pages', $page);
-        #}
-        $tce->clear_cacheCmd('pages');
-    }
+		// Previous code which does not work in TYPO3 CMS 7 LTS.
+		// It is adviced to use "registerPageCacheClearing" but how?
+		#foreach (array_unique($pages) as $page) {
+		#    $tce->clear_cache('pages', $page);
+		#}
+		$tce->clear_cacheCmd('pages');
+	}
 
-    /**
-     * Find all pages which contains file references to the given $file.
-     *
-     * @param File $file
-     * @return array
-     */
-    protected function findPagesWithFileReferences($file)
-    {
-        /** @var QueryBuilder $queryBuilder */
-        $queryBuilder = $this->getQueryBuilder('sys_file_reference');
-        $rows = $queryBuilder
-            ->select('pid')
-            ->from('sys_file_reference')
-            ->groupBy('pid') // no support for distinct
-            ->andWhere(
-                'pid > 0',
-                'uid_local = ' . $file->getUid()
-            )
-            ->execute()
-            ->fetchAllAssociative();
+	/**
+	 * Find all pages which contains file references to the given $file.
+	 *
+	 * @param File $file
+	 * @return array
+	 */
+	protected function findPagesWithFileReferences($file)
+	{
+		/** @var QueryBuilder $queryBuilder */
+		$queryBuilder = $this->getQueryBuilder('sys_file_reference');
+		$rows = $queryBuilder
+			->select('pid')
+			->from('sys_file_reference')
+			->groupBy('pid') // no support for distinct
+			->andWhere(
+				'pid > 0',
+				'uid_local = ' . $file->getUid()
+			)
+			->execute()
+			->fetchAllAssociative();
 
-        foreach ($rows as $row) {
-            $pages[] = $row['pid'];
-        }
+		foreach ($rows as $row) {
+			$pages[] = $row['pid'];
+		}
 
-        return $pages;
-    }
+		return $pages;
+	}
 
-    /**
-     * Find all pages which have soft references to the given $file.
-     *
-     * @param File $file
-     * @return array
-     */
-    #protected function findPagesWithSoftReferences(File $file)
-    #{
-    #    $subClauseParts = array(
-    #        'deleted = 0',
-    #        '(softref_key = "rtehtmlarea_images" OR softref_key = "typolink_tag")',
-    #        'ref_table = "sys_file"',
-    #        'tablename = "tt_content"',
-    #        'ref_uid = ' . $file->getUid(),
-    #    );
-    #
-    #    $rows = $this->getDatabaseConnection()->exec_SELECTquery(
-    #        'DISTINCT pid',
-    #        'tt_content',
-    #        sprintf('uid IN (SELECT recuid FROM sys_refindex WHERE %s) %s',
-    #            implode(' AND ', $subClauseParts),
-    #            $this->getWhereClauseForEnabledFields('tt_content')
-    #        )
-    #    );
-    #
-    #    // Compute result
-    #    $pages = [];
-    #    while ($affectedPage = $this->getDatabaseConnection()->sql_fetch_assoc($rows)) {
-    #        $pages[] = $affectedPage['pid'];
-    #    }
-    #
-    #    return $pages;
-    #}
+	/**
+	 * Find all pages which have soft references to the given $file.
+	 *
+	 * @param File $file
+	 * @return array
+	 */
+	#protected function findPagesWithSoftReferences(File $file)
+	#{
+	#    $subClauseParts = array(
+	#        'deleted = 0',
+	#        '(softref_key = "rtehtmlarea_images" OR softref_key = "typolink_tag")',
+	#        'ref_table = "sys_file"',
+	#        'tablename = "tt_content"',
+	#        'ref_uid = ' . $file->getUid(),
+	#    );
+	#
+	#    $rows = $this->getDatabaseConnection()->exec_SELECTquery(
+	#        'DISTINCT pid',
+	#        'tt_content',
+	#        sprintf('uid IN (SELECT recuid FROM sys_refindex WHERE %s) %s',
+	#            implode(' AND ', $subClauseParts),
+	#            $this->getWhereClauseForEnabledFields('tt_content')
+	#        )
+	#    );
+	#
+	#    // Compute result
+	#    $pages = [];
+	#    while ($affectedPage = $this->getDatabaseConnection()->sql_fetch_assoc($rows)) {
+	#        $pages[] = $affectedPage['pid'];
+	#    }
+	#
+	#    return $pages;
+	#}
 
-    /**
-     * Get the WHERE clause for the enabled fields given a $tableName.
-     *
-     * @param string $tableName
-     * @return string
-     */
-    protected function getWhereClauseForEnabledFields($tableName)
-    {
-        if ($this->isFrontendMode()) {
-            // frontend context
-            $whereClause = $this->getPageRepository()->deleteClause($tableName);
-        } else {
-            // backend context
-            $whereClause = BackendUtility::deleteClause($tableName);
-        }
-        return $whereClause;
-    }
+	/**
+	 * Get the WHERE clause for the enabled fields given a $tableName.
+	 *
+	 * @param string $tableName
+	 * @return string
+	 */
+	protected function getWhereClauseForEnabledFields($tableName)
+	{
+		if ($this->isFrontendMode()) {
+			// frontend context
+			$whereClause = $this->getPageRepository()->deleteClause($tableName);
+		} else {
+			// backend context
+			$whereClause = BackendUtility::deleteClause($tableName);
+		}
+		return $whereClause;
+	}
 
-    /**
-     * Returns whether the current mode is Frontend
-     *
-     * @return string
-     */
-    protected function isFrontendMode()
-    {
-        return ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isFrontend();
-    }
+	/**
+	 * Returns whether the current mode is Frontend
+	 *
+	 * @return string
+	 */
+	protected function isFrontendMode()
+	{
+		return ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isFrontend();
+	}
 
-    /**
-     * Returns an instance of the page repository.
-     *
-     * @return PageRepository
-     */
-    protected function getPageRepository()
-    {
-        return $GLOBALS['TSFE']->sys_page;
-    }
+	/**
+	 * Returns an instance of the page repository.
+	 *
+	 * @return PageRepository
+	 */
+	protected function getPageRepository()
+	{
+		return $GLOBALS['TSFE']->sys_page;
+	}
 
-    /**
-     * @param string $tableName
-     * @return object|QueryBuilder
-     */
-    protected function getQueryBuilder($tableName): QueryBuilder
-    {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        return $connectionPool->getQueryBuilderForTable($tableName);
-    }
+	/**
+	 * @param string $tableName
+	 * @return object|QueryBuilder
+	 */
+	protected function getQueryBuilder($tableName): QueryBuilder
+	{
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		return $connectionPool->getQueryBuilderForTable($tableName);
+	}
 
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
 
-    /**
-     * @return FileReferenceService|object
-     */
-    protected function getFileReferenceService()
-    {
-        return GeneralUtility::makeInstance(FileReferenceService::class);
-    }
+	/**
+	 * @return FileReferenceService|object
+	 */
+	protected function getFileReferenceService()
+	{
+		return GeneralUtility::makeInstance(FileReferenceService::class);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
             ->groupBy('pid') // no support for distinct
             ->andWhere(
                 'pid > 0',
-                'uid_local = ' . $file->getUid()
+                'uid_local = '.$file->getUid()
             )
             ->execute()
             ->fetchAllAssociative();

Classes/Utility/PermissionUtility.php

Indentation +64 added lines, -64 removed lines

@@ -20,75 +20,75 @@
  */
 class PermissionUtility implements SingletonInterface
 {
-    /**
-     * Returns a class instance.
-     *
-     * @return PermissionUtility
-     * @throws \InvalidArgumentException
-     */
-    public static function getInstance()
-    {
-        return GeneralUtility::makeInstance(PermissionUtility::class);
-    }
+	/**
+	 * Returns a class instance.
+	 *
+	 * @return PermissionUtility
+	 * @throws \InvalidArgumentException
+	 */
+	public static function getInstance()
+	{
+		return GeneralUtility::makeInstance(PermissionUtility::class);
+	}
 
-    /**
-     * Returns allowed extensions given a possible storage.
-     *
-     * @param null|int|ResourceStorage $storage
-     * @return array
-     * @throws \InvalidArgumentException
-     */
-    public function getAllowedExtensions($storage = null)
-    {
-        $fieldNames = array(
-            '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',
-        );
+	/**
+	 * Returns allowed extensions given a possible storage.
+	 *
+	 * @param null|int|ResourceStorage $storage
+	 * @return array
+	 * @throws \InvalidArgumentException
+	 */
+	public function getAllowedExtensions($storage = null)
+	{
+		$fieldNames = array(
+			'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',
+		);
 
-        if (!is_null($storage)) {
-            if (!$storage instanceof ResourceStorage) {
-                $storage = $this->getResourceFactory()->getStorageObject((int)$storage);
-            }
-        } else {
-            $storage = $this->getMediaModule()->getCurrentStorage();
-        }
+		if (!is_null($storage)) {
+			if (!$storage instanceof ResourceStorage) {
+				$storage = $this->getResourceFactory()->getStorageObject((int)$storage);
+			}
+		} else {
+			$storage = $this->getMediaModule()->getCurrentStorage();
+		}
 
-        $storageRecord = $storage->getStorageRecord();
-        $allowedExtensions = [];
-        foreach ($fieldNames as $fieldName) {
-            $_allowedExtensions = GeneralUtility::trimExplode(',', $storageRecord[$fieldName], true);
-            $allowedExtensions = array_merge($allowedExtensions, $_allowedExtensions);
-        }
+		$storageRecord = $storage->getStorageRecord();
+		$allowedExtensions = [];
+		foreach ($fieldNames as $fieldName) {
+			$_allowedExtensions = GeneralUtility::trimExplode(',', $storageRecord[$fieldName], true);
+			$allowedExtensions = array_merge($allowedExtensions, $_allowedExtensions);
+		}
 
-        $uniqueAllowedExtensions = array_unique($allowedExtensions);
-        return array_filter($uniqueAllowedExtensions, 'strlen');
-    }
+		$uniqueAllowedExtensions = array_unique($allowedExtensions);
+		return array_filter($uniqueAllowedExtensions, 'strlen');
+	}
 
-    /**
-     * Returns allowed extensions list.
-     *
-     * @return string
-     * @throws \InvalidArgumentException
-     */
-    public function getAllowedExtensionList()
-    {
-        return implode(',', $this->getAllowedExtensions());
-    }
+	/**
+	 * Returns allowed extensions list.
+	 *
+	 * @return string
+	 * @throws \InvalidArgumentException
+	 */
+	public function getAllowedExtensionList()
+	{
+		return implode(',', $this->getAllowedExtensions());
+	}
 
-    /**
-     * @return MediaModule|object
-     * @throws \InvalidArgumentException
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(MediaModule::class);
-    }
+	/**
+	 * @return MediaModule|object
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(MediaModule::class);
+	}
 
-    protected function getResourceFactory(): ResourceFactory
-    {
-        return GeneralUtility::makeInstance(ResourceFactory::class);
-    }
+	protected function getResourceFactory(): ResourceFactory
+	{
+		return GeneralUtility::makeInstance(ResourceFactory::class);
+	}
 }

Classes/Utility/SessionUtility.php

Indentation +52 added lines, -52 removed lines

@@ -17,61 +17,61 @@
  */
 class SessionUtility implements SingletonInterface
 {
-    /**
-     * @var string
-     */
-    protected $moduleKey = 'media';
+	/**
+	 * @var string
+	 */
+	protected $moduleKey = 'media';
 
-    /**
-     * Returns a class instance.
-     *
-     * @return \Fab\Media\Utility\SessionUtility|object
-     */
-    public static function getInstance()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Utility\SessionUtility::class);
-    }
+	/**
+	 * Returns a class instance.
+	 *
+	 * @return \Fab\Media\Utility\SessionUtility|object
+	 */
+	public static function getInstance()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Utility\SessionUtility::class);
+	}
 
-    public function __construct()
-    {
-        // Initialize storage from the current
-        if (!is_array($this->getBackendUser()->uc['moduleData'][$this->moduleKey])) {
-            $this->getBackendUser()->uc['moduleData'][$this->moduleKey] = [];
-            $this->getBackendUser()->writeUC();
-        }
-    }
+	public function __construct()
+	{
+		// Initialize storage from the current
+		if (!is_array($this->getBackendUser()->uc['moduleData'][$this->moduleKey])) {
+			$this->getBackendUser()->uc['moduleData'][$this->moduleKey] = [];
+			$this->getBackendUser()->writeUC();
+		}
+	}
 
-    /**
-     * Return a value from the Session according to the key
-     *
-     * @param string $key
-     * @return mixed
-     */
-    public function get($key)
-    {
-        return $this->getBackendUser()->uc['moduleData'][$this->moduleKey][$key];
-    }
+	/**
+	 * Return a value from the Session according to the key
+	 *
+	 * @param string $key
+	 * @return mixed
+	 */
+	public function get($key)
+	{
+		return $this->getBackendUser()->uc['moduleData'][$this->moduleKey][$key];
+	}
 
-    /**
-     * Set a key to the Session.
-     *
-     * @param string $key
-     * @param mixed $value
-     * @return void
-     */
-    public function set($key, $value)
-    {
-        $this->getBackendUser()->uc['moduleData'][$this->moduleKey][$key] = $value;
-        $this->getBackendUser()->writeUC();
-    }
+	/**
+	 * Set a key to the Session.
+	 *
+	 * @param string $key
+	 * @param mixed $value
+	 * @return void
+	 */
+	public function set($key, $value)
+	{
+		$this->getBackendUser()->uc['moduleData'][$this->moduleKey][$key] = $value;
+		$this->getBackendUser()->writeUC();
+	}
 
-    /**
-     * Returns an instance of the current Backend User.
-     *
-     * @return BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
 }

Classes/Utility/ClientValidation.php

Indentation +23 added lines, -23 removed lines

@@ -16,28 +16,28 @@
  */
 class ClientValidation implements SingletonInterface
 {
-    /**
-     * Returns a class instance
-     *
-     * @return \Fab\Media\Utility\ClientValidation|object
-     */
-    public static function getInstance()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Utility\ClientValidation::class);
-    }
+	/**
+	 * Returns a class instance
+	 *
+	 * @return \Fab\Media\Utility\ClientValidation|object
+	 */
+	public static function getInstance()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Utility\ClientValidation::class);
+	}
 
-    /**
-     * Get the validation class name given a field.
-     *
-     * @param string $fieldName
-     * @return string
-     */
-    public function get($fieldName)
-    {
-        $result = '';
-        if (TcaField::getService()->isRequired($fieldName)) {
-            $result = ' validate[required]';
-        }
-        return $result;
-    }
+	/**
+	 * Get the validation class name given a field.
+	 *
+	 * @param string $fieldName
+	 * @return string
+	 */
+	public function get($fieldName)
+	{
+		$result = '';
+		if (TcaField::getService()->isRequired($fieldName)) {
+			$result = ' validate[required]';
+		}
+		return $result;
+	}
 }

Classes/Utility/ImagePresetUtility.php

Indentation +80 added lines, -80 removed lines

@@ -18,92 +18,92 @@
  */
 class ImagePresetUtility implements 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
-     */
-    public static function getInstance()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Utility\ImagePresetUtility::class);
-    }
+	/**
+	 * Returns a class instance
+	 *
+	 * @return \Fab\Media\Utility\ImagePresetUtility|object
+	 */
+	public static 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 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 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 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 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 InvalidKeyInArrayException
-     * @return int
-     */
-    public function getWidth()
-    {
-        if (empty($this->store[$this->currentPreset])) {
-            throw new 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 InvalidKeyInArrayException
+	 * @return int
+	 */
+	public function getWidth()
+	{
+		if (empty($this->store[$this->currentPreset])) {
+			throw new 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 InvalidKeyInArrayException
-     * @return int
-     */
-    public function getHeight()
-    {
-        if (empty($this->store[$this->currentPreset])) {
-            throw new 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 InvalidKeyInArrayException
+	 * @return int
+	 */
+	public function getHeight()
+	{
+		if (empty($this->store[$this->currentPreset])) {
+			throw new InvalidKeyInArrayException('No existing values for current preset. Have you set a preset?', 1362501853);
+		}
+		return (int)$this->store[$this->currentPreset]['height'];
+	}
 }

Spacing +1 added lines, -1 removed lines

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

Classes/Utility/ConfigurationUtility.php

Indentation +56 added lines, -56 removed lines

@@ -17,67 +17,67 @@
  */
 class ConfigurationUtility implements SingletonInterface
 {
-    /**
-     * @var string
-     */
-    protected $extensionKey = 'media';
+	/**
+	 * @var string
+	 */
+	protected $extensionKey = 'media';
 
-    /**
-     * @var array
-     */
-    protected $configuration = [];
+	/**
+	 * @var array
+	 */
+	protected $configuration = [];
 
-    /**
-     * Returns a class instance.
-     *
-     * @return \Fab\Media\Utility\ConfigurationUtility|object
-     */
-    public static function getInstance()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Utility\ConfigurationUtility::class);
-    }
+	/**
+	 * Returns a class instance.
+	 *
+	 * @return \Fab\Media\Utility\ConfigurationUtility|object
+	 */
+	public static function getInstance()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Utility\ConfigurationUtility::class);
+	}
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $configuration = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('media');
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		$configuration = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('media');
 
-        // Fill up configuration array with relevant values.
-        foreach ($configuration as $key => $value) {
-            $this->configuration[$key] = $value;
-        }
-    }
+		// Fill up configuration array with relevant values.
+		foreach ($configuration as $key => $value) {
+			$this->configuration[$key] = $value;
+		}
+	}
 
-    /**
-     * Returns a setting key.
-     *
-     * @param string $key
-     * @return array
-     */
-    public function get($key)
-    {
-        return isset($this->configuration[$key]) ? trim($this->configuration[$key]) : null;
-    }
+	/**
+	 * Returns a setting key.
+	 *
+	 * @param string $key
+	 * @return array
+	 */
+	public function get($key)
+	{
+		return isset($this->configuration[$key]) ? trim($this->configuration[$key]) : null;
+	}
 
-    /**
-     * Set a setting key.
-     *
-     * @param string $key
-     * @param mixed $value
-     * @return void
-     */
-    public function set($key, $value)
-    {
-        $this->configuration[$key] = $value;
-    }
+	/**
+	 * Set a setting key.
+	 *
+	 * @param string $key
+	 * @param mixed $value
+	 * @return void
+	 */
+	public function set($key, $value)
+	{
+		$this->configuration[$key] = $value;
+	}
 
-    /**
-     * @return array
-     */
-    public function getConfiguration()
-    {
-        return $this->configuration;
-    }
+	/**
+	 * @return array
+	 */
+	public function getConfiguration()
+	{
+		return $this->configuration;
+	}
 }

Classes/Utility/Logger.php

Indentation +13 added lines, -13 removed lines

@@ -17,18 +17,18 @@
  */
 class Logger implements SingletonInterface
 {
-    /**
-     * Returns a logger class instance.
-     *
-     * @param mixed $instance
-     * @return \TYPO3\CMS\Core\Log\Logger
-     */
-    public static function getInstance($instance)
-    {
-        /** @var $loggerManager \TYPO3\CMS\Core\Log\LogManager */
-        $loggerManager = GeneralUtility::makeInstance(LogManager::class);
+	/**
+	 * Returns a logger class instance.
+	 *
+	 * @param mixed $instance
+	 * @return \TYPO3\CMS\Core\Log\Logger
+	 */
+	public static function getInstance($instance)
+	{
+		/** @var $loggerManager \TYPO3\CMS\Core\Log\LogManager */
+		$loggerManager = GeneralUtility::makeInstance(LogManager::class);
 
-        /** @var $logger \TYPO3\CMS\Core\Log\Logger */
-        return $loggerManager->getLogger(get_class($instance));
-    }
+		/** @var $logger \TYPO3\CMS\Core\Log\Logger */
+		return $loggerManager->getLogger(get_class($instance));
+	}
 }

Classes/Utility/Path.php

Indentation +67 added lines, -67 removed lines

@@ -18,77 +18,77 @@
  */
 class Path
 {
-    /**
-     * @var string
-     */
-    protected static $extensionName = 'media';
+	/**
+	 * @var string
+	 */
+	protected static $extensionName = 'media';
 
-    /**
-     * Return a public path pointing to a resource.
-     *
-     * @param string $resource
-     * @return string
-     */
-    public static function getRelativePath($resource)
-    {
-        // If file is not found, resolve the path
-        if (!is_file(Environment::getPublicPath() . '/' . $resource)) {
-            $resource = substr(self::resolvePath($resource), strlen(Environment::getPublicPath() . '/'));
-        }
+	/**
+	 * Return a public path pointing to a resource.
+	 *
+	 * @param string $resource
+	 * @return string
+	 */
+	public static function getRelativePath($resource)
+	{
+		// If file is not found, resolve the path
+		if (!is_file(Environment::getPublicPath() . '/' . $resource)) {
+			$resource = substr(self::resolvePath($resource), strlen(Environment::getPublicPath() . '/'));
+		}
 
-        return PathUtility::getRelativePathTo(PathUtility::dirname(Environment::getPublicPath() . '/' . $resource)) . PathUtility::basename($resource);
-    }
+		return PathUtility::getRelativePathTo(PathUtility::dirname(Environment::getPublicPath() . '/' . $resource)) . PathUtility::basename($resource);
+	}
 
-    /**
-     * Resolves path e.g. EXT:media/Resources/Public/foo.png or ../../foo and returns an absolute path to the given resource.
-     *
-     * @param string $resource
-     * @return string
-     */
-    public static function resolvePath($resource)
-    {
-        $resource = self::canonicalPath($resource);
-        if (!is_file(Environment::getPublicPath() . '/' . $resource)) {
-            $resource = 'EXT:' . GeneralUtility::camelCaseToLowerCaseUnderscored(self::$extensionName) . '/Resources/Public/' . $resource;
-        }
-        return GeneralUtility::getFileAbsFileName($resource);
-    }
+	/**
+	 * Resolves path e.g. EXT:media/Resources/Public/foo.png or ../../foo and returns an absolute path to the given resource.
+	 *
+	 * @param string $resource
+	 * @return string
+	 */
+	public static function resolvePath($resource)
+	{
+		$resource = self::canonicalPath($resource);
+		if (!is_file(Environment::getPublicPath() . '/' . $resource)) {
+			$resource = 'EXT:' . GeneralUtility::camelCaseToLowerCaseUnderscored(self::$extensionName) . '/Resources/Public/' . $resource;
+		}
+		return GeneralUtility::getFileAbsFileName($resource);
+	}
 
-    /**
-     * Tell whether a resource exist.
-     *
-     * @param string $resource
-     * @return string
-     */
-    public static function exists($resource)
-    {
-        return is_file(self::resolvePath($resource));
-    }
+	/**
+	 * Tell whether a resource exist.
+	 *
+	 * @param string $resource
+	 * @return string
+	 */
+	public static function exists($resource)
+	{
+		return is_file(self::resolvePath($resource));
+	}
 
-    /**
-     * Tell whether a resource does not exist.
-     *
-     * @param string $resource
-     * @return string
-     */
-    public static function notExists($resource)
-    {
-        return !self::exists($resource);
-    }
+	/**
+	 * Tell whether a resource does not exist.
+	 *
+	 * @param string $resource
+	 * @return string
+	 */
+	public static function notExists($resource)
+	{
+		return !self::exists($resource);
+	}
 
-    /**
-     * Returns a canonical path by stripping relative segment ../foo/../bar will become foo/bar
-     *
-     * @param $resource
-     * @return string
-     */
-    public static function canonicalPath($resource)
-    {
-        $segments = explode('/', $resource);
-        $keys = array_keys($segments, '..');
-        foreach ($keys as $key) {
-            unset($segments[$key]);
-        }
-        return implode('/', $segments);
-    }
+	/**
+	 * Returns a canonical path by stripping relative segment ../foo/../bar will become foo/bar
+	 *
+	 * @param $resource
+	 * @return string
+	 */
+	public static function canonicalPath($resource)
+	{
+		$segments = explode('/', $resource);
+		$keys = array_keys($segments, '..');
+		foreach ($keys as $key) {
+			unset($segments[$key]);
+		}
+		return implode('/', $segments);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -32,11 +32,11 @@ 
     public static function getRelativePath($resource)
     {
         // If file is not found, resolve the path
-        if (!is_file(Environment::getPublicPath() . '/' . $resource)) {
-            $resource = substr(self::resolvePath($resource), strlen(Environment::getPublicPath() . '/'));
+        if (!is_file(Environment::getPublicPath().'/'.$resource)) {
+            $resource = substr(self::resolvePath($resource), strlen(Environment::getPublicPath().'/'));
         }
 
-        return PathUtility::getRelativePathTo(PathUtility::dirname(Environment::getPublicPath() . '/' . $resource)) . PathUtility::basename($resource);
+        return PathUtility::getRelativePathTo(PathUtility::dirname(Environment::getPublicPath().'/'.$resource)).PathUtility::basename($resource);
     }
 
     /**
@@ -48,8 +48,8 @@ 
     public static function resolvePath($resource)
     {
         $resource = self::canonicalPath($resource);
-        if (!is_file(Environment::getPublicPath() . '/' . $resource)) {
-            $resource = 'EXT:' . GeneralUtility::camelCaseToLowerCaseUnderscored(self::$extensionName) . '/Resources/Public/' . $resource;
+        if (!is_file(Environment::getPublicPath().'/'.$resource)) {
+            $resource = 'EXT:'.GeneralUtility::camelCaseToLowerCaseUnderscored(self::$extensionName).'/Resources/Public/'.$resource;
         }
         return GeneralUtility::getFileAbsFileName($resource);
     }