fabarea / media

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/FileUpload/Base64File.php

Doc Comments +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
     protected $extension;
 
     /**
-     * @return \Fab\Media\FileUpload\Base64File
+     * @return false|null
      */
     public function __construct()
     {
@@ -116,7 +116,7 @@ 
     /**
      * Get MIME type of file.
      *
-     * @return string|boolean MIME type. eg, text/html, false on error
+     * @return string|false MIME type. eg, text/html, false on error
      */
     public function getMimeType()
     {

Indentation +113 added lines, -113 removed lines

@@ -16,117 +16,117 @@
 class Base64File extends \Fab\Media\FileUpload\UploadedFileAbstract
 {
 
-    /**
-     * @var string
-     */
-    protected $inputName = 'qqfile';
-
-    /**
-     * @var string
-     */
-    protected $uploadFolder;
-
-    /**
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * @var string
-     */
-    protected $image;
-
-    /**
-     * @var string
-     */
-    protected $extension;
-
-    /**
-     * @return \Fab\Media\FileUpload\Base64File
-     */
-    public function __construct()
-    {
-
-        // Processes the encoded image data and returns the decoded image
-        $encodedImage = GeneralUtility::_POST($this->inputName);
-        if (preg_match('/^data:image\/(jpg|jpeg|png)/i', $encodedImage, $matches)) {
-            $this->extension = $matches[1];
-        } else {
-            return false;
-        }
-
-        // Remove the mime-type header
-        $data = reset(array_reverse(explode('base64,', $encodedImage)));
-
-        // Use strict mode to prevent characters from outside the base64 range
-        $this->image = base64_decode($data, true);
-
-        if (!$this->image) {
-            return false;
-        }
-
-        $this->setName(uniqid() . '.' . $this->extension);
-    }
-
-    /**
-     * Save the file to the specified path
-     *
-     * @throws \Fab\Media\Exception\EmptyPropertyException
-     * @return boolean true on success
-     */
-    public function save()
-    {
-
-        if (is_null($this->uploadFolder)) {
-            throw new \Fab\Media\Exception\EmptyPropertyException('Upload folder is not defined', 1362587741);
-        }
-
-        if (is_null($this->name)) {
-            throw new \Fab\Media\Exception\EmptyPropertyException('File name is not defined', 1362587742);
-        }
-
-        return file_put_contents($this->getFileWithAbsolutePath(), $this->image) > 0;
-    }
-
-    /**
-     * Get the original file name.
-     *
-     * @return string
-     */
-    public function getOriginalName()
-    {
-        return $this->getName();
-    }
-
-    /**
-     * Get the file size
-     *
-     * @throws \Exception
-     * @return integer file-size in byte
-     */
-    public function getSize()
-    {
-        if (isset($GLOBALS['_SERVER']['CONTENT_LENGTH'])) {
-            return (int)$GLOBALS['_SERVER']['CONTENT_LENGTH'];
-        } else {
-            throw new \Exception('Getting content length is not supported.');
-        }
-    }
-
-    /**
-     * Get MIME type of file.
-     *
-     * @return string|boolean MIME type. eg, text/html, false on error
-     */
-    public function getMimeType()
-    {
-        $this->checkFileExistence();
-        if (function_exists('finfo_file')) {
-            $fileInfo = new \finfo();
-            return $fileInfo->file($this->getFileWithAbsolutePath(), FILEINFO_MIME_TYPE);
-        } elseif (function_exists('mime_content_type')) {
-            return mime_content_type($this->getFileWithAbsolutePath());
-        }
-        return false;
-    }
+	/**
+	 * @var string
+	 */
+	protected $inputName = 'qqfile';
+
+	/**
+	 * @var string
+	 */
+	protected $uploadFolder;
+
+	/**
+	 * @var string
+	 */
+	protected $name;
+
+	/**
+	 * @var string
+	 */
+	protected $image;
+
+	/**
+	 * @var string
+	 */
+	protected $extension;
+
+	/**
+	 * @return \Fab\Media\FileUpload\Base64File
+	 */
+	public function __construct()
+	{
+
+		// Processes the encoded image data and returns the decoded image
+		$encodedImage = GeneralUtility::_POST($this->inputName);
+		if (preg_match('/^data:image\/(jpg|jpeg|png)/i', $encodedImage, $matches)) {
+			$this->extension = $matches[1];
+		} else {
+			return false;
+		}
+
+		// Remove the mime-type header
+		$data = reset(array_reverse(explode('base64,', $encodedImage)));
+
+		// Use strict mode to prevent characters from outside the base64 range
+		$this->image = base64_decode($data, true);
+
+		if (!$this->image) {
+			return false;
+		}
+
+		$this->setName(uniqid() . '.' . $this->extension);
+	}
+
+	/**
+	 * Save the file to the specified path
+	 *
+	 * @throws \Fab\Media\Exception\EmptyPropertyException
+	 * @return boolean true on success
+	 */
+	public function save()
+	{
+
+		if (is_null($this->uploadFolder)) {
+			throw new \Fab\Media\Exception\EmptyPropertyException('Upload folder is not defined', 1362587741);
+		}
+
+		if (is_null($this->name)) {
+			throw new \Fab\Media\Exception\EmptyPropertyException('File name is not defined', 1362587742);
+		}
+
+		return file_put_contents($this->getFileWithAbsolutePath(), $this->image) > 0;
+	}
+
+	/**
+	 * Get the original file name.
+	 *
+	 * @return string
+	 */
+	public function getOriginalName()
+	{
+		return $this->getName();
+	}
+
+	/**
+	 * Get the file size
+	 *
+	 * @throws \Exception
+	 * @return integer file-size in byte
+	 */
+	public function getSize()
+	{
+		if (isset($GLOBALS['_SERVER']['CONTENT_LENGTH'])) {
+			return (int)$GLOBALS['_SERVER']['CONTENT_LENGTH'];
+		} else {
+			throw new \Exception('Getting content length is not supported.');
+		}
+	}
+
+	/**
+	 * Get MIME type of file.
+	 *
+	 * @return string|boolean MIME type. eg, text/html, false on error
+	 */
+	public function getMimeType()
+	{
+		$this->checkFileExistence();
+		if (function_exists('finfo_file')) {
+			$fileInfo = new \finfo();
+			return $fileInfo->file($this->getFileWithAbsolutePath(), FILEINFO_MIME_TYPE);
+		} elseif (function_exists('mime_content_type')) {
+			return mime_content_type($this->getFileWithAbsolutePath());
+		}
+		return false;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
             return false;
         }
 
-        $this->setName(uniqid() . '.' . $this->extension);
+        $this->setName(uniqid().'.'.$this->extension);
     }
 
     /**

Classes/FileUpload/StreamedFile.php

Doc Comments +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
     /**
      * Get MIME type of file.
      *
-     * @return string|boolean MIME type. eg, text/html, false on error
+     * @return string|false MIME type. eg, text/html, false on error
      */
     public function getMimeType()
     {

Indentation +90 added lines, -90 removed lines

@@ -18,94 +18,94 @@
 class StreamedFile extends \Fab\Media\FileUpload\UploadedFileAbstract
 {
 
-    /**
-     * @var string
-     */
-    protected $inputName = 'qqfile';
-
-    /**
-     * @var string
-     */
-    protected $uploadFolder;
-
-    /**
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * Save the file to the specified path
-     *
-     * @throws EmptyPropertyException
-     * @return boolean true on success
-     */
-    public function save()
-    {
-
-        if (is_null($this->uploadFolder)) {
-            throw new EmptyPropertyException('Upload folder is not defined', 1361787579);
-        }
-
-        if (is_null($this->name)) {
-            throw new EmptyPropertyException('File name is not defined', 1361787580);
-        }
-
-        $input = fopen("php://input", "r");
-        $temp = tmpfile();
-        $realSize = stream_copy_to_stream($input, $temp);
-        fclose($input);
-
-        if ($realSize != $this->getSize()) {
-            return false;
-        }
-
-        $target = fopen($this->getFileWithAbsolutePath(), "w");
-        fseek($temp, 0, SEEK_SET);
-        stream_copy_to_stream($temp, $target);
-        fclose($target);
-
-        return true;
-    }
-
-    /**
-     * Get the original file name.
-     *
-     * @return string
-     */
-    public function getOriginalName()
-    {
-        return $_GET[$this->inputName];
-    }
-
-    /**
-     * Get the file size
-     *
-     * @throws \Exception
-     * @return integer file-size in byte
-     */
-    public function getSize()
-    {
-        if (isset($GLOBALS['_SERVER']['CONTENT_LENGTH'])) {
-            return (int)$GLOBALS['_SERVER']['CONTENT_LENGTH'];
-        } else {
-            throw new \Exception('Getting content length is not supported.');
-        }
-    }
-
-    /**
-     * Get MIME type of file.
-     *
-     * @return string|boolean MIME type. eg, text/html, false on error
-     */
-    public function getMimeType()
-    {
-        $this->checkFileExistence();
-        if (function_exists('finfo_file')) {
-            $fileInfo = new \finfo();
-            return $fileInfo->file($this->getFileWithAbsolutePath(), FILEINFO_MIME_TYPE);
-        } elseif (function_exists('mime_content_type')) {
-            return mime_content_type($this->getFileWithAbsolutePath());
-        }
-        return false;
-    }
+	/**
+	 * @var string
+	 */
+	protected $inputName = 'qqfile';
+
+	/**
+	 * @var string
+	 */
+	protected $uploadFolder;
+
+	/**
+	 * @var string
+	 */
+	protected $name;
+
+	/**
+	 * Save the file to the specified path
+	 *
+	 * @throws EmptyPropertyException
+	 * @return boolean true on success
+	 */
+	public function save()
+	{
+
+		if (is_null($this->uploadFolder)) {
+			throw new EmptyPropertyException('Upload folder is not defined', 1361787579);
+		}
+
+		if (is_null($this->name)) {
+			throw new EmptyPropertyException('File name is not defined', 1361787580);
+		}
+
+		$input = fopen("php://input", "r");
+		$temp = tmpfile();
+		$realSize = stream_copy_to_stream($input, $temp);
+		fclose($input);
+
+		if ($realSize != $this->getSize()) {
+			return false;
+		}
+
+		$target = fopen($this->getFileWithAbsolutePath(), "w");
+		fseek($temp, 0, SEEK_SET);
+		stream_copy_to_stream($temp, $target);
+		fclose($target);
+
+		return true;
+	}
+
+	/**
+	 * Get the original file name.
+	 *
+	 * @return string
+	 */
+	public function getOriginalName()
+	{
+		return $_GET[$this->inputName];
+	}
+
+	/**
+	 * Get the file size
+	 *
+	 * @throws \Exception
+	 * @return integer file-size in byte
+	 */
+	public function getSize()
+	{
+		if (isset($GLOBALS['_SERVER']['CONTENT_LENGTH'])) {
+			return (int)$GLOBALS['_SERVER']['CONTENT_LENGTH'];
+		} else {
+			throw new \Exception('Getting content length is not supported.');
+		}
+	}
+
+	/**
+	 * Get MIME type of file.
+	 *
+	 * @return string|boolean MIME type. eg, text/html, false on error
+	 */
+	public function getMimeType()
+	{
+		$this->checkFileExistence();
+		if (function_exists('finfo_file')) {
+			$fileInfo = new \finfo();
+			return $fileInfo->file($this->getFileWithAbsolutePath(), FILEINFO_MIME_TYPE);
+		} elseif (function_exists('mime_content_type')) {
+			return mime_content_type($this->getFileWithAbsolutePath());
+		}
+		return false;
+	}
 }

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

Classes/TypeConverter/ContentToFileConverter.php

Indentation +26 added lines, -26 removed lines

@@ -19,30 +19,30 @@
 class ContentToFileConverter implements SingletonInterface
 {
 
-    /**
-     * Convert a file representation to File Resource.
-     *
-     * @param Content|int $fileRepresentation
-     * @throws \RuntimeException
-     * @return File
-     */
-    public function convert($fileRepresentation)
-    {
-
-        if ($fileRepresentation instanceof Content) {
-
-            $fileData = $fileRepresentation->toArray();
-            $fileData['modification_date'] = $fileData['tstamp'];
-
-            if (!isset($fileData['storage']) && $fileData['storage'] === null) {
-                throw new \RuntimeException('Storage identifier can not be null.', 1379946981);
-            }
-
-            $fileUid = $fileData['uid'];
-        } else {
-            $fileData = [];
-            $fileUid = (int)$fileRepresentation;
-        }
-        return ResourceFactory::getInstance()->getFileObject($fileUid, $fileData);
-    }
+	/**
+	 * Convert a file representation to File Resource.
+	 *
+	 * @param Content|int $fileRepresentation
+	 * @throws \RuntimeException
+	 * @return File
+	 */
+	public function convert($fileRepresentation)
+	{
+
+		if ($fileRepresentation instanceof Content) {
+
+			$fileData = $fileRepresentation->toArray();
+			$fileData['modification_date'] = $fileData['tstamp'];
+
+			if (!isset($fileData['storage']) && $fileData['storage'] === null) {
+				throw new \RuntimeException('Storage identifier can not be null.', 1379946981);
+			}
+
+			$fileUid = $fileData['uid'];
+		} else {
+			$fileData = [];
+			$fileUid = (int)$fileRepresentation;
+		}
+		return ResourceFactory::getInstance()->getFileObject($fileUid, $fileData);
+	}
 }
\ No newline at end of file

Classes/ViewHelpers/ReportToViewHelper.php

Indentation +14 added lines, -14 removed lines

@@ -16,18 +16,18 @@
 class ReportToViewHelper extends AbstractViewHelper
 {
 
-    /**
-     * Returns the people who will receive a report.
-     *
-     * @throws \Exception
-     * @return string
-     */
-    public function render()
-    {
-        $reportTo = 'null (Missing value in $GLOBALS[TYPO3_CONF_VARS][MAIL][defaultMailFromAddress])';
-        if (!empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'])) {
-            $reportTo = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'];
-        }
-        return $reportTo;
-    }
+	/**
+	 * Returns the people who will receive a report.
+	 *
+	 * @throws \Exception
+	 * @return string
+	 */
+	public function render()
+	{
+		$reportTo = 'null (Missing value in $GLOBALS[TYPO3_CONF_VARS][MAIL][defaultMailFromAddress])';
+		if (!empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'])) {
+			$reportTo = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'];
+		}
+		return $reportTo;
+	}
 }

Classes/ViewHelpers/MetadataViewHelper.php

Indentation +39 added lines, -39 removed lines

@@ -21,50 +21,50 @@
 class MetadataViewHelper extends AbstractViewHelper
 {
 
-    /**
-     * Returns metadata according to a template.
-     *
-     * @param File $file
-     * @param string $template
-     * @param array $metadataProperties
-     * @param array $configuration
-     * @return string
-     */
-    public function render(File $file, $template = '', array $metadataProperties = array('size', 'width', 'height'), $configuration = [])
-    {
+	/**
+	 * Returns metadata according to a template.
+	 *
+	 * @param File $file
+	 * @param string $template
+	 * @param array $metadataProperties
+	 * @param array $configuration
+	 * @return string
+	 */
+	public function render(File $file, $template = '', array $metadataProperties = array('size', 'width', 'height'), $configuration = [])
+	{
 
-        if (empty($template)) {
-            $template = $this->getDefaultTemplate($file);
-        }
+		if (empty($template)) {
+			$template = $this->getDefaultTemplate($file);
+		}
 
-        $result = $template;
-        foreach ($metadataProperties as $metadataProperty) {
-            $value = $file->getProperty($metadataProperty);
-            if ($metadataProperty === 'size') {
-                $sizeUnit = empty($configuration['sizeUnit']) ? 1000 : $configuration['sizeUnit'];
-                $value = round($file->getSize() / $sizeUnit);
-            }
-            $result = str_replace('%' . $metadataProperty, $value, $result);
-        }
+		$result = $template;
+		foreach ($metadataProperties as $metadataProperty) {
+			$value = $file->getProperty($metadataProperty);
+			if ($metadataProperty === 'size') {
+				$sizeUnit = empty($configuration['sizeUnit']) ? 1000 : $configuration['sizeUnit'];
+				$value = round($file->getSize() / $sizeUnit);
+			}
+			$result = str_replace('%' . $metadataProperty, $value, $result);
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Returns a default template.
-     *
-     * @param File $file
-     * @return string
-     */
-    protected function getDefaultTemplate(File $file)
-    {
+	/**
+	 * Returns a default template.
+	 *
+	 * @param File $file
+	 * @return string
+	 */
+	protected function getDefaultTemplate(File $file)
+	{
 
-        $template = '%size KB';
+		$template = '%size KB';
 
-        if ($file->getType() == File::FILETYPE_IMAGE) {
-            $template = '%width x %height - ' . $template;
-        }
+		if ($file->getType() == File::FILETYPE_IMAGE) {
+			$template = '%width x %height - ' . $template;
+		}
 
-        return $template;
-    }
+		return $template;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
                 $sizeUnit = empty($configuration['sizeUnit']) ? 1000 : $configuration['sizeUnit'];
                 $value = round($file->getSize() / $sizeUnit);
             }
-            $result = str_replace('%' . $metadataProperty, $value, $result);
+            $result = str_replace('%'.$metadataProperty, $value, $result);
         }
 
         return $result;
@@ -62,7 +62,7 @@ 
         $template = '%size KB';
 
         if ($file->getType() == File::FILETYPE_IMAGE) {
-            $template = '%width x %height - ' . $template;
+            $template = '%width x %height - '.$template;
         }
 
         return $template;

Classes/Index/TitleMetadataExtractor.php

Indentation +111 added lines, -111 removed lines

@@ -20,124 +20,124 @@
 class TitleMetadataExtractor implements ExtractorInterface
 {
 
-    /**
-     * Returns an array of supported file types;
-     * An empty array indicates all filetypes
-     *
-     * @return array
-     */
-    public function getFileTypeRestrictions()
-    {
-        return [];
-    }
+	/**
+	 * Returns an array of supported file types;
+	 * An empty array indicates all filetypes
+	 *
+	 * @return array
+	 */
+	public function getFileTypeRestrictions()
+	{
+		return [];
+	}
 
-    /**
-     * Get all supported DriverClasses
-     * Since some extractors may only work for local files, and other extractors
-     * are especially made for grabbing data from remote.
-     * Returns array of string with driver names of Drivers which are supported,
-     * If the driver did not register a name, it's the classname.
-     * empty array indicates no restrictions
-     *
-     * @return array
-     */
-    public function getDriverRestrictions()
-    {
-        return [];
-    }
+	/**
+	 * Get all supported DriverClasses
+	 * Since some extractors may only work for local files, and other extractors
+	 * are especially made for grabbing data from remote.
+	 * Returns array of string with driver names of Drivers which are supported,
+	 * If the driver did not register a name, it's the classname.
+	 * empty array indicates no restrictions
+	 *
+	 * @return array
+	 */
+	public function getDriverRestrictions()
+	{
+		return [];
+	}
 
-    /**
-     * Returns the data priority of the extraction Service.
-     * Defines the precedence of Data if several extractors
-     * extracted the same property.
-     * Should be between 1 and 100, 100 is more important than 1
-     *
-     * @return integer
-     */
-    public function getPriority()
-    {
-        return 15;
-    }
+	/**
+	 * Returns the data priority of the extraction Service.
+	 * Defines the precedence of Data if several extractors
+	 * extracted the same property.
+	 * Should be between 1 and 100, 100 is more important than 1
+	 *
+	 * @return integer
+	 */
+	public function getPriority()
+	{
+		return 15;
+	}
 
-    /**
-     * Returns the execution priority of the extraction Service
-     * Should be between 1 and 100, 100 means runs as first service, 1 runs at last service
-     *
-     * @return integer
-     */
-    public function getExecutionPriority()
-    {
-        return 15;
-    }
+	/**
+	 * Returns the execution priority of the extraction Service
+	 * Should be between 1 and 100, 100 means runs as first service, 1 runs at last service
+	 *
+	 * @return integer
+	 */
+	public function getExecutionPriority()
+	{
+		return 15;
+	}
 
-    /**
-     * Checks if the given file can be processed by this Extractor
-     *
-     * @param File $file
-     * @return boolean
-     */
-    public function canProcess(File $file)
-    {
-        return true;
-    }
+	/**
+	 * Checks if the given file can be processed by this Extractor
+	 *
+	 * @param File $file
+	 * @return boolean
+	 */
+	public function canProcess(File $file)
+	{
+		return true;
+	}
 
-    /**
-     * The actual processing TASK
-     * Should return an array with database properties for sys_file_metadata to write
-     *
-     * @param File $file
-     * @param array $previousExtractedData optional, contains the array of already extracted data
-     * @return array
-     */
-    public function extractMetaData(File $file, array $previousExtractedData = [])
-    {
-        $metadata = [];
-        $title = $file->getProperty('title');
-        if (empty($title)) {
-            $metadata = array('title' => $this->guessTitle($file->getName()));
-        }
-        return $metadata;
-    }
+	/**
+	 * The actual processing TASK
+	 * Should return an array with database properties for sys_file_metadata to write
+	 *
+	 * @param File $file
+	 * @param array $previousExtractedData optional, contains the array of already extracted data
+	 * @return array
+	 */
+	public function extractMetaData(File $file, array $previousExtractedData = [])
+	{
+		$metadata = [];
+		$title = $file->getProperty('title');
+		if (empty($title)) {
+			$metadata = array('title' => $this->guessTitle($file->getName()));
+		}
+		return $metadata;
+	}
 
-    /**
-     * Guess a title given a file name. Examples:
-     * name: my-file-name.jpg -> title: My file name
-     * name: myFileName.jpg -> title: My file name
-     *
-     * @param string $fileName
-     * @return string
-     */
-    protected function guessTitle($fileName)
-    {
-        $fileNameWithoutExtension = $this->removeExtension($fileName);
+	/**
+	 * Guess a title given a file name. Examples:
+	 * name: my-file-name.jpg -> title: My file name
+	 * name: myFileName.jpg -> title: My file name
+	 *
+	 * @param string $fileName
+	 * @return string
+	 */
+	protected function guessTitle($fileName)
+	{
+		$fileNameWithoutExtension = $this->removeExtension($fileName);
 
-        $title = $fileNameWithoutExtension;
-        // first case: the name is separated by _ or -
-        // second case: this is an upper camel case name
-        if (preg_match('/-|_/is', $fileNameWithoutExtension)) {
-            $title = preg_replace('/-|_/is', ' ', $fileNameWithoutExtension);
-        } elseif (preg_match('/[A-Z]/', $fileNameWithoutExtension)) {
-            $parts = preg_split('/(?=[A-Z])/', $fileNameWithoutExtension, -1, PREG_SPLIT_NO_EMPTY);
-            $title = implode(' ', $parts);
-        }
+		$title = $fileNameWithoutExtension;
+		// first case: the name is separated by _ or -
+		// second case: this is an upper camel case name
+		if (preg_match('/-|_/is', $fileNameWithoutExtension)) {
+			$title = preg_replace('/-|_/is', ' ', $fileNameWithoutExtension);
+		} elseif (preg_match('/[A-Z]/', $fileNameWithoutExtension)) {
+			$parts = preg_split('/(?=[A-Z])/', $fileNameWithoutExtension, -1, PREG_SPLIT_NO_EMPTY);
+			$title = implode(' ', $parts);
+		}
 
-        // Remove double space.
-        $title = preg_replace('/\s+/', ' ', $title);
-        return ucfirst($title);
-    }
+		// Remove double space.
+		$title = preg_replace('/\s+/', ' ', $title);
+		return ucfirst($title);
+	}
 
-    /**
-     * Remove extension of a file.
-     *
-     * @param string $fileName
-     * @return string
-     */
-    protected function removeExtension($fileName)
-    {
-        $parts = explode('.', $fileName);
-        if (!empty($parts)) {
-            array_pop($parts);
-        }
-        return implode('.', $parts);
-    }
+	/**
+	 * Remove extension of a file.
+	 *
+	 * @param string $fileName
+	 * @return string
+	 */
+	protected function removeExtension($fileName)
+	{
+		$parts = explode('.', $fileName);
+		if (!empty($parts)) {
+			array_pop($parts);
+		}
+		return implode('.', $parts);
+	}
 }

Classes/FileUpload/ImageOptimizer.php

Indentation +70 added lines, -70 removed lines

@@ -17,83 +17,83 @@
 class ImageOptimizer implements SingletonInterface
 {
 
-    /**
-     * @var array
-     */
-    protected $optimizers = [];
+	/**
+	 * @var array
+	 */
+	protected $optimizers = [];
 
-    /**
-     * @var \TYPO3\CMS\Core\Resource\ResourceStorage
-     */
-    protected $storage;
+	/**
+	 * @var \TYPO3\CMS\Core\Resource\ResourceStorage
+	 */
+	protected $storage;
 
-    /**
-     * Returns a class instance.
-     *
-     * @return ImageOptimizer
-     * @throws \InvalidArgumentException
-     * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
-     */
-    static public function getInstance($storage = null)
-    {
-        return GeneralUtility::makeInstance(self::class, $storage);
-    }
+	/**
+	 * Returns a class instance.
+	 *
+	 * @return ImageOptimizer
+	 * @throws \InvalidArgumentException
+	 * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
+	 */
+	static public function getInstance($storage = null)
+	{
+		return GeneralUtility::makeInstance(self::class, $storage);
+	}
 
-    /**
-     * Constructor
-     *
-     * @return ImageOptimizer
-     * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
-     */
-    public function __construct($storage = null)
-    {
-        $this->storage = $storage;
-        $this->add('Fab\Media\FileUpload\Optimizer\Resize');
-        $this->add('Fab\Media\FileUpload\Optimizer\Rotate');
-    }
+	/**
+	 * Constructor
+	 *
+	 * @return ImageOptimizer
+	 * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
+	 */
+	public function __construct($storage = null)
+	{
+		$this->storage = $storage;
+		$this->add('Fab\Media\FileUpload\Optimizer\Resize');
+		$this->add('Fab\Media\FileUpload\Optimizer\Rotate');
+	}
 
-    /**
-     * Register a new optimizer
-     *
-     * @param string $className
-     * @return void
-     */
-    public function add($className)
-    {
-        $this->optimizers[] = $className;
-    }
+	/**
+	 * Register a new optimizer
+	 *
+	 * @param string $className
+	 * @return void
+	 */
+	public function add($className)
+	{
+		$this->optimizers[] = $className;
+	}
 
-    /**
-     * Un-register a new optimizer
-     *
-     * @param string $className
-     * @return void
-     */
-    public function remove($className)
-    {
-        if (in_array($className, $this->optimizers)) {
-            $key = array_search($className, $this->optimizers);
-            unset($this->optimizers[$key]);
-        }
-    }
+	/**
+	 * Un-register a new optimizer
+	 *
+	 * @param string $className
+	 * @return void
+	 */
+	public function remove($className)
+	{
+		if (in_array($className, $this->optimizers)) {
+			$key = array_search($className, $this->optimizers);
+			unset($this->optimizers[$key]);
+		}
+	}
 
-    /**
-     * Optimize an image
-     *
-     * @param UploadedFileInterface $uploadedFile
-     * @return UploadedFileInterface
-     * @throws \InvalidArgumentException
-     */
-    public function optimize(UploadedFileInterface $uploadedFile)
-    {
+	/**
+	 * Optimize an image
+	 *
+	 * @param UploadedFileInterface $uploadedFile
+	 * @return UploadedFileInterface
+	 * @throws \InvalidArgumentException
+	 */
+	public function optimize(UploadedFileInterface $uploadedFile)
+	{
 
-        foreach ($this->optimizers as $optimizer) {
+		foreach ($this->optimizers as $optimizer) {
 
-            /** @var $optimizer \Fab\Media\FileUpload\ImageOptimizerInterface */
-            $optimizer = GeneralUtility::makeInstance($optimizer, $this->storage);
-            $uploadedFile = $optimizer->optimize($uploadedFile);
-        }
+			/** @var $optimizer \Fab\Media\FileUpload\ImageOptimizerInterface */
+			$optimizer = GeneralUtility::makeInstance($optimizer, $this->storage);
+			$uploadedFile = $optimizer->optimize($uploadedFile);
+		}
 
-        return $uploadedFile;
-    }
+		return $uploadedFile;
+	}
 }