fabarea / media

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'];
+	}
 }

Classes/FileUpload/UploadedFileAbstract.php

Indentation +137 added lines, -137 removed lines

@@ -24,142 +24,142 @@
 abstract class UploadedFileAbstract implements UploadedFileInterface
 {
 
-    /**
-     * @var string
-     */
-    protected $uploadFolder;
-
-    /**
-     * @var string
-     */
-    protected $inputName;
-
-    /**
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * Get the file type.
-     *
-     * @return int
-     */
-    public function getType()
-    {
-        $this->checkFileExistence();
-
-        // this basically extracts the mimetype and guess the filetype based
-        // on the first part of the mimetype works for 99% of all cases, and
-        // we don't need to make an SQL statement like EXT:media does currently
-        $mimeType = $this->getMimeType();
-        list($fileType) = explode('/', $mimeType);
-        switch (strtolower($fileType)) {
-            case 'text':
-                $type = File::FILETYPE_TEXT;
-                break;
-            case 'image':
-                $type = File::FILETYPE_IMAGE;
-                break;
-            case 'audio':
-                $type = File::FILETYPE_AUDIO;
-                break;
-            case 'video':
-                $type = File::FILETYPE_VIDEO;
-                break;
-            case 'application':
-            case 'software':
-                $type = File::FILETYPE_APPLICATION;
-                break;
-            default:
-                $type = File::FILETYPE_UNKNOWN;
-        }
-        return $type;
-    }
-
-    /**
-     * Get the file with its absolute path.
-     *
-     * @return string
-     */
-    public function getFileWithAbsolutePath()
-    {
-        return $this->uploadFolder . DIRECTORY_SEPARATOR . $this->name;
-    }
-
-    /**
-     * Get the file's public URL.
-     *
-     * @return string
-     */
-    public function getPublicUrl()
-    {
-        $fileNameAndPath = str_replace(PATH_site, '', $this->getFileWithAbsolutePath());
-        return '/' . ltrim($fileNameAndPath, '/');
-    }
-
-    /**
-     * @return string
-     */
-    public function getInputName()
-    {
-        return $this->inputName;
-    }
-
-    /**
-     * @param string $inputName
-     * @return UploadedFileInterface
-     */
-    public function setInputName($inputName)
-    {
-        $this->inputName = $inputName;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUploadFolder()
-    {
-        return $this->uploadFolder;
-    }
-
-    /**
-     * @param string $uploadFolder
-     * @return UploadedFileInterface
-     */
-    public function setUploadFolder($uploadFolder)
-    {
-        $this->uploadFolder = $uploadFolder;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * @param string $name
-     * @return UploadedFileInterface
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-        return $this;
-    }
-
-    /**
-     * Check whether the file exists.
-     */
-    protected function checkFileExistence()
-    {
-        if (!is_file($this->getFileWithAbsolutePath())) {
-            $message = sprintf('File not found at "%s". Did you save it?', $this->getFileWithAbsolutePath());
-            throw new MissingFileException($message, 1361786958);
-        }
-    }
+	/**
+	 * @var string
+	 */
+	protected $uploadFolder;
+
+	/**
+	 * @var string
+	 */
+	protected $inputName;
+
+	/**
+	 * @var string
+	 */
+	protected $name;
+
+	/**
+	 * Get the file type.
+	 *
+	 * @return int
+	 */
+	public function getType()
+	{
+		$this->checkFileExistence();
+
+		// this basically extracts the mimetype and guess the filetype based
+		// on the first part of the mimetype works for 99% of all cases, and
+		// we don't need to make an SQL statement like EXT:media does currently
+		$mimeType = $this->getMimeType();
+		list($fileType) = explode('/', $mimeType);
+		switch (strtolower($fileType)) {
+			case 'text':
+				$type = File::FILETYPE_TEXT;
+				break;
+			case 'image':
+				$type = File::FILETYPE_IMAGE;
+				break;
+			case 'audio':
+				$type = File::FILETYPE_AUDIO;
+				break;
+			case 'video':
+				$type = File::FILETYPE_VIDEO;
+				break;
+			case 'application':
+			case 'software':
+				$type = File::FILETYPE_APPLICATION;
+				break;
+			default:
+				$type = File::FILETYPE_UNKNOWN;
+		}
+		return $type;
+	}
+
+	/**
+	 * Get the file with its absolute path.
+	 *
+	 * @return string
+	 */
+	public function getFileWithAbsolutePath()
+	{
+		return $this->uploadFolder . DIRECTORY_SEPARATOR . $this->name;
+	}
+
+	/**
+	 * Get the file's public URL.
+	 *
+	 * @return string
+	 */
+	public function getPublicUrl()
+	{
+		$fileNameAndPath = str_replace(PATH_site, '', $this->getFileWithAbsolutePath());
+		return '/' . ltrim($fileNameAndPath, '/');
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getInputName()
+	{
+		return $this->inputName;
+	}
+
+	/**
+	 * @param string $inputName
+	 * @return UploadedFileInterface
+	 */
+	public function setInputName($inputName)
+	{
+		$this->inputName = $inputName;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getUploadFolder()
+	{
+		return $this->uploadFolder;
+	}
+
+	/**
+	 * @param string $uploadFolder
+	 * @return UploadedFileInterface
+	 */
+	public function setUploadFolder($uploadFolder)
+	{
+		$this->uploadFolder = $uploadFolder;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * @param string $name
+	 * @return UploadedFileInterface
+	 */
+	public function setName($name)
+	{
+		$this->name = $name;
+		return $this;
+	}
+
+	/**
+	 * Check whether the file exists.
+	 */
+	protected function checkFileExistence()
+	{
+		if (!is_file($this->getFileWithAbsolutePath())) {
+			$message = sprintf('File not found at "%s". Did you save it?', $this->getFileWithAbsolutePath());
+			throw new MissingFileException($message, 1361786958);
+		}
+	}
 
 }

Spacing +2 added lines, -2 removed lines

@@ -83,7 +83,7 @@ 
      */
     public function getFileWithAbsolutePath()
     {
-        return $this->uploadFolder . DIRECTORY_SEPARATOR . $this->name;
+        return $this->uploadFolder.DIRECTORY_SEPARATOR.$this->name;
     }
 
     /**
@@ -94,7 +94,7 @@ 
     public function getPublicUrl()
     {
         $fileNameAndPath = str_replace(PATH_site, '', $this->getFileWithAbsolutePath());
-        return '/' . ltrim($fileNameAndPath, '/');
+        return '/'.ltrim($fileNameAndPath, '/');
     }
 
     /**

Configuration/TCA/Overrides/sys_file_reference.php

Indentation +3 added lines, -3 removed lines

@@ -2,9 +2,9 @@
 if (!defined('TYPO3_MODE')) die ('Access denied.');
 
 $tca = [
-    'ctrl' => [
-        'rootLevel' => -1, // Otherwise File Reference will not work between files.
-    ],
+	'ctrl' => [
+		'rootLevel' => -1, // Otherwise File Reference will not work between files.
+	],
 ];
 
 // Disable the File Upload in IRRE since it can not be configured the target storage.

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if (!defined('TYPO3_MODE')) die ('Access denied.');
+if (!defined('TYPO3_MODE')) {
+	die ('Access denied.');
+}
 
 $tca = [
     'ctrl' => [

Configuration/TCA/Overrides/sys_file_storage.php

Spacing +2 added lines, -2 removed lines

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

Indentation +184 added lines, -184 removed lines

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

Braces +3 added lines, -1 removed lines

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

Classes/Property/TypeConverter/ConfigurationArrayConverter.php

Doc Comments +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
      * Parses $rawValidatorOptions not containing quoted option values.
      * $rawValidatorOptions will be an empty string afterwards (pass by ref!).
      *
-     * @param string $rawValidatorOptions
+     * @param string $rawConfigurationOptions
      * @return array An array of optionName/optionValue pairs
      */
     protected function parseConfigurationOptions($rawConfigurationOptions)

Indentation +80 added lines, -80 removed lines

@@ -17,11 +17,11 @@ 
 class ConfigurationArrayConverter extends ArrayConverter
 {
 
-    /**
-     * Match configuration options (to parse actual options)
-     * @var string
-     */
-    const PATTERN_MATCH_CONFIGURATIONOPTIONS = '/
+	/**
+	 * Match configuration options (to parse actual options)
+	 * @var string
+	 */
+	const PATTERN_MATCH_CONFIGURATIONOPTIONS = '/
 			\s*
 			(?P<optionName>[a-z0-9]+)
 			\s*=\s*
@@ -32,84 +32,84 @@ 
 			)
 		/ixS';
 
-    /**
-     * We can only convert empty strings to array or array to array.
-     *
-     * @param mixed $source
-     * @param string $targetType
-     * @return boolean
-     */
-    public function canConvertFrom($source, $targetType)
-    {
-        return is_string($source) || is_array($source);
-    }
+	/**
+	 * We can only convert empty strings to array or array to array.
+	 *
+	 * @param mixed $source
+	 * @param string $targetType
+	 * @return boolean
+	 */
+	public function canConvertFrom($source, $targetType)
+	{
+		return is_string($source) || is_array($source);
+	}
 
-    /**
-     * Convert from $source to $targetType, a noop if the source is an array.
-     * If it is an empty string it will be converted to an empty array.
-     *
-     * @param string|array $source
-     * @param string $targetType
-     * @param array $convertedChildProperties
-     * @param PropertyMappingConfigurationInterface $configuration
-     * @return array
-     * @api
-     */
-    public function convertFrom($source, $targetType, array $convertedChildProperties = [], PropertyMappingConfigurationInterface $configuration = null)
-    {
-        if (is_string($source)) {
-            if ($source === '') {
-                $target = [];
-            } else {
-                $target = $this->parseConfigurationOptions($source);
-            }
-        }
+	/**
+	 * Convert from $source to $targetType, a noop if the source is an array.
+	 * If it is an empty string it will be converted to an empty array.
+	 *
+	 * @param string|array $source
+	 * @param string $targetType
+	 * @param array $convertedChildProperties
+	 * @param PropertyMappingConfigurationInterface $configuration
+	 * @return array
+	 * @api
+	 */
+	public function convertFrom($source, $targetType, array $convertedChildProperties = [], PropertyMappingConfigurationInterface $configuration = null)
+	{
+		if (is_string($source)) {
+			if ($source === '') {
+				$target = [];
+			} else {
+				$target = $this->parseConfigurationOptions($source);
+			}
+		}
 
-        if (is_array($source)) {
-            $target = $source;
-        }
+		if (is_array($source)) {
+			$target = $source;
+		}
 
-        return $target;
-    }
+		return $target;
+	}
 
-    /**
-     * Parses $rawValidatorOptions not containing quoted option values.
-     * $rawValidatorOptions will be an empty string afterwards (pass by ref!).
-     *
-     * @param string $rawValidatorOptions
-     * @return array An array of optionName/optionValue pairs
-     */
-    protected function parseConfigurationOptions($rawConfigurationOptions)
-    {
-        $configurationOptions = [];
-        $parsedConfigurationOptions = [];
-        preg_match_all(self::PATTERN_MATCH_CONFIGURATIONOPTIONS, $rawConfigurationOptions, $configurationOptions, PREG_SET_ORDER);
-        foreach ($configurationOptions as $configurationOption) {
-            $parsedConfigurationOptions[trim($configurationOption['optionName'])] = trim($configurationOption['optionValue']);
-        }
-        array_walk($parsedConfigurationOptions, array($this, 'unquoteString'));
-        return $parsedConfigurationOptions;
-    }
+	/**
+	 * Parses $rawValidatorOptions not containing quoted option values.
+	 * $rawValidatorOptions will be an empty string afterwards (pass by ref!).
+	 *
+	 * @param string $rawValidatorOptions
+	 * @return array An array of optionName/optionValue pairs
+	 */
+	protected function parseConfigurationOptions($rawConfigurationOptions)
+	{
+		$configurationOptions = [];
+		$parsedConfigurationOptions = [];
+		preg_match_all(self::PATTERN_MATCH_CONFIGURATIONOPTIONS, $rawConfigurationOptions, $configurationOptions, PREG_SET_ORDER);
+		foreach ($configurationOptions as $configurationOption) {
+			$parsedConfigurationOptions[trim($configurationOption['optionName'])] = trim($configurationOption['optionValue']);
+		}
+		array_walk($parsedConfigurationOptions, array($this, 'unquoteString'));
+		return $parsedConfigurationOptions;
+	}
 
-    /**
-     * Removes escapings from a given argument string and trims the outermost
-     * quotes.
-     *
-     * This method is meant as a helper for regular expression results.
-     *
-     * @param string &$quotedValue Value to unquote
-     * @return void
-     */
-    protected function unquoteString(&$quotedValue)
-    {
-        switch ($quotedValue[0]) {
-            case '"':
-                $quotedValue = str_replace('\\"', '"', trim($quotedValue, '"'));
-                break;
-            case '\'':
-                $quotedValue = str_replace('\\\'', '\'', trim($quotedValue, '\''));
-                break;
-        }
-        $quotedValue = str_replace('\\\\', '\\', $quotedValue);
-    }
+	/**
+	 * Removes escapings from a given argument string and trims the outermost
+	 * quotes.
+	 *
+	 * This method is meant as a helper for regular expression results.
+	 *
+	 * @param string &$quotedValue Value to unquote
+	 * @return void
+	 */
+	protected function unquoteString(&$quotedValue)
+	{
+		switch ($quotedValue[0]) {
+			case '"':
+				$quotedValue = str_replace('\\"', '"', trim($quotedValue, '"'));
+				break;
+			case '\'':
+				$quotedValue = str_replace('\\\'', '\'', trim($quotedValue, '\''));
+				break;
+		}
+		$quotedValue = str_replace('\\\\', '\\', $quotedValue);
+	}
 }
\ No newline at end of file