fabarea / media

Classes/FileUpload/ImageOptimizer.php

Indentation +70 added lines, -70 removed lines

@@ -17,81 +17,81 @@
  */
 class ImageOptimizer implements SingletonInterface
 {
-    /**
-     * @var array
-     */
-    protected $optimizers = [];
+	/**
+	 * @var array
+	 */
+	protected $optimizers = [];
 
-    /**
-     * @var ResourceStorage
-     */
-    protected $storage;
+	/**
+	 * @var ResourceStorage
+	 */
+	protected $storage;
 
-    /**
-     * Returns a class instance.
-     *
-     * @return ImageOptimizer
-     * @throws \InvalidArgumentException
-     * @param ResourceStorage $storage
-     */
-    public static function getInstance($storage = null)
-    {
-        return GeneralUtility::makeInstance(self::class, $storage);
-    }
+	/**
+	 * Returns a class instance.
+	 *
+	 * @return ImageOptimizer
+	 * @throws \InvalidArgumentException
+	 * @param ResourceStorage $storage
+	 */
+	public static function getInstance($storage = null)
+	{
+		return GeneralUtility::makeInstance(self::class, $storage);
+	}
 
-    /**
-     * Constructor
-     *
-     * @return ImageOptimizer
-     * @param 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 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)
-    {
-        foreach ($this->optimizers as $optimizer) {
-            /** @var $optimizer \Fab\Media\FileUpload\ImageOptimizerInterface */
-            $optimizer = GeneralUtility::makeInstance($optimizer, $this->storage);
-            $uploadedFile = $optimizer->optimize($uploadedFile);
-        }
+	/**
+	 * Optimize an image
+	 *
+	 * @param UploadedFileInterface $uploadedFile
+	 * @return UploadedFileInterface
+	 * @throws \InvalidArgumentException
+	 */
+	public function optimize(UploadedFileInterface $uploadedFile)
+	{
+		foreach ($this->optimizers as $optimizer) {
+			/** @var $optimizer \Fab\Media\FileUpload\ImageOptimizerInterface */
+			$optimizer = GeneralUtility::makeInstance($optimizer, $this->storage);
+			$uploadedFile = $optimizer->optimize($uploadedFile);
+		}
 
-        return $uploadedFile;
-    }
+		return $uploadedFile;
+	}
 }

Classes/FileUpload/Optimizer/Resize.php

Indentation +96 added lines, -96 removed lines

@@ -22,110 +22,110 @@
  */
 class Resize implements ImageOptimizerInterface
 {
-    /**
-     * @var GifBuilder
-     */
-    protected $gifCreator;
+	/**
+	 * @var GifBuilder
+	 */
+	protected $gifCreator;
 
-    /**
-     * @var ResourceStorage
-     */
-    protected $storage;
+	/**
+	 * @var ResourceStorage
+	 */
+	protected $storage;
 
-    /**
-     * Constructor
-     */
-    public function __construct($storage = null)
-    {
-        $this->storage = $storage;
-        $this->gifCreator = GeneralUtility::makeInstance(GifBuilder::class);
-        $this->gifCreator->absPrefix = Environment::getPublicPath() . '/';
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct($storage = null)
+	{
+		$this->storage = $storage;
+		$this->gifCreator = GeneralUtility::makeInstance(GifBuilder::class);
+		$this->gifCreator->absPrefix = Environment::getPublicPath() . '/';
+	}
 
-    /**
-     * Optimize the given uploaded image.
-     *
-     * @param UploadedFileInterface $uploadedFile
-     * @return UploadedFileInterface
-     */
-    public function optimize($uploadedFile)
-    {
-        $imageInfo = getimagesize($uploadedFile->getFileWithAbsolutePath());
+	/**
+	 * Optimize the given uploaded image.
+	 *
+	 * @param UploadedFileInterface $uploadedFile
+	 * @return UploadedFileInterface
+	 */
+	public function optimize($uploadedFile)
+	{
+		$imageInfo = getimagesize($uploadedFile->getFileWithAbsolutePath());
 
-        $currentWidth = $imageInfo[0];
-        $currentHeight = $imageInfo[1];
+		$currentWidth = $imageInfo[0];
+		$currentHeight = $imageInfo[1];
 
-        // resize an image if this one is bigger than telling by the settings.
-        if (is_object($this->storage)) {
-            $storageRecord = $this->storage->getStorageRecord();
-        } else {
-            // Will only work in the BE for now.
-            $storage = $this->getMediaModule()->getCurrentStorage();
-            $storageRecord = $storage->getStorageRecord();
-        }
+		// resize an image if this one is bigger than telling by the settings.
+		if (is_object($this->storage)) {
+			$storageRecord = $this->storage->getStorageRecord();
+		} else {
+			// Will only work in the BE for now.
+			$storage = $this->getMediaModule()->getCurrentStorage();
+			$storageRecord = $storage->getStorageRecord();
+		}
 
-        if (strlen($storageRecord['maximum_dimension_original_image']) > 0) {
-            /** @var Dimension $imageDimension */
-            $imageDimension = GeneralUtility::makeInstance(Dimension::class, $storageRecord['maximum_dimension_original_image']);
-            if ($currentWidth > $imageDimension->getWidth() || $currentHeight > $imageDimension->getHeight()) {
-                // resize taking the width as reference
-                $this->resize($uploadedFile->getFileWithAbsolutePath(), $imageDimension->getWidth(), $imageDimension->getHeight());
-            }
-        }
-        return $uploadedFile;
-    }
+		if (strlen($storageRecord['maximum_dimension_original_image']) > 0) {
+			/** @var Dimension $imageDimension */
+			$imageDimension = GeneralUtility::makeInstance(Dimension::class, $storageRecord['maximum_dimension_original_image']);
+			if ($currentWidth > $imageDimension->getWidth() || $currentHeight > $imageDimension->getHeight()) {
+				// resize taking the width as reference
+				$this->resize($uploadedFile->getFileWithAbsolutePath(), $imageDimension->getWidth(), $imageDimension->getHeight());
+			}
+		}
+		return $uploadedFile;
+	}
 
-    /**
-     * Resize an image according to given parameter.
-     *
-     * @throws \Exception
-     * @param string $fileNameAndPath
-     * @param int $width
-     * @param int $height
-     * @return void
-     */
-    public function resize($fileNameAndPath, $width = 0, $height = 0)
-    {
-        // Skip profile of the image
-        $imParams = '###SkipStripProfile###';
-        $options = array(
-            'maxW' => $width,
-            'maxH' => $height,
-        );
+	/**
+	 * Resize an image according to given parameter.
+	 *
+	 * @throws \Exception
+	 * @param string $fileNameAndPath
+	 * @param int $width
+	 * @param int $height
+	 * @return void
+	 */
+	public function resize($fileNameAndPath, $width = 0, $height = 0)
+	{
+		// Skip profile of the image
+		$imParams = '###SkipStripProfile###';
+		$options = array(
+			'maxW' => $width,
+			'maxH' => $height,
+		);
 
-        $tempFileInfo = $this->gifCreator->imageMagickConvert($fileNameAndPath, '', '', '', $imParams, '', $options, true);
-        if ($tempFileInfo) {
-            // Overwrite original file
-            @unlink($fileNameAndPath);
-            @rename($tempFileInfo[3], $fileNameAndPath);
-        }
-    }
+		$tempFileInfo = $this->gifCreator->imageMagickConvert($fileNameAndPath, '', '', '', $imParams, '', $options, true);
+		if ($tempFileInfo) {
+			// Overwrite original file
+			@unlink($fileNameAndPath);
+			@rename($tempFileInfo[3], $fileNameAndPath);
+		}
+	}
 
-    /**
-     * Escapes a file name so it can safely be used on the command line.
-     *
-     * @see \TYPO3\CMS\Core\Imaging\GraphicalFunctions
-     * @param string $inputName filename to safeguard, must not be empty
-     * @return string $inputName escaped as needed
-     */
-    protected function wrapFileName($inputName)
-    {
-        if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['UTF8filesystem']) {
-            $currentLocale = setlocale(LC_CTYPE, 0);
-            setlocale(LC_CTYPE, $GLOBALS['TYPO3_CONF_VARS']['SYS']['systemLocale']);
-        }
-        $escapedInputName = escapeshellarg($inputName);
-        if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['UTF8filesystem']) {
-            setlocale(LC_CTYPE, $currentLocale);
-        }
-        return $escapedInputName;
-    }
+	/**
+	 * Escapes a file name so it can safely be used on the command line.
+	 *
+	 * @see \TYPO3\CMS\Core\Imaging\GraphicalFunctions
+	 * @param string $inputName filename to safeguard, must not be empty
+	 * @return string $inputName escaped as needed
+	 */
+	protected function wrapFileName($inputName)
+	{
+		if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['UTF8filesystem']) {
+			$currentLocale = setlocale(LC_CTYPE, 0);
+			setlocale(LC_CTYPE, $GLOBALS['TYPO3_CONF_VARS']['SYS']['systemLocale']);
+		}
+		$escapedInputName = escapeshellarg($inputName);
+		if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['UTF8filesystem']) {
+			setlocale(LC_CTYPE, $currentLocale);
+		}
+		return $escapedInputName;
+	}
 
-    /**
-     * @return MediaModule|object
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(MediaModule::class);
-    }
+	/**
+	 * @return MediaModule|object
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(MediaModule::class);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     {
         $this->storage = $storage;
         $this->gifCreator = GeneralUtility::makeInstance(GifBuilder::class);
-        $this->gifCreator->absPrefix = Environment::getPublicPath() . '/';
+        $this->gifCreator->absPrefix = Environment::getPublicPath().'/';
     }
 
     /**

Classes/FileUpload/Optimizer/Rotate.php

Indentation +138 added lines, -138 removed lines

@@ -19,152 +19,152 @@
  */
 class Rotate implements ImageOptimizerInterface
 {
-    /**
-     * @var GifBuilder
-     */
-    protected $gifCreator;
+	/**
+	 * @var GifBuilder
+	 */
+	protected $gifCreator;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->gifCreator = GeneralUtility::makeInstance(GifBuilder::class);
-        $this->gifCreator->absPrefix = Environment::getPublicPath() . '/';
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		$this->gifCreator = GeneralUtility::makeInstance(GifBuilder::class);
+		$this->gifCreator->absPrefix = Environment::getPublicPath() . '/';
+	}
 
-    /**
-     * Optimize the given uploaded image
-     *
-     * @param UploadedFileInterface $uploadedFile
-     * @return UploadedFileInterface
-     */
-    public function optimize($uploadedFile)
-    {
-        $orientation = $this->getOrientation($uploadedFile->getFileWithAbsolutePath());
-        $isRotated = $this->isRotated($orientation);
+	/**
+	 * Optimize the given uploaded image
+	 *
+	 * @param UploadedFileInterface $uploadedFile
+	 * @return UploadedFileInterface
+	 */
+	public function optimize($uploadedFile)
+	{
+		$orientation = $this->getOrientation($uploadedFile->getFileWithAbsolutePath());
+		$isRotated = $this->isRotated($orientation);
 
-        // Only rotate image if necessary!
-        if ($isRotated > 0) {
-            $transformation = $this->getTransformation($orientation);
+		// Only rotate image if necessary!
+		if ($isRotated > 0) {
+			$transformation = $this->getTransformation($orientation);
 
-            $imParams = '###SkipStripProfile###';
-            if ($transformation !== '') {
-                $imParams .= ' ' . $transformation;
-            }
+			$imParams = '###SkipStripProfile###';
+			if ($transformation !== '') {
+				$imParams .= ' ' . $transformation;
+			}
 
-            $tempFileInfo = $this->gifCreator->imageMagickConvert($uploadedFile->getFileWithAbsolutePath(), '', '', '', $imParams, '', [], true);
-            if ($tempFileInfo) {
-                // Replace original file
-                @unlink($uploadedFile->getFileWithAbsolutePath());
-                @rename($tempFileInfo[3], $uploadedFile->getFileWithAbsolutePath());
+			$tempFileInfo = $this->gifCreator->imageMagickConvert($uploadedFile->getFileWithAbsolutePath(), '', '', '', $imParams, '', [], true);
+			if ($tempFileInfo) {
+				// Replace original file
+				@unlink($uploadedFile->getFileWithAbsolutePath());
+				@rename($tempFileInfo[3], $uploadedFile->getFileWithAbsolutePath());
 
-                if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] === 'gm') {
-                    $this->resetOrientation($uploadedFile->getFileWithAbsolutePath());
-                }
-            }
-        }
-        return $uploadedFile;
-    }
+				if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] === 'gm') {
+					$this->resetOrientation($uploadedFile->getFileWithAbsolutePath());
+				}
+			}
+		}
+		return $uploadedFile;
+	}
 
-    /**
-     * Returns the EXIF orientation of a given picture.
-     *
-     * @param string $filename
-     * @return integer
-     */
-    protected function getOrientation($filename)
-    {
-        $extension = strtolower(substr($filename, strrpos($filename, '.') + 1));
-        $orientation = 1; // Fallback to "straight"
-        if (GeneralUtility::inList('jpg,jpeg,tif,tiff', $extension) && function_exists('exif_read_data')) {
-            try {
-                $exif = exif_read_data($filename);
-                if ($exif) {
-                    $orientation = $exif['Orientation'];
-                }
-            } catch (\Exception $e) {
-            }
-        }
-        return $orientation;
-    }
+	/**
+	 * Returns the EXIF orientation of a given picture.
+	 *
+	 * @param string $filename
+	 * @return integer
+	 */
+	protected function getOrientation($filename)
+	{
+		$extension = strtolower(substr($filename, strrpos($filename, '.') + 1));
+		$orientation = 1; // Fallback to "straight"
+		if (GeneralUtility::inList('jpg,jpeg,tif,tiff', $extension) && function_exists('exif_read_data')) {
+			try {
+				$exif = exif_read_data($filename);
+				if ($exif) {
+					$orientation = $exif['Orientation'];
+				}
+			} catch (\Exception $e) {
+			}
+		}
+		return $orientation;
+	}
 
-    /**
-     * Returns true if the given picture is rotated.
-     *
-     * @param integer $orientation EXIF orientation
-     * @return integer
-     * @see http://www.impulseadventure.com/photo/exif-orientation.html
-     */
-    protected function isRotated($orientation)
-    {
-        $ret = false;
-        switch ($orientation) {
-            case 2: // horizontal flip
-            case 3: // 180°
-            case 4: // vertical flip
-            case 5: // vertical flip + 90 rotate right
-            case 6: // 90° rotate right
-            case 7: // horizontal flip + 90 rotate right
-            case 8: // 90° rotate left
-                $ret = true;
-                break;
-        }
-        return $ret;
-    }
+	/**
+	 * Returns true if the given picture is rotated.
+	 *
+	 * @param integer $orientation EXIF orientation
+	 * @return integer
+	 * @see http://www.impulseadventure.com/photo/exif-orientation.html
+	 */
+	protected function isRotated($orientation)
+	{
+		$ret = false;
+		switch ($orientation) {
+			case 2: // horizontal flip
+			case 3: // 180°
+			case 4: // vertical flip
+			case 5: // vertical flip + 90 rotate right
+			case 6: // 90° rotate right
+			case 7: // horizontal flip + 90 rotate right
+			case 8: // 90° rotate left
+				$ret = true;
+				break;
+		}
+		return $ret;
+	}
 
-    /**
-     * Returns a command line parameter to fix the orientation of a rotated picture.
-     *
-     * @param integer $orientation
-     * @return string
-     */
-    protected function getTransformation($orientation)
-    {
-        $transformation = '';
-        if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] !== 'gm') {
-            // ImageMagick
-            if ($orientation >= 2 && $orientation <= 8) {
-                $transformation = '-auto-orient';
-            }
-        } else {
-            // GraphicsMagick
-            switch ($orientation) {
-                case 2: // horizontal flip
-                    $transformation = '-flip horizontal';
-                    break;
-                case 3: // 180°
-                    $transformation = '-rotate 180';
-                    break;
-                case 4: // vertical flip
-                    $transformation = '-flip vertical';
-                    break;
-                case 5: // vertical flip + 90 rotate right
-                    $transformation = '-transpose';
-                    break;
-                case 6: // 90° rotate right
-                    $transformation = '-rotate 90';
-                    break;
-                case 7: // horizontal flip + 90 rotate right
-                    $transformation = '-transverse';
-                    break;
-                case 8: // 90° rotate left
-                    $transformation = '-rotate 270';
-                    break;
-            }
-        }
-        return $transformation;
-    }
+	/**
+	 * Returns a command line parameter to fix the orientation of a rotated picture.
+	 *
+	 * @param integer $orientation
+	 * @return string
+	 */
+	protected function getTransformation($orientation)
+	{
+		$transformation = '';
+		if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] !== 'gm') {
+			// ImageMagick
+			if ($orientation >= 2 && $orientation <= 8) {
+				$transformation = '-auto-orient';
+			}
+		} else {
+			// GraphicsMagick
+			switch ($orientation) {
+				case 2: // horizontal flip
+					$transformation = '-flip horizontal';
+					break;
+				case 3: // 180°
+					$transformation = '-rotate 180';
+					break;
+				case 4: // vertical flip
+					$transformation = '-flip vertical';
+					break;
+				case 5: // vertical flip + 90 rotate right
+					$transformation = '-transpose';
+					break;
+				case 6: // 90° rotate right
+					$transformation = '-rotate 90';
+					break;
+				case 7: // horizontal flip + 90 rotate right
+					$transformation = '-transverse';
+					break;
+				case 8: // 90° rotate left
+					$transformation = '-rotate 270';
+					break;
+			}
+		}
+		return $transformation;
+	}
 
-    /**
-     * Resets the EXIF orientation flag of a picture.
-     *
-     * @param string $filename
-     * @return void
-     * @see http://sylvana.net/jpegcrop/exif_orientation.html
-     */
-    protected function resetOrientation($filename)
-    {
-        JpegExifOrient::setOrientation($filename, 1);
-    }
+	/**
+	 * Resets the EXIF orientation flag of a picture.
+	 *
+	 * @param string $filename
+	 * @return void
+	 * @see http://sylvana.net/jpegcrop/exif_orientation.html
+	 */
+	protected function resetOrientation($filename)
+	{
+		JpegExifOrient::setOrientation($filename, 1);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
     public function __construct()
     {
         $this->gifCreator = GeneralUtility::makeInstance(GifBuilder::class);
-        $this->gifCreator->absPrefix = Environment::getPublicPath() . '/';
+        $this->gifCreator->absPrefix = Environment::getPublicPath().'/';
     }
 
     /**
@@ -50,7 +50,7 @@ 
 
             $imParams = '###SkipStripProfile###';
             if ($transformation !== '') {
-                $imParams .= ' ' . $transformation;
+                $imParams .= ' '.$transformation;
             }
 
             $tempFileInfo = $this->gifCreator->imageMagickConvert($uploadedFile->getFileWithAbsolutePath(), '', '', '', $imParams, '', [], true);

Classes/FileUpload/UploadedFileInterface.php

Indentation +69 added lines, -69 removed lines

@@ -14,83 +14,83 @@
  */
 interface UploadedFileInterface
 {
-    /**
-     * Save the file to the specified path.
-     *
-     * @return boolean true on success
-     */
-    public function save();
+	/**
+	 * Save the file to the specified path.
+	 *
+	 * @return boolean true on success
+	 */
+	public function save();
 
-    /**
-     * Get the original filename.
-     *
-     * @return string filename
-     */
-    public function getOriginalName();
+	/**
+	 * Get the original filename.
+	 *
+	 * @return string filename
+	 */
+	public function getOriginalName();
 
-    /**
-     * Get the file size.
-     *
-     * @return int
-     */
-    public function getSize();
+	/**
+	 * Get the file size.
+	 *
+	 * @return int
+	 */
+	public function getSize();
 
-    /**
-     * Get the file name.
-     *
-     * @return int
-     */
-    public function getName();
+	/**
+	 * Get the file name.
+	 *
+	 * @return int
+	 */
+	public function getName();
 
-    /**
-     * Get the file type.
-     *
-     * @return int
-     */
-    public function getType();
+	/**
+	 * Get the file type.
+	 *
+	 * @return int
+	 */
+	public function getType();
 
-    /**
-     * Get the mime type of the file.
-     *
-     * @return int
-     */
-    public function getMimeType();
+	/**
+	 * Get the mime type of the file.
+	 *
+	 * @return int
+	 */
+	public function getMimeType();
 
-    /**
-     * Get the file with its absolute path.
-     *
-     * @return string
-     */
-    public function getFileWithAbsolutePath();
+	/**
+	 * Get the file with its absolute path.
+	 *
+	 * @return string
+	 */
+	public function getFileWithAbsolutePath();
 
-    /**
-     * Get the file's public URL.
-     *
-     * @return string
-     */
-    public function getPublicUrl();
+	/**
+	 * Get the file's public URL.
+	 *
+	 * @return string
+	 */
+	public function getPublicUrl();
 
-    /**
-     * Set the file input name from the DOM.
-     *
-     * @param string $inputName
-     * @return \Fab\Media\FileUpload\UploadedFileInterface
-     */
-    public function setInputName($inputName);
+	/**
+	 * Set the file input name from the DOM.
+	 *
+	 * @param string $inputName
+	 * @return \Fab\Media\FileUpload\UploadedFileInterface
+	 */
+	public function setInputName($inputName);
 
-    /**
-     * Set the upload folder
-     *
-     * @param string $uploadFolder
-     * @return \Fab\Media\FileUpload\UploadedFileInterface
-     */
-    public function setUploadFolder($uploadFolder);
+	/**
+	 * Set the upload folder
+	 *
+	 * @param string $uploadFolder
+	 * @return \Fab\Media\FileUpload\UploadedFileInterface
+	 */
+	public function setUploadFolder($uploadFolder);
 
-    /**
-     * Set the file name to be saved
-     *
-     * @param string $name
-     * @return \Fab\Media\FileUpload\UploadedFileInterface
-     */
-    public function setName($name);
+	/**
+	 * Set the file name to be saved
+	 *
+	 * @param string $name
+	 * @return \Fab\Media\FileUpload\UploadedFileInterface
+	 */
+	public function setName($name);
 }

Classes/FileUpload/MultipartedFile.php

Indentation +40 added lines, -40 removed lines

@@ -16,48 +16,48 @@
  */
 class MultipartedFile extends UploadedFileAbstract
 {
-    /**
-     * @var string
-     */
-    protected $inputName = 'qqfile';
+	/**
+	 * @var string
+	 */
+	protected $inputName = 'qqfile';
 
-    /**
-     * Save the file to the specified path
-     *
-     * @return boolean true on success
-     */
-    public function save()
-    {
-        return move_uploaded_file($_FILES[$this->inputName]['tmp_name'], $this->getFileWithAbsolutePath());
-    }
+	/**
+	 * Save the file to the specified path
+	 *
+	 * @return boolean true on success
+	 */
+	public function save()
+	{
+		return move_uploaded_file($_FILES[$this->inputName]['tmp_name'], $this->getFileWithAbsolutePath());
+	}
 
-    /**
-     * Get the original filename
-     *
-     * @return string filename
-     */
-    public function getOriginalName()
-    {
-        return $_FILES[$this->inputName]['name'];
-    }
+	/**
+	 * Get the original filename
+	 *
+	 * @return string filename
+	 */
+	public function getOriginalName()
+	{
+		return $_FILES[$this->inputName]['name'];
+	}
 
-    /**
-     * Get the file size
-     *
-     * @return integer file-size in byte
-     */
-    public function getSize()
-    {
-        return $_FILES[$this->inputName]['size'];
-    }
+	/**
+	 * Get the file size
+	 *
+	 * @return integer file-size in byte
+	 */
+	public function getSize()
+	{
+		return $_FILES[$this->inputName]['size'];
+	}
 
-    /**
-     * Get the mime type of the file.
-     *
-     * @return int
-     */
-    public function getMimeType()
-    {
-        return $_FILES[$this->inputName]['type'];
-    }
+	/**
+	 * Get the mime type of the file.
+	 *
+	 * @return int
+	 */
+	public function getMimeType()
+	{
+		return $_FILES[$this->inputName]['type'];
+	}
 }

Classes/DataHandler/FileDataHandler.php

Indentation +122 added lines, -122 removed lines

@@ -21,126 +21,126 @@
  */
 class FileDataHandler extends AbstractDataHandler
 {
-    /**
-     * Process File with action "update".
-     *
-     * @param Content $content
-     * @throws \Exception
-     * @return bool
-     */
-    public function processUpdate(Content $content)
-    {
-        throw new \Exception('Not yet implemented', 1409988673);
-    }
-
-    /**
-     * Process File with action "remove".
-     *
-     * @param Content $content
-     * @return bool|void
-     */
-    public function processRemove(Content $content)
-    {
-        $file = $this->getResourceFactory()->getFileObject($content->getUid());
-
-        $numberOfReferences = $this->getFileReferenceService()->countTotalReferences($file);
-        if ($numberOfReferences === 0) {
-            $file->delete();
-        } else {
-            $message = sprintf('I could not delete file "%s" as it is has %s reference(s).', $file->getUid(), $numberOfReferences);
-            $this->errorMessages = $message;
-        }
-    }
-
-    /**
-     * Process File with action "copy".
-     *
-     * @param Content $content
-     * @param string $target
-     * @throws \Exception
-     * @return bool
-     */
-    public function processCopy(Content $content, $target)
-    {
-        $file = $this->getResourceFactory()->getFileObject($content->getUid());
-
-        if ($this->getMediaModule()->hasFolderTree()) {
-            $targetFolder = $this->getMediaModule()->getCurrentFolder();
-
-            // Move file
-            $file->copyTo($targetFolder, $file->getName(), DuplicationBehavior::RENAME);
-        }
-        return true;
-    }
-
-    /**
-     * Process File with action "move".
-     *
-     * @param Content $content
-     * @param string $target
-     * @throws \Exception
-     * @return bool
-     */
-    public function processMove(Content $content, $target)
-    {
-        $file = $this->getResourceFactory()->getFileObject($content->getUid());
-
-        if ($this->getMediaModule()->hasFolderTree()) {
-            $targetFolder = $this->getMediaModule()->getCurrentFolder();
-            if ($targetFolder->getIdentifier() !== $file->getParentFolder()->getIdentifier()) {
-                // Move file
-                $file->moveTo($targetFolder, $file->getName(), DuplicationBehavior::RENAME);
-            }
-        } else {
-            // Only process if the storage is different.
-            if ((int)$file->getStorage()->getUid() !== (int)$target) {
-                $targetStorage = $this->getResourceFactory()->getStorageObject((int)$target);
-
-                // Retrieve target directory in the new storage. The folder will only be returned if the User has the correct permission.
-                $targetFolder = $this->getMediaModule()->getDefaultFolderInStorage($targetStorage, $file);
-
-                try {
-                    // Move file
-                    $file->moveTo($targetFolder, $file->getName(), DuplicationBehavior::RENAME);
-                } catch (\Exception $e) {
-                    $this->errorMessages = $e->getMessage();
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * @return FileReferenceService|object
-     */
-    protected function getFileReferenceService()
-    {
-        return GeneralUtility::makeInstance(FileReferenceService::class);
-    }
-
-    /**
-     * Process Content with action "localize".
-     *
-     * @param Content $content
-     * @param int $language
-     * @throws \Exception
-     * @return bool
-     */
-    public function processLocalize(Content $content, $language)
-    {
-        throw new \Exception('Nothing to implement here. Localization is done by the Core DataHandler', 1412760788);
-    }
-
-    /**
-     * @return MediaModule|object
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(MediaModule::class);
-    }
-
-    protected function getResourceFactory(): ResourceFactory
-    {
-        return GeneralUtility::makeInstance(ResourceFactory::class);
-    }
+	/**
+	 * Process File with action "update".
+	 *
+	 * @param Content $content
+	 * @throws \Exception
+	 * @return bool
+	 */
+	public function processUpdate(Content $content)
+	{
+		throw new \Exception('Not yet implemented', 1409988673);
+	}
+
+	/**
+	 * Process File with action "remove".
+	 *
+	 * @param Content $content
+	 * @return bool|void
+	 */
+	public function processRemove(Content $content)
+	{
+		$file = $this->getResourceFactory()->getFileObject($content->getUid());
+
+		$numberOfReferences = $this->getFileReferenceService()->countTotalReferences($file);
+		if ($numberOfReferences === 0) {
+			$file->delete();
+		} else {
+			$message = sprintf('I could not delete file "%s" as it is has %s reference(s).', $file->getUid(), $numberOfReferences);
+			$this->errorMessages = $message;
+		}
+	}
+
+	/**
+	 * Process File with action "copy".
+	 *
+	 * @param Content $content
+	 * @param string $target
+	 * @throws \Exception
+	 * @return bool
+	 */
+	public function processCopy(Content $content, $target)
+	{
+		$file = $this->getResourceFactory()->getFileObject($content->getUid());
+
+		if ($this->getMediaModule()->hasFolderTree()) {
+			$targetFolder = $this->getMediaModule()->getCurrentFolder();
+
+			// Move file
+			$file->copyTo($targetFolder, $file->getName(), DuplicationBehavior::RENAME);
+		}
+		return true;
+	}
+
+	/**
+	 * Process File with action "move".
+	 *
+	 * @param Content $content
+	 * @param string $target
+	 * @throws \Exception
+	 * @return bool
+	 */
+	public function processMove(Content $content, $target)
+	{
+		$file = $this->getResourceFactory()->getFileObject($content->getUid());
+
+		if ($this->getMediaModule()->hasFolderTree()) {
+			$targetFolder = $this->getMediaModule()->getCurrentFolder();
+			if ($targetFolder->getIdentifier() !== $file->getParentFolder()->getIdentifier()) {
+				// Move file
+				$file->moveTo($targetFolder, $file->getName(), DuplicationBehavior::RENAME);
+			}
+		} else {
+			// Only process if the storage is different.
+			if ((int)$file->getStorage()->getUid() !== (int)$target) {
+				$targetStorage = $this->getResourceFactory()->getStorageObject((int)$target);
+
+				// Retrieve target directory in the new storage. The folder will only be returned if the User has the correct permission.
+				$targetFolder = $this->getMediaModule()->getDefaultFolderInStorage($targetStorage, $file);
+
+				try {
+					// Move file
+					$file->moveTo($targetFolder, $file->getName(), DuplicationBehavior::RENAME);
+				} catch (\Exception $e) {
+					$this->errorMessages = $e->getMessage();
+				}
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * @return FileReferenceService|object
+	 */
+	protected function getFileReferenceService()
+	{
+		return GeneralUtility::makeInstance(FileReferenceService::class);
+	}
+
+	/**
+	 * Process Content with action "localize".
+	 *
+	 * @param Content $content
+	 * @param int $language
+	 * @throws \Exception
+	 * @return bool
+	 */
+	public function processLocalize(Content $content, $language)
+	{
+		throw new \Exception('Nothing to implement here. Localization is done by the Core DataHandler', 1412760788);
+	}
+
+	/**
+	 * @return MediaModule|object
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(MediaModule::class);
+	}
+
+	protected function getResourceFactory(): ResourceFactory
+	{
+		return GeneralUtility::makeInstance(ResourceFactory::class);
+	}
 }

Classes/Grid/FrontendPermissionRenderer.php

Indentation +18 added lines, -18 removed lines

@@ -16,23 +16,23 @@
  */
 class FrontendPermissionRenderer extends ColumnRendererAbstract
 {
-    /**
-     * Render permission in the grid.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $result = '';
+	/**
+	 * Render permission in the grid.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$result = '';
 
-        $frontendUserGroups = $this->object['metadata']['fe_groups'];
-        if (!empty($frontendUserGroups)) {
-            /** @var $frontendUserGroup \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup */
-            foreach ($frontendUserGroups as $frontendUserGroup) {
-                $result .= sprintf('<li style="list-style: disc">%s</li>', $frontendUserGroup['title']);
-            }
-            $result = sprintf('<ul>%s</ul>', $result);
-        }
-        return $result;
-    }
+		$frontendUserGroups = $this->object['metadata']['fe_groups'];
+		if (!empty($frontendUserGroups)) {
+			/** @var $frontendUserGroup \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup */
+			foreach ($frontendUserGroups as $frontendUserGroup) {
+				$result .= sprintf('<li style="list-style: disc">%s</li>', $frontendUserGroup['title']);
+			}
+			$result = sprintf('<ul>%s</ul>', $result);
+		}
+		return $result;
+	}
 }

Classes/Grid/MetadataRenderer.php

Indentation +64 added lines, -64 removed lines

@@ -19,76 +19,76 @@
  */
 class MetadataRenderer extends ColumnRendererAbstract
 {
-    /**
-     * Renders a configurable metadata property of a file in the Grid.
-     *
-     * @throws \Exception
-     * @return string
-     */
-    public function render()
-    {
-        if (empty($this->gridRendererConfiguration['property'])) {
-            throw new \Exception('Missing property value for Grid Renderer Metadata', 1390391042);
-        }
+	/**
+	 * Renders a configurable metadata property of a file in the Grid.
+	 *
+	 * @throws \Exception
+	 * @return string
+	 */
+	public function render()
+	{
+		if (empty($this->gridRendererConfiguration['property'])) {
+			throw new \Exception('Missing property value for Grid Renderer Metadata', 1390391042);
+		}
 
-        $file = $this->getFileConverter()->convert($this->object);
-        $propertyName = $this->gridRendererConfiguration['property'];
+		$file = $this->getFileConverter()->convert($this->object);
+		$propertyName = $this->gridRendererConfiguration['property'];
 
-        if ($propertyName === 'uid') {
-            $metadata = $file->getMetaData();
-            $result = $metadata['uid']; // make an exception here to retrieve the uid of the metadata.
-        } else {
-            $result = $file->getProperty($propertyName);
-        }
+		if ($propertyName === 'uid') {
+			$metadata = $file->getMetaData();
+			$result = $metadata['uid']; // make an exception here to retrieve the uid of the metadata.
+		} else {
+			$result = $file->getProperty($propertyName);
+		}
 
-        // Avoid bad surprise, converts characters to HTML.
-        $fieldType = Tca::table('sys_file_metadata')->field($propertyName)->getType();
-        if ($fieldType !== FieldType::TEXTAREA) {
-            $result = htmlentities($result);
-        } elseif ($fieldType === FieldType::TEXTAREA && !$this->isClean($result)) {
-            $result = htmlentities($result);
-        } elseif ($fieldType === FieldType::TEXTAREA && !$this->hasHtml($result)) {
-            $result = nl2br($result);
-        }
+		// Avoid bad surprise, converts characters to HTML.
+		$fieldType = Tca::table('sys_file_metadata')->field($propertyName)->getType();
+		if ($fieldType !== FieldType::TEXTAREA) {
+			$result = htmlentities($result);
+		} elseif ($fieldType === FieldType::TEXTAREA && !$this->isClean($result)) {
+			$result = htmlentities($result);
+		} elseif ($fieldType === FieldType::TEXTAREA && !$this->hasHtml($result)) {
+			$result = nl2br($result);
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Check whether a string contains HTML tags.
-     *
-     * @param string $content the content to be analyzed
-     * @return boolean
-     */
-    protected function hasHtml($content)
-    {
-        $result = false;
+	/**
+	 * Check whether a string contains HTML tags.
+	 *
+	 * @param string $content the content to be analyzed
+	 * @return boolean
+	 */
+	protected function hasHtml($content)
+	{
+		$result = false;
 
-        // We compare the length of the string with html tags and without html tags.
-        if (strlen($content) != strlen(strip_tags($content))) {
-            $result = true;
-        }
-        return $result;
-    }
+		// We compare the length of the string with html tags and without html tags.
+		if (strlen($content) != strlen(strip_tags($content))) {
+			$result = true;
+		}
+		return $result;
+	}
 
-    /**
-     * Check whether a string contains potential XSS
-     *
-     * @param string $content the content to be analyzed
-     * @return boolean
-     */
-    protected function isClean($content)
-    {
-        // @todo implement me!
-        $result = true;
-        return $result;
-    }
+	/**
+	 * Check whether a string contains potential XSS
+	 *
+	 * @param string $content the content to be analyzed
+	 * @return boolean
+	 */
+	protected function isClean($content)
+	{
+		// @todo implement me!
+		$result = true;
+		return $result;
+	}
 
-    /**
-     * @return ContentToFileConverter|object
-     */
-    protected function getFileConverter()
-    {
-        return GeneralUtility::makeInstance(ContentToFileConverter::class);
-    }
+	/**
+	 * @return ContentToFileConverter|object
+	 */
+	protected function getFileConverter()
+	{
+		return GeneralUtility::makeInstance(ContentToFileConverter::class);
+	}
 }

Classes/Grid/CategoryRenderer.php

Indentation +18 added lines, -18 removed lines

@@ -16,23 +16,23 @@
  */
 class CategoryRenderer extends ColumnRendererAbstract
 {
-    /**
-     * Renders category list of an asset in the grid.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $result = '';
+	/**
+	 * Renders category list of an asset in the grid.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$result = '';
 
-        $categories = $this->object['metadata']['categories'];
-        if (!empty($categories)) {
-            /** @var $category \TYPO3\CMS\Extbase\Domain\Model\Category */
-            foreach ($categories as $category) {
-                $result .= sprintf('<li>%s</li>', $category['title']);
-            }
-            $result = sprintf('<ul class="category-list">%s</ul>', $result);
-        }
-        return $result;
-    }
+		$categories = $this->object['metadata']['categories'];
+		if (!empty($categories)) {
+			/** @var $category \TYPO3\CMS\Extbase\Domain\Model\Category */
+			foreach ($categories as $category) {
+				$result .= sprintf('<li>%s</li>', $category['title']);
+			}
+			$result = sprintf('<ul class="category-list">%s</ul>', $result);
+		}
+		return $result;
+	}
 }