fabarea / media

Classes/Form/AbstractFormField.php

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
             reset($attribute);
             $key = key($attribute);
             if (!is_string($key)) {
-                throw new InvalidStringException('Not an associative array. Is not a key: ' . $key, 1356478742);
+                throw new InvalidStringException('Not an associative array. Is not a key: '.$key, 1356478742);
             }
 
             $this->attributes[$key] = $attribute[$key];

Indentation +262 added lines, -262 removed lines

@@ -18,267 +18,267 @@
 abstract class AbstractFormField implements FormFieldInterface
 {
 
-    /**
-     * @var string
-     */
-    protected $template = '';
-
-    /**
-     * @var string
-     */
-    protected $value = '';
-
-    /**
-     * @var string
-     */
-    protected $name = '';
-
-    /**
-     * @var string
-     */
-    protected $id = '';
-
-    /**
-     * @var string
-     */
-    protected $prefix = '';
-
-    /**
-     * @var string
-     */
-    protected $label = '';
-
-    /**
-     * Store what child element will contain this element.
-     *
-     * @var array
-     */
-    protected $items = [];
-
-    /**
-     * Attributes in sense of DOM attribute, e.g. class, style, etc...
-     *
-     * @var array
-     */
-    protected $attributes = [];
-
-    /**
-     * @return string
-     */
-    public function render()
-    {
-        return $this->template;
-    }
-
-    /**
-     * Render the label if possible. Otherwise return an empty string.
-     *
-     * @return string
-     */
-    public function renderLabel()
-    {
-        $result = '';
-        if ($this->label) {
-            $template = '<label class="control-label" for="%s">%s</label>';
-
-            if (strpos($this->label, 'LLL:') === 0) {
-                $this->label = LocalizationUtility::translate($this->label, '');
-            }
-
-            $result = sprintf($template,
-                $this->getId(),
-                $this->label
-            );
-        }
-        return $result;
-    }
-
-    /**
-     * Render additional attribute for this DOM element.
-     *
-     * @return string
-     */
-    public function renderAttributes()
-    {
-        $result = '';
-        if (!empty($this->attributes)) {
-            foreach ($this->attributes as $attribute => $value) {
-                $result .= sprintf('%s="%s" ',
-                    htmlspecialchars($attribute),
-                    htmlspecialchars($value)
-                );
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Add an additional (DOM) attribute to be added to this template.
-     *
-     * @throws InvalidStringException
-     * @param array $attribute associative array that contains attribute => value
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function addAttribute(array $attribute)
-    {
-        if (!empty($attribute)) {
-            reset($attribute);
-            $key = key($attribute);
-            if (!is_string($key)) {
-                throw new InvalidStringException('Not an associative array. Is not a key: ' . $key, 1356478742);
-            }
-
-            $this->attributes[$key] = $attribute[$key];
-        }
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTemplate()
-    {
-        return $this->template;
-    }
-
-    /**
-     * @param string $template
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setTemplate($template)
-    {
-        $this->template = $template;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLabel()
-    {
-        return $this->label;
-    }
-
-    /**
-     * @param string $label
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setLabel($label)
-    {
-        $this->label = $label;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPrefix()
-    {
-        return $this->prefix;
-    }
-
-    /**
-     * @param string $prefix
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setPrefix($prefix)
-    {
-        $this->prefix = $prefix;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getItems()
-    {
-        return $this->items;
-    }
-
-    /**
-     * @param array $items
-     */
-    public function setItems($items)
-    {
-        $this->items = $items;
-    }
-
-    /**
-     * @return string
-     */
-    public function getValue()
-    {
-        return htmlspecialchars($this->value);
-    }
-
-    /**
-     * @param string $value
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setValue($value)
-    {
-        $this->value = $value;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        $result = $this->name;
-        if ($this->getPrefix()) {
-            $result = sprintf('%s[%s]', $this->getPrefix(), $this->name);
-        }
-        return $result;
-    }
-
-    /**
-     * @param string $name
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getId()
-    {
-        if ($this->id === '') {
-            $this->id = DomElement::getInstance()->formatId($this->getName());
-        }
-        return $this->id;
-    }
-
-    /**
-     * @param string $id
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setId($id)
-    {
-        $this->id = $id;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getAttributes()
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * @param array $attributes
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setAttributes($attributes)
-    {
-        $this->attributes = $attributes;
-        return $this;
-    }
+	/**
+	 * @var string
+	 */
+	protected $template = '';
+
+	/**
+	 * @var string
+	 */
+	protected $value = '';
+
+	/**
+	 * @var string
+	 */
+	protected $name = '';
+
+	/**
+	 * @var string
+	 */
+	protected $id = '';
+
+	/**
+	 * @var string
+	 */
+	protected $prefix = '';
+
+	/**
+	 * @var string
+	 */
+	protected $label = '';
+
+	/**
+	 * Store what child element will contain this element.
+	 *
+	 * @var array
+	 */
+	protected $items = [];
+
+	/**
+	 * Attributes in sense of DOM attribute, e.g. class, style, etc...
+	 *
+	 * @var array
+	 */
+	protected $attributes = [];
+
+	/**
+	 * @return string
+	 */
+	public function render()
+	{
+		return $this->template;
+	}
+
+	/**
+	 * Render the label if possible. Otherwise return an empty string.
+	 *
+	 * @return string
+	 */
+	public function renderLabel()
+	{
+		$result = '';
+		if ($this->label) {
+			$template = '<label class="control-label" for="%s">%s</label>';
+
+			if (strpos($this->label, 'LLL:') === 0) {
+				$this->label = LocalizationUtility::translate($this->label, '');
+			}
+
+			$result = sprintf($template,
+				$this->getId(),
+				$this->label
+			);
+		}
+		return $result;
+	}
+
+	/**
+	 * Render additional attribute for this DOM element.
+	 *
+	 * @return string
+	 */
+	public function renderAttributes()
+	{
+		$result = '';
+		if (!empty($this->attributes)) {
+			foreach ($this->attributes as $attribute => $value) {
+				$result .= sprintf('%s="%s" ',
+					htmlspecialchars($attribute),
+					htmlspecialchars($value)
+				);
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * Add an additional (DOM) attribute to be added to this template.
+	 *
+	 * @throws InvalidStringException
+	 * @param array $attribute associative array that contains attribute => value
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function addAttribute(array $attribute)
+	{
+		if (!empty($attribute)) {
+			reset($attribute);
+			$key = key($attribute);
+			if (!is_string($key)) {
+				throw new InvalidStringException('Not an associative array. Is not a key: ' . $key, 1356478742);
+			}
+
+			$this->attributes[$key] = $attribute[$key];
+		}
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getTemplate()
+	{
+		return $this->template;
+	}
+
+	/**
+	 * @param string $template
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setTemplate($template)
+	{
+		$this->template = $template;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLabel()
+	{
+		return $this->label;
+	}
+
+	/**
+	 * @param string $label
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setLabel($label)
+	{
+		$this->label = $label;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getPrefix()
+	{
+		return $this->prefix;
+	}
+
+	/**
+	 * @param string $prefix
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setPrefix($prefix)
+	{
+		$this->prefix = $prefix;
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getItems()
+	{
+		return $this->items;
+	}
+
+	/**
+	 * @param array $items
+	 */
+	public function setItems($items)
+	{
+		$this->items = $items;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getValue()
+	{
+		return htmlspecialchars($this->value);
+	}
+
+	/**
+	 * @param string $value
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setValue($value)
+	{
+		$this->value = $value;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		$result = $this->name;
+		if ($this->getPrefix()) {
+			$result = sprintf('%s[%s]', $this->getPrefix(), $this->name);
+		}
+		return $result;
+	}
+
+	/**
+	 * @param string $name
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setName($name)
+	{
+		$this->name = $name;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getId()
+	{
+		if ($this->id === '') {
+			$this->id = DomElement::getInstance()->formatId($this->getName());
+		}
+		return $this->id;
+	}
+
+	/**
+	 * @param string $id
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setId($id)
+	{
+		$this->id = $id;
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getAttributes()
+	{
+		return $this->attributes;
+	}
+
+	/**
+	 * @param array $attributes
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setAttributes($attributes)
+	{
+		$this->attributes = $attributes;
+		return $this;
+	}
 
 }

Classes/View/Menu/StorageMenu.php

Spacing +2 added lines, -3 removed lines

@@ -78,8 +78,7 @@ 
                 $selected,
                 $storage->getName(),
                 $storage->isOnline() ?
-                    '' :
-                    '(' . $this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:offline') . ')'
+                    '' : '('.$this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:offline').')'
             );
         }
 
@@ -87,7 +86,7 @@ 
         $inputs = '';
         foreach ($parameters as $parameter => $value) {
             list($parameter, $value) = $this->computeParameterAndValue($parameter, $value);
-            if ($parameter !== $this->moduleLoader->getParameterPrefix() . '[storage]') {
+            if ($parameter !== $this->moduleLoader->getParameterPrefix().'[storage]') {
                 $inputs .= sprintf('<input type="hidden" name="%s" value="%s" />', $parameter, $value);
             }
         }

Doc Comments +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
     }
 
     /**
-     * @return string
+     * @return boolean
      */
     protected function isDisplayed()
     {

Indentation +117 added lines, -117 removed lines

@@ -19,126 +19,126 @@
 class StorageMenu extends AbstractComponentView
 {
 
-    /**
-     * @var \Fab\Vidi\Module\ModuleLoader
-     * @inject
-     */
-    protected $moduleLoader;
-
-    /**
-     * Renders a dropdown menu for storage.
-     *
-     * @return string
-     */
-    public function render()
-    {
-
-        $output = '';
-        if ($this->isDisplayed()) {
-            $this->loadRequireJsCode();
-
-            $output = $this->renderStorageMenu();
-        }
-
-        return $output;
-    }
-
-    /**
-     * @return string
-     */
-    protected function isDisplayed()
-    {
-        $isDisplayed = !$this->getMediaModule()->hasFolderTree() || $this->getModuleLoader()->hasPlugin();
-        return $isDisplayed;
-    }
-
-    /**
-     * @return string
-     */
-    protected function renderStorageMenu()
-    {
-
-        $currentStorage = $this->getMediaModule()->getCurrentStorage();
-
-        /** @var $storage \TYPO3\CMS\Core\Resource\ResourceStorage */
-        $options = '';
-        foreach ($this->getMediaModule()->getAllowedStorages() as $storage) {
-            $selected = '';
-            if ($currentStorage->getUid() == $storage->getUid()) {
-                $selected = 'selected';
-            }
-            $options .= sprintf('<option value="%s" %s>%s %s</option>',
-                $storage->getUid(),
-                $selected,
-                $storage->getName(),
-                $storage->isOnline() ?
-                    '' :
-                    '(' . $this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:offline') . ')'
-            );
-        }
-
-        $parameters = GeneralUtility::_GET();
-        $inputs = '';
-        foreach ($parameters as $parameter => $value) {
-            list($parameter, $value) = $this->computeParameterAndValue($parameter, $value);
-            if ($parameter !== $this->moduleLoader->getParameterPrefix() . '[storage]') {
-                $inputs .= sprintf('<input type="hidden" name="%s" value="%s" />', $parameter, $value);
-            }
-        }
-
-        $template = '<form action="%s" id="form-menu-storage" method="get">
+	/**
+	 * @var \Fab\Vidi\Module\ModuleLoader
+	 * @inject
+	 */
+	protected $moduleLoader;
+
+	/**
+	 * Renders a dropdown menu for storage.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+
+		$output = '';
+		if ($this->isDisplayed()) {
+			$this->loadRequireJsCode();
+
+			$output = $this->renderStorageMenu();
+		}
+
+		return $output;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function isDisplayed()
+	{
+		$isDisplayed = !$this->getMediaModule()->hasFolderTree() || $this->getModuleLoader()->hasPlugin();
+		return $isDisplayed;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function renderStorageMenu()
+	{
+
+		$currentStorage = $this->getMediaModule()->getCurrentStorage();
+
+		/** @var $storage \TYPO3\CMS\Core\Resource\ResourceStorage */
+		$options = '';
+		foreach ($this->getMediaModule()->getAllowedStorages() as $storage) {
+			$selected = '';
+			if ($currentStorage->getUid() == $storage->getUid()) {
+				$selected = 'selected';
+			}
+			$options .= sprintf('<option value="%s" %s>%s %s</option>',
+				$storage->getUid(),
+				$selected,
+				$storage->getName(),
+				$storage->isOnline() ?
+					'' :
+					'(' . $this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:offline') . ')'
+			);
+		}
+
+		$parameters = GeneralUtility::_GET();
+		$inputs = '';
+		foreach ($parameters as $parameter => $value) {
+			list($parameter, $value) = $this->computeParameterAndValue($parameter, $value);
+			if ($parameter !== $this->moduleLoader->getParameterPrefix() . '[storage]') {
+				$inputs .= sprintf('<input type="hidden" name="%s" value="%s" />', $parameter, $value);
+			}
+		}
+
+		$template = '<form action="%s" id="form-menu-storage" method="get">
 						%s
 						<select name="%s[storage]" class="form-control" style="padding-right: 20px" id="menu-storage" onchange="$(\'#form-menu-storage\').submit()">%s</select>
 					</form>';
 
-        return sprintf(
-            $template,
-            $this->getModuleLoader()->getModuleUrl(),
-            $inputs,
-            $this->moduleLoader->getParameterPrefix(),
-            $options
-        );
-    }
-
-    /**
-     * @return void
-     */
-    protected function loadRequireJsCode()
-    {
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-
-        $configuration['paths']['Fab/Media'] = '../typo3conf/ext/media/Resources/Public/JavaScript';
-        $pageRenderer->addRequireJsConfiguration($configuration);
-        $pageRenderer->loadRequireJsModule('Fab/Media/EditStorage');
-    }
-
-    /**
-     * Compute parameter and value to be correctly encoded by the browser.
-     *
-     * @param string $parameter
-     * @param mixed $value
-     * @return array
-     */
-    protected function computeParameterAndValue($parameter, $value)
-    {
-
-        if (is_string($value)) {
-            $result = array($parameter, $value);
-        } else {
-            $key = key($value);
-            $value = current($value);
-            $parameter = sprintf('%s[%s]', $parameter, $key);
-            $result = $this->computeParameterAndValue($parameter, $value);
-        }
-        return $result;
-    }
-
-    /**
-     * @return MediaModule|object
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
-    }
+		return sprintf(
+			$template,
+			$this->getModuleLoader()->getModuleUrl(),
+			$inputs,
+			$this->moduleLoader->getParameterPrefix(),
+			$options
+		);
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function loadRequireJsCode()
+	{
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+
+		$configuration['paths']['Fab/Media'] = '../typo3conf/ext/media/Resources/Public/JavaScript';
+		$pageRenderer->addRequireJsConfiguration($configuration);
+		$pageRenderer->loadRequireJsModule('Fab/Media/EditStorage');
+	}
+
+	/**
+	 * Compute parameter and value to be correctly encoded by the browser.
+	 *
+	 * @param string $parameter
+	 * @param mixed $value
+	 * @return array
+	 */
+	protected function computeParameterAndValue($parameter, $value)
+	{
+
+		if (is_string($value)) {
+			$result = array($parameter, $value);
+		} else {
+			$key = key($value);
+			$value = current($value);
+			$parameter = sprintf('%s[%s]', $parameter, $key);
+			$result = $this->computeParameterAndValue($parameter, $value);
+		}
+		return $result;
+	}
+
+	/**
+	 * @return MediaModule|object
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
+	}
 
 }

Classes/View/Button/NewFolder.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
                 ->setIcon($this->getIconFactory()->getIcon('actions-document-new', Icon::SIZE_SMALL))
                 ->render();
 
-            $output = '<div style="float: left;">' . $button . '</div>';
+            $output = '<div style="float: left;">'.$button.'</div>';
         }
         return $output;
     }

Indentation +96 added lines, -96 removed lines

@@ -21,101 +21,101 @@
 class NewFolder extends AbstractComponentView
 {
 
-    /**
-     * Renders a button to create a new folder.
-     *
-     * @param Content $object
-     * @return string
-     */
-    public function render($object = null)
-    {
-        $output = '';
-        if ($this->getMediaModule()->hasFolderTree() && !$this->getModuleLoader()->hasPlugin()) {
-
-            $button = $this->makeLinkButton()
-                ->setHref($this->getNewFolderUri())
-                ->setTitle($this->getLabel())
-                ->setIcon($this->getIconFactory()->getIcon('actions-document-new', Icon::SIZE_SMALL))
-                ->render();
-
-            $output = '<div style="float: left;">' . $button . '</div>';
-        }
-        return $output;
-    }
-
-    /**
-     * @return string
-     */
-    protected function getLabel()
-    {
-        return $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:cm.new');
-    }
-
-    /**
-     * @return string
-     */
-    protected function getNewFolderUri()
-    {
-        return BackendUtility::getModuleUrl(
-            'file_newfolder',
-            array(
-                'target' => $this->getCombineIdentifier(),
-                'returnUrl' => $this->getReturnUrl(),
-            )
-        );
-    }
-
-
-    /**
-     * @return string
-     */
-    protected function getCombineIdentifier()
-    {
-        $folder = $this->getMediaModule()->getCurrentFolder();
-        return $folder->getCombinedIdentifier();
-    }
-
-    /**
-     * @return string
-     */
-    protected function getReturnUrl()
-    {
-        $returnUrl = BackendUtility::getModuleUrl(
-            GeneralUtility::_GP('route'),
-            $this->getAdditionalParameters()
-        );
-        return $returnUrl;
-    }
-
-    /**
-     * @return array
-     */
-    protected function getAdditionalParameters()
-    {
-
-        $additionalParameters = [];
-        if (GeneralUtility::_GP('id')) {
-            $additionalParameters = [
-                'id' => urldecode(GeneralUtility::_GP('id')),
-            ];
-        }
-        return $additionalParameters;
-    }
-
-    /**
-     * @return MediaModule|object
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
-    }
-
-    /**
-     * @return \TYPO3\CMS\Lang\LanguageService
-     */
-    protected function getLanguageService()
-    {
-        return $GLOBALS['LANG'];
-    }
+	/**
+	 * Renders a button to create a new folder.
+	 *
+	 * @param Content $object
+	 * @return string
+	 */
+	public function render($object = null)
+	{
+		$output = '';
+		if ($this->getMediaModule()->hasFolderTree() && !$this->getModuleLoader()->hasPlugin()) {
+
+			$button = $this->makeLinkButton()
+				->setHref($this->getNewFolderUri())
+				->setTitle($this->getLabel())
+				->setIcon($this->getIconFactory()->getIcon('actions-document-new', Icon::SIZE_SMALL))
+				->render();
+
+			$output = '<div style="float: left;">' . $button . '</div>';
+		}
+		return $output;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getLabel()
+	{
+		return $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:cm.new');
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getNewFolderUri()
+	{
+		return BackendUtility::getModuleUrl(
+			'file_newfolder',
+			array(
+				'target' => $this->getCombineIdentifier(),
+				'returnUrl' => $this->getReturnUrl(),
+			)
+		);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	protected function getCombineIdentifier()
+	{
+		$folder = $this->getMediaModule()->getCurrentFolder();
+		return $folder->getCombinedIdentifier();
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getReturnUrl()
+	{
+		$returnUrl = BackendUtility::getModuleUrl(
+			GeneralUtility::_GP('route'),
+			$this->getAdditionalParameters()
+		);
+		return $returnUrl;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getAdditionalParameters()
+	{
+
+		$additionalParameters = [];
+		if (GeneralUtility::_GP('id')) {
+			$additionalParameters = [
+				'id' => urldecode(GeneralUtility::_GP('id')),
+			];
+		}
+		return $additionalParameters;
+	}
+
+	/**
+	 * @return MediaModule|object
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
+	}
+
+	/**
+	 * @return \TYPO3\CMS\Lang\LanguageService
+	 */
+	protected function getLanguageService()
+	{
+		return $GLOBALS['LANG'];
+	}
 
 }

Classes/Command/ThumbnailCommandController.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
                         $message = sprintf('* File "%s": %s %s',
                             $result['fileUid'],
                             $result['fileIdentifier'],
-                            empty($result['thumbnailUri']) ? '' : ' -> ' . $result['thumbnailUri']
+                            empty($result['thumbnailUri']) ? '' : ' -> '.$result['thumbnailUri']
                         );
                         $this->outputLine($message);
                     }

Indentation +133 added lines, -133 removed lines

@@ -21,137 +21,137 @@
 class ThumbnailCommandController extends CommandController
 {
 
-    /**
-     * @throws \TYPO3\CMS\Extbase\Mvc\Exception\InvalidArgumentTypeException
-     * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException
-     */
-    protected function initializeCommandMethodArguments()
-    {
-        parent::initializeCommandMethodArguments();
-        if ($this->arguments->hasArgument('configuration')) {
-            $propertyMappingConfiguration = $this->arguments->getArgument('configuration')->getPropertyMappingConfiguration();
-            $propertyMappingConfiguration->setTypeConverter(
-                $this->objectManager->get(ConfigurationArrayConverter::class)
-            );
-        }
-    }
-
-
-    /**
-     * Generate a bunch of thumbnails in advance to speed up the output of the Media BE module.
-     *
-     * @param int $limit where to stop in the batch processing.
-     * @param int $offset where to start in the batch processing.
-     * @param array $configuration override the default thumbnail configuration.
-     * @param bool $verbose will output a detail result of the thumbnail generation.
-     * @return void
-     */
-    public function generateCommand($limit = 0, $offset = 0, $configuration = [], $verbose = false)
-    {
-
-        $this->checkEnvironment();
-
-        foreach ($this->getStorageRepository()->findAll() as $storage) {
-
-            // TODO: Make me more flexible by passing thumbnail configuration. For now it will only generate thumbnails for the BE module.
-
-            $this->outputLine();
-            $this->outputLine(sprintf('%s (%s)', $storage->getName(), $storage->getUid()));
-            $this->outputLine('--------------------------------------------');
-            $this->outputLine();
-
-            if ($storage->isOnline()) {
-
-                // For the CLI cause.
-                $storage->setEvaluatePermissions(false);
-
-                $thumbnailGenerator = $this->getThumbnailGenerator();
-                $thumbnailGenerator
-                    ->setStorage($storage)
-                    ->setConfiguration($configuration)
-                    ->generate($limit, $offset);
-
-                if ($verbose) {
-                    $resultSet = $thumbnailGenerator->getResultSet();
-                    foreach ($resultSet as $result) {
-                        $message = sprintf('* File "%s": %s %s',
-                            $result['fileUid'],
-                            $result['fileIdentifier'],
-                            empty($result['thumbnailUri']) ? '' : ' -> ' . $result['thumbnailUri']
-                        );
-                        $this->outputLine($message);
-                    }
-                    $this->outputLine();
-                }
-
-                $message = sprintf('Done! New generated %s thumbnail(s) from %s traversed file(s) of a total of %s files.',
-                    $thumbnailGenerator->getNumberOfProcessedFiles(),
-                    $thumbnailGenerator->getNumberOfTraversedFiles(),
-                    $thumbnailGenerator->getTotalNumberOfFiles()
-                );
-                $this->outputLine($message);
-
-                // Add warning message if missing files were found along the way.
-                if ($thumbnailGenerator->getNumberOfMissingFiles() > 0) {
-
-                    $message = sprintf('ATTENTION! %s missing file(s) detected.',
-                        $thumbnailGenerator->getNumberOfMissingFiles()
-                    );
-                    $this->outputLine($message);
-                }
-            } else {
-                $this->outputLine('Storage is offline!');
-            }
-        }
-    }
-
-    /**
-     * @return void
-     */
-    protected function checkEnvironment()
-    {
-        $user = $this->getDataService()->getRecord(
-            'be_users', [
-            'username' => '_cli_lowlevel'
-        ]);
-
-        if (empty($user)) {
-            $this->outputLine('Missing User "_cli_lowlevel" and / or its password.');
-            $this->sendAndExit(1);
-        }
-
-        $user = $this->getDataService()->getRecord(
-            'be_users', [
-            'username' => '_cli_scheduler'
-        ]);
-
-        if (empty($user)) {
-            $this->outputLine('Missing User "_cli_scheduler" and / or its password.');
-            $this->sendAndExit(1);
-        }
-    }
-
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
-
-    /**
-     * @return \Fab\Media\Thumbnail\ThumbnailGenerator|object
-     */
-    protected function getThumbnailGenerator()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Thumbnail\ThumbnailGenerator::class);
-    }
-
-    /**
-     * @return StorageRepository|object
-     */
-    protected function getStorageRepository()
-    {
-        return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
-    }
+	/**
+	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\InvalidArgumentTypeException
+	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException
+	 */
+	protected function initializeCommandMethodArguments()
+	{
+		parent::initializeCommandMethodArguments();
+		if ($this->arguments->hasArgument('configuration')) {
+			$propertyMappingConfiguration = $this->arguments->getArgument('configuration')->getPropertyMappingConfiguration();
+			$propertyMappingConfiguration->setTypeConverter(
+				$this->objectManager->get(ConfigurationArrayConverter::class)
+			);
+		}
+	}
+
+
+	/**
+	 * Generate a bunch of thumbnails in advance to speed up the output of the Media BE module.
+	 *
+	 * @param int $limit where to stop in the batch processing.
+	 * @param int $offset where to start in the batch processing.
+	 * @param array $configuration override the default thumbnail configuration.
+	 * @param bool $verbose will output a detail result of the thumbnail generation.
+	 * @return void
+	 */
+	public function generateCommand($limit = 0, $offset = 0, $configuration = [], $verbose = false)
+	{
+
+		$this->checkEnvironment();
+
+		foreach ($this->getStorageRepository()->findAll() as $storage) {
+
+			// TODO: Make me more flexible by passing thumbnail configuration. For now it will only generate thumbnails for the BE module.
+
+			$this->outputLine();
+			$this->outputLine(sprintf('%s (%s)', $storage->getName(), $storage->getUid()));
+			$this->outputLine('--------------------------------------------');
+			$this->outputLine();
+
+			if ($storage->isOnline()) {
+
+				// For the CLI cause.
+				$storage->setEvaluatePermissions(false);
+
+				$thumbnailGenerator = $this->getThumbnailGenerator();
+				$thumbnailGenerator
+					->setStorage($storage)
+					->setConfiguration($configuration)
+					->generate($limit, $offset);
+
+				if ($verbose) {
+					$resultSet = $thumbnailGenerator->getResultSet();
+					foreach ($resultSet as $result) {
+						$message = sprintf('* File "%s": %s %s',
+							$result['fileUid'],
+							$result['fileIdentifier'],
+							empty($result['thumbnailUri']) ? '' : ' -> ' . $result['thumbnailUri']
+						);
+						$this->outputLine($message);
+					}
+					$this->outputLine();
+				}
+
+				$message = sprintf('Done! New generated %s thumbnail(s) from %s traversed file(s) of a total of %s files.',
+					$thumbnailGenerator->getNumberOfProcessedFiles(),
+					$thumbnailGenerator->getNumberOfTraversedFiles(),
+					$thumbnailGenerator->getTotalNumberOfFiles()
+				);
+				$this->outputLine($message);
+
+				// Add warning message if missing files were found along the way.
+				if ($thumbnailGenerator->getNumberOfMissingFiles() > 0) {
+
+					$message = sprintf('ATTENTION! %s missing file(s) detected.',
+						$thumbnailGenerator->getNumberOfMissingFiles()
+					);
+					$this->outputLine($message);
+				}
+			} else {
+				$this->outputLine('Storage is offline!');
+			}
+		}
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function checkEnvironment()
+	{
+		$user = $this->getDataService()->getRecord(
+			'be_users', [
+			'username' => '_cli_lowlevel'
+		]);
+
+		if (empty($user)) {
+			$this->outputLine('Missing User "_cli_lowlevel" and / or its password.');
+			$this->sendAndExit(1);
+		}
+
+		$user = $this->getDataService()->getRecord(
+			'be_users', [
+			'username' => '_cli_scheduler'
+		]);
+
+		if (empty($user)) {
+			$this->outputLine('Missing User "_cli_scheduler" and / or its password.');
+			$this->sendAndExit(1);
+		}
+	}
+
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
+
+	/**
+	 * @return \Fab\Media\Thumbnail\ThumbnailGenerator|object
+	 */
+	protected function getThumbnailGenerator()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Thumbnail\ThumbnailGenerator::class);
+	}
+
+	/**
+	 * @return StorageRepository|object
+	 */
+	protected function getStorageRepository()
+	{
+		return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
+	}
 }

Tests/Functional/Utility/ConfigurationUtilityTest.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 
 use Fab\Media\Tests\Functional\AbstractFunctionalTestCase;
 
-require_once dirname(dirname(__FILE__)) . '/AbstractFunctionalTestCase.php';
+require_once dirname(dirname(__FILE__)).'/AbstractFunctionalTestCase.php';
 
 /**
  * Test case for class \Fab\Media\Utility\Configuration.

Tests/Functional/Utility/ImagePresetUtilityTest.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 
 use Fab\Media\Tests\Functional\AbstractFunctionalTestCase;
 
-require_once dirname(dirname(__FILE__)) . '/AbstractFunctionalTestCase.php';
+require_once dirname(dirname(__FILE__)).'/AbstractFunctionalTestCase.php';
 
 
 /**
@@ -128,7 +128,7 @@ 
 		$preset = 'image_large';
 		$actualWidth = rand(10, 100);
 		$actualHeight = rand(10, 100);
-		\Fab\Media\Utility\ConfigurationUtility::getInstance()->set('image_large', $actualWidth . 'x' . $actualHeight);
+		\Fab\Media\Utility\ConfigurationUtility::getInstance()->set('image_large', $actualWidth.'x'.$actualHeight);
 		$this->assertSame($actualWidth, $this->fixture->preset($preset)->getWidth());
 		$this->assertSame($actualHeight, $this->fixture->preset($preset)->getHeight());
 	}

Tests/Unit/FileUpload/UploadManagerTest.php

Spacing +4 added lines, -4 removed lines

@@ -37,7 +37,7 @@ 
 	public function setUp() {
 		$this->fixture = new \Fab\Media\FileUpload\UploadManager();
 		$this->fakeName = uniqid('name');
-		$this->fakePrefix= uniqid('prefix');
+		$this->fakePrefix = uniqid('prefix');
 	}
 
 	public function tearDown() {
@@ -49,8 +49,8 @@ 
 	 * @dataProvider propertyProvider
 	 */
 	public function testProperty($propertyName, $value) {
-		$setter = 'set' . ucfirst($propertyName);
-		$getter = 'get' . ucfirst($propertyName);
+		$setter = 'set'.ucfirst($propertyName);
+		$getter = 'get'.ucfirst($propertyName);
 		call_user_func_array(array($this->fixture, $setter), array($value));
 		$this->assertEquals($value, call_user_func(array($this->fixture, $getter)));
 	}
@@ -62,7 +62,7 @@ 
 		return array(
 			array('uploadFolder', uniqid()),
 			array('inputName', uniqid()),
-			array('sizeLimit', rand(10,100)),
+			array('sizeLimit', rand(10, 100)),
 		);
 	}
 

Tests/Unit/Utility/PathTest.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
 	 */
 	public function canResolvesAPath() {
 		$resourceName = uniqid('resource');
-		$expected = 'media/Resources/Public/' . $resourceName;
+		$expected = 'media/Resources/Public/'.$resourceName;
 		$actual = \Fab\Media\Utility\Path::resolvePath($resourceName);
 
 		$this->assertTrue(strpos($actual, $expected) > 0);
@@ -43,7 +43,7 @@ 
 	public function canReturnsAPublicPath() {
 
 		$resourceName = uniqid('resource');
-		$expected = 'media/Resources/Public/' . $resourceName;
+		$expected = 'media/Resources/Public/'.$resourceName;
 		$actual = \Fab\Media\Utility\Path::getRelativePath($resourceName);
 
 		$this->assertTrue(strpos($actual, $expected) > 0);

Classes/Override/Backend/Form/FormResultCompiler.php

Spacing +3 added lines, -3 removed lines

@@ -40,9 +40,9 @@
 
             $pageRenderer = $this->getPageRenderer();
             $pageRenderer->loadRequireJsModule('TYPO3/CMS/Media/MediaFormEngine', 'function(MediaFormEngine) {
-            MediaFormEngine.vidiModuleUrl = \'' . BackendUtility::getModuleUrl(VidiModule::getSignature()) . '\';
-            MediaFormEngine.vidiModulePrefix = \'' . VidiModule::getParameterPrefix() . '\';
-            MediaFormEngine.browserUrl = ' . GeneralUtility::quoteJSvalue(BackendUtility::getModuleUrl('wizard_element_browser')) . ';
+            MediaFormEngine.vidiModuleUrl = \'' . BackendUtility::getModuleUrl(VidiModule::getSignature()).'\';
+            MediaFormEngine.vidiModulePrefix = \'' . VidiModule::getParameterPrefix().'\';
+            MediaFormEngine.browserUrl = ' . GeneralUtility::quoteJSvalue(BackendUtility::getModuleUrl('wizard_element_browser')).';
         }');
         }
 

Indentation +30 added lines, -30 removed lines

@@ -18,38 +18,38 @@
 class FormResultCompiler extends \TYPO3\CMS\Backend\Form\FormResultCompiler
 {
 
-    /**
-     * JavaScript bottom code
-     *
-     * @param string $formname The identification of the form on the page.
-     * @return string A section with JavaScript - if $update is false, embedded in <script></script>
-     */
-    protected function JSbottom($formname = 'forms[0]')
-    {
-
-        $out = parent::JSbottom($formname);
-
-        $enableMediaFilePicker = (bool)$this->getBackendUser()->getTSConfigVal('options.vidi.enableMediaFilePicker');
-        if ($enableMediaFilePicker) {
-
-            $pageRenderer = $this->getPageRenderer();
-            $pageRenderer->loadRequireJsModule('TYPO3/CMS/Media/MediaFormEngine', 'function(MediaFormEngine) {
+	/**
+	 * JavaScript bottom code
+	 *
+	 * @param string $formname The identification of the form on the page.
+	 * @return string A section with JavaScript - if $update is false, embedded in <script></script>
+	 */
+	protected function JSbottom($formname = 'forms[0]')
+	{
+
+		$out = parent::JSbottom($formname);
+
+		$enableMediaFilePicker = (bool)$this->getBackendUser()->getTSConfigVal('options.vidi.enableMediaFilePicker');
+		if ($enableMediaFilePicker) {
+
+			$pageRenderer = $this->getPageRenderer();
+			$pageRenderer->loadRequireJsModule('TYPO3/CMS/Media/MediaFormEngine', 'function(MediaFormEngine) {
             MediaFormEngine.vidiModuleUrl = \'' . BackendUtility::getModuleUrl(VidiModule::getSignature()) . '\';
             MediaFormEngine.vidiModulePrefix = \'' . VidiModule::getParameterPrefix() . '\';
             MediaFormEngine.browserUrl = ' . GeneralUtility::quoteJSvalue(BackendUtility::getModuleUrl('wizard_element_browser')) . ';
         }');
-        }
-
-        return $out;
-    }
-
-    /**
-     * Returns an instance of the current Backend User.
-     *
-     * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
+		}
+
+		return $out;
+	}
+
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
 }