gilbertsoft / typo3-gslib

Classes/Utility/Typo3Version.php

Indentation +41 added lines, -41 removed lines

@@ -37,48 +37,48 @@
  */
 class Typo3Version
 {
-    /**
-     * @var integer $version
-     */
-    private static $version = null;
+	/**
+	 * @var integer $version
+	 */
+	private static $version = null;
 
-    /**
-     * Returns the TYPO3 version as integer
-     *
-     * @return integer
-     * @api
-     */
-    protected static function getBranch()
-    {
-        if (is_null(self::$version)) {
-            self::$version = VersionNumberUtility::convertVersionNumberToInteger(TYPO3_branch);
-        }
-        return self::$version;
-    }
+	/**
+	 * Returns the TYPO3 version as integer
+	 *
+	 * @return integer
+	 * @api
+	 */
+	protected static function getBranch()
+	{
+		if (is_null(self::$version)) {
+			self::$version = VersionNumberUtility::convertVersionNumberToInteger(TYPO3_branch);
+		}
+		return self::$version;
+	}
 
-    /**
-     * Returns TRUE if the current TYPO3 version (or compatibility version) is compatible to the input version
-     * Notice that this function compares branches, not versions (4.0.1 would be > 4.0.0 although they use the same compat_version)
-     *
-     * @param string $branchNumberStr Minimum branch number required (format x.y / e.g. "4.0" NOT "4.0.0"!)
-     * @return bool Returns TRUE if this setup is compatible with the provided version number
-     * @todo Still needs a function to convert versions to branches
-     */
-    public static function isVersion($branchNumberStr)
-    {
-        return (self::getBranch() == VersionNumberUtility::convertVersionNumberToInteger($branchNumberStr));
-    }
+	/**
+	 * Returns TRUE if the current TYPO3 version (or compatibility version) is compatible to the input version
+	 * Notice that this function compares branches, not versions (4.0.1 would be > 4.0.0 although they use the same compat_version)
+	 *
+	 * @param string $branchNumberStr Minimum branch number required (format x.y / e.g. "4.0" NOT "4.0.0"!)
+	 * @return bool Returns TRUE if this setup is compatible with the provided version number
+	 * @todo Still needs a function to convert versions to branches
+	 */
+	public static function isVersion($branchNumberStr)
+	{
+		return (self::getBranch() == VersionNumberUtility::convertVersionNumberToInteger($branchNumberStr));
+	}
 
-    /**
-     * Returns TRUE if the current TYPO3 version (or compatibility version) is compatible to the input version
-     * Notice that this function compares branches, not versions (4.0.1 would be > 4.0.0 although they use the same compat_version)
-     *
-     * @param string $branchNumberStr Minimum branch number required (format x.y / e.g. "4.0" NOT "4.0.0"!)
-     * @return bool Returns TRUE if this setup is compatible with the provided version number
-     * @todo Still needs a function to convert versions to branches
-     */
-    public static function isCompatVersion($branchNumberStr)
-    {
-        return (self::getBranch() >= VersionNumberUtility::convertVersionNumberToInteger($branchNumberStr));
-    }
+	/**
+	 * Returns TRUE if the current TYPO3 version (or compatibility version) is compatible to the input version
+	 * Notice that this function compares branches, not versions (4.0.1 would be > 4.0.0 although they use the same compat_version)
+	 *
+	 * @param string $branchNumberStr Minimum branch number required (format x.y / e.g. "4.0" NOT "4.0.0"!)
+	 * @return bool Returns TRUE if this setup is compatible with the provided version number
+	 * @todo Still needs a function to convert versions to branches
+	 */
+	public static function isCompatVersion($branchNumberStr)
+	{
+		return (self::getBranch() >= VersionNumberUtility::convertVersionNumberToInteger($branchNumberStr));
+	}
 }

Classes/Utility/Typo3Provider.php

Indentation +37 added lines, -37 removed lines

@@ -32,45 +32,45 @@
  */
 class Typo3Provider
 {
-    /**
-     * @var string $name
-     */
-    private static $name = null;
+	/**
+	 * @var string $name
+	 */
+	private static $name = null;
 
-    /**
-     * Returns the trimmed and lowered provider name loaded by getenv.
-     *
-     * @return string
-     * @api
-     */
-    public static function getName()
-    {
-        if (is_null(self::$name)) {
-            self::$name = trim(mb_strtolower(getenv('TYPO3_PROVIDER') ?: (getenv('REDIRECT_TYPO3_PROVIDER') ?: '')));
-        }
+	/**
+	 * Returns the trimmed and lowered provider name loaded by getenv.
+	 *
+	 * @return string
+	 * @api
+	 */
+	public static function getName()
+	{
+		if (is_null(self::$name)) {
+			self::$name = trim(mb_strtolower(getenv('TYPO3_PROVIDER') ?: (getenv('REDIRECT_TYPO3_PROVIDER') ?: '')));
+		}
 
-        return self::$name;
-    }
+		return self::$name;
+	}
 
-    /**
-     * Returns TRUE if $providerName equals the loaded name.
-     *
-     * @return bool
-     * @api
-     */
-    public static function isProvider($providerName)
-    {
-        return self::getName() === trim(mb_strtolower($providerName));
-    }
+	/**
+	 * Returns TRUE if $providerName equals the loaded name.
+	 *
+	 * @return bool
+	 * @api
+	 */
+	public static function isProvider($providerName)
+	{
+		return self::getName() === trim(mb_strtolower($providerName));
+	}
 
-    /**
-     * Returns TRUE if the provider is Gilbertsoft
-     *
-     * @return bool
-     * @api
-     */
-    public static function isGilbertsoft()
-    {
-        return self::isProvider('Gilbertsoft');
-    }
+	/**
+	 * Returns TRUE if the provider is Gilbertsoft
+	 *
+	 * @return bool
+	 * @api
+	 */
+	public static function isGilbertsoft()
+	{
+		return self::isProvider('Gilbertsoft');
+	}
 }

Classes/Extension/AbstractConfigurator.php

Indentation +65 added lines, -65 removed lines

@@ -37,77 +37,77 @@
  */
 abstract class AbstractConfigurator implements ConfiguratorInterface
 {
-    /**
-     * @see Typo3Mode::isFrontend()
-     */
-    protected static function isFrontend()
-    {
-        return Typo3Mode::isFrontend();
-    }
+	/**
+	 * @see Typo3Mode::isFrontend()
+	 */
+	protected static function isFrontend()
+	{
+		return Typo3Mode::isFrontend();
+	}
 
-    /**
-     * @see Typo3Mode::isBackend()
-     */
-    protected static function isBackend()
-    {
-        return Typo3Mode::isBackend();
-    }
+	/**
+	 * @see Typo3Mode::isBackend()
+	 */
+	protected static function isBackend()
+	{
+		return Typo3Mode::isBackend();
+	}
 
-    /**
-     * @see Typo3Mode::isCli()
-     */
-    protected static function isCli()
-    {
-        return Typo3Mode::isCli();
-    }
+	/**
+	 * @see Typo3Mode::isCli()
+	 */
+	protected static function isCli()
+	{
+		return Typo3Mode::isCli();
+	}
 
-    /**
-     * @see Typo3Mode::isAjax()
-     */
-    protected static function isAjax()
-    {
-        return Typo3Mode::isAjax();
-    }
+	/**
+	 * @see Typo3Mode::isAjax()
+	 */
+	protected static function isAjax()
+	{
+		return Typo3Mode::isAjax();
+	}
 
-    /**
-     * @see Typo3Mode::isInstall()
-     */
-    protected static function isInstall()
-    {
-        return Typo3Mode::isInstall();
-    }
+	/**
+	 * @see Typo3Mode::isInstall()
+	 */
+	protected static function isInstall()
+	{
+		return Typo3Mode::isInstall();
+	}
 
-    /**
-     * @see Typo3Version::isVersion()
-     */
-    protected static function isVersion($branchNumberStr)
-    {
-        return Typo3Version::isVersion($branchNumberStr);
-    }
+	/**
+	 * @see Typo3Version::isVersion()
+	 */
+	protected static function isVersion($branchNumberStr)
+	{
+		return Typo3Version::isVersion($branchNumberStr);
+	}
 
-    /**
-     * @see Typo3Version::isCompatVersion()
-     */
-    protected static function isCompatVersion($branchNumberStr)
-    {
-        return Typo3Version::isCompatVersion($branchNumberStr);
-    }
+	/**
+	 * @see Typo3Version::isCompatVersion()
+	 */
+	protected static function isCompatVersion($branchNumberStr)
+	{
+		return Typo3Version::isCompatVersion($branchNumberStr);
+	}
 
-    /**
-     * Called from ext_localconf.php, to be implemented in derrived classes.
-     *
-     * @param string $extensionKey Extension key
-     * @return void
-     * @api
-     */
-    abstract public static function localconf($extensionKey);
+	/**
+	 * Called from ext_localconf.php, to be implemented in derrived classes.
+	 *
+	 * @param string $extensionKey Extension key
+	 * @return void
+	 * @api
+	 */
+	abstract public static function localconf($extensionKey);
 
-    /**
-     * Called from ext_tables.php, to be implemented in derrived classes.
-     *
-     * @param string $extensionKey Extension key
-     * @return void
-     * @api
-     */
-    abstract public static function tables($extensionKey);
+	/**
+	 * Called from ext_tables.php, to be implemented in derrived classes.
+	 *
+	 * @param string $extensionKey Extension key
+	 * @return void
+	 * @api
+	 */
+	abstract public static function tables($extensionKey);
 }

Classes/Extension/ConfiguratorInterface.php

Indentation +16 added lines, -16 removed lines

@@ -32,21 +32,21 @@
  */
 interface ConfiguratorInterface
 {
-    /**
-     * Called from ext_localconf.php
-     *
-     * @param string $extensionKey Extension key
-     * @return void
-     * @api
-     */
-    public static function localconf($extensionKey);
+	/**
+	 * Called from ext_localconf.php
+	 *
+	 * @param string $extensionKey Extension key
+	 * @return void
+	 * @api
+	 */
+	public static function localconf($extensionKey);
 
-    /**
-     * Called from ext_tables.php
-     *
-     * @param string $extensionKey Extension key
-     * @return void
-     * @api
-     */
-    public static function tables($extensionKey);
+	/**
+	 * Called from ext_tables.php
+	 *
+	 * @param string $extensionKey Extension key
+	 * @return void
+	 * @api
+	 */
+	public static function tables($extensionKey);
 }

Classes/Service/AbstractInstallService.php

Indentation +71 added lines, -71 removed lines

@@ -35,83 +35,83 @@
  */
 abstract class AbstractInstallService
 {
-    /**
-     * @var string Extension key
-     */
-    protected $extensionKey;
+	/**
+	 * @var string Extension key
+	 */
+	protected $extensionKey;
 
-    /**
-     * Called from ext_localconf.php, to be implemented in derrived classes.
-     *
-     * @param string $extensionKey Extension key
-     * @return null | AbstractInstallService Instance of this class
-     */
-    public static function registerService($extensionKey)
-    {
-        if (Typo3Mode::isBackend()) {
-            $signalSlot = GeneralUtility::makeInstance(static::class, $extensionKey);
-            $signalSlotDispatcher = GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\SignalSlot\Dispatcher::class);
-            $signalSlotDispatcher->connect(
-                \TYPO3\CMS\Extensionmanager\Utility\InstallUtility::class,
-                'afterExtensionInstall',
-                $signalSlot,
-                'afterInstall'
-            );
-            $signalSlotDispatcher->connect(
-                \TYPO3\CMS\Extensionmanager\Utility\InstallUtility::class,
-                'afterExtensionUninstall',
-                $signalSlot,
-                'afterUninstall'
-            );
+	/**
+	 * Called from ext_localconf.php, to be implemented in derrived classes.
+	 *
+	 * @param string $extensionKey Extension key
+	 * @return null | AbstractInstallService Instance of this class
+	 */
+	public static function registerService($extensionKey)
+	{
+		if (Typo3Mode::isBackend()) {
+			$signalSlot = GeneralUtility::makeInstance(static::class, $extensionKey);
+			$signalSlotDispatcher = GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\SignalSlot\Dispatcher::class);
+			$signalSlotDispatcher->connect(
+				\TYPO3\CMS\Extensionmanager\Utility\InstallUtility::class,
+				'afterExtensionInstall',
+				$signalSlot,
+				'afterInstall'
+			);
+			$signalSlotDispatcher->connect(
+				\TYPO3\CMS\Extensionmanager\Utility\InstallUtility::class,
+				'afterExtensionUninstall',
+				$signalSlot,
+				'afterUninstall'
+			);
 
-            return $signalSlot;
-        }
+			return $signalSlot;
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    /**
-     * Initializes the install service
-     *
-     * @param string $extensionKey Extension key
-     * @throws InvalidArgumentException 
-     */
-    public function __construct($extensionKey)
-    {
-        if (!is_string($extensionKey) || empty($extensionKey)) {
-            throw new \InvalidArgumentException('$extensionKey must be a non empty string.', 1491494798);
-        }
+	/**
+	 * Initializes the install service
+	 *
+	 * @param string $extensionKey Extension key
+	 * @throws InvalidArgumentException 
+	 */
+	public function __construct($extensionKey)
+	{
+		if (!is_string($extensionKey) || empty($extensionKey)) {
+			throw new \InvalidArgumentException('$extensionKey must be a non empty string.', 1491494798);
+		}
 
-        $this->extensionKey = $extensionKey;
-    }
+		$this->extensionKey = $extensionKey;
+	}
 
-    /**
-     * Executes the setup tasks if extension is installed.
-     *
-     * @param string $extensionKey Installed extension key
-     * @return void
-     */
-    abstract public function afterInstall($extensionKey);
+	/**
+	 * Executes the setup tasks if extension is installed.
+	 *
+	 * @param string $extensionKey Installed extension key
+	 * @return void
+	 */
+	abstract public function afterInstall($extensionKey);
 
-    /**
-     * Executes the setup tasks if extension is uninstalled.
-     *
-     * @param string $extensionKey Uninstalled extension key
-     * @return void
-     */
-    abstract public function afterUninstall($extensionKey);
+	/**
+	 * Executes the setup tasks if extension is uninstalled.
+	 *
+	 * @param string $extensionKey Uninstalled extension key
+	 * @return void
+	 */
+	abstract public function afterUninstall($extensionKey);
 
-    /**
-     * Create a Flash Message and add it to the Queue
-     *
-     * @param string $message The message.
-     * @param string $title Optional message title.
-     * @param int $severity Optional severity, must be either of one of \TYPO3\CMS\Core\Messaging\FlashMessage constants
-     * @param bool $storeInSession Optional, defines whether the message should be stored in the session or only for one request (default)
-     * @return void
-     */
-    protected function showFlashMessage($message, $title = '', $severity = FlashMessage::OK, $storeInSession = true)
-    {
-        return FlashMessageUtility::showFlashMessage($this->extensionKey, $message, $title, $severity, $storeInSession);
-    }
+	/**
+	 * Create a Flash Message and add it to the Queue
+	 *
+	 * @param string $message The message.
+	 * @param string $title Optional message title.
+	 * @param int $severity Optional severity, must be either of one of \TYPO3\CMS\Core\Messaging\FlashMessage constants
+	 * @param bool $storeInSession Optional, defines whether the message should be stored in the session or only for one request (default)
+	 * @return void
+	 */
+	protected function showFlashMessage($message, $title = '', $severity = FlashMessage::OK, $storeInSession = true)
+	{
+		return FlashMessageUtility::showFlashMessage($this->extensionKey, $message, $title, $severity, $storeInSession);
+	}
 }

Classes/Utility/Typo3Mode.php

Indentation +80 added lines, -80 removed lines

@@ -32,91 +32,91 @@
  */
 class Typo3Mode
 {
-    /**
-     * Returns TRUE if mode is set.
-     *
-     * @return bool
-     * @api
-     */
-    public static function checkMode()
-    {
-        return defined('TYPO3_MODE');
-    }
+	/**
+	 * Returns TRUE if mode is set.
+	 *
+	 * @return bool
+	 * @api
+	 */
+	public static function checkMode()
+	{
+		return defined('TYPO3_MODE');
+	}
 
-    /**
-     * Returns TRUE if request type is set.
-     *
-     * @return bool
-     * @api
-     */
-    public static function checkRequestType()
-    {
-        return defined('TYPO3_REQUESTTYPE');
-    }
+	/**
+	 * Returns TRUE if request type is set.
+	 *
+	 * @return bool
+	 * @api
+	 */
+	public static function checkRequestType()
+	{
+		return defined('TYPO3_REQUESTTYPE');
+	}
 
-    /**
-     * Returns TRUE if called in frontend mode.
-     *
-     * @return bool
-     * @api
-     */
-    public static function isFrontend()
-    {
-        return (self::checkMode() && (TYPO3_MODE == 'FE')) || (self::checkRequestType() && (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_FE));
-    }
+	/**
+	 * Returns TRUE if called in frontend mode.
+	 *
+	 * @return bool
+	 * @api
+	 */
+	public static function isFrontend()
+	{
+		return (self::checkMode() && (TYPO3_MODE == 'FE')) || (self::checkRequestType() && (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_FE));
+	}
 
-    /**
-     * Returns TRUE if called in backend mode.
-     *
-     * @return bool
-     * @api
-     */
-    public static function isBackend()
-    {
-        return (self::checkMode() && (TYPO3_MODE == 'BE')) || (self::checkRequestType() && (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_BE));
-    }
+	/**
+	 * Returns TRUE if called in backend mode.
+	 *
+	 * @return bool
+	 * @api
+	 */
+	public static function isBackend()
+	{
+		return (self::checkMode() && (TYPO3_MODE == 'BE')) || (self::checkRequestType() && (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_BE));
+	}
 
-    /**
-     * Returns TRUE if called in CLI mode.
-     *
-     * @return bool
-     * @api
-     */
-    public static function isCli()
-    {
-        return (defined('TYPO3_cliMode') && TYPO3_cliMode === true) || (self::checkRequestType() && (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI));
-    }
+	/**
+	 * Returns TRUE if called in CLI mode.
+	 *
+	 * @return bool
+	 * @api
+	 */
+	public static function isCli()
+	{
+		return (defined('TYPO3_cliMode') && TYPO3_cliMode === true) || (self::checkRequestType() && (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI));
+	}
 
-    /**
-     * Returns TRUE if called in ajax mode.
-     *
-     * @return bool
-     * @api
-     */
-    public static function isAjax()
-    {
-        return ($GLOBALS['TYPO3_AJAX']) || (self::checkRequestType() && (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_AJAX));
-    }
+	/**
+	 * Returns TRUE if called in ajax mode.
+	 *
+	 * @return bool
+	 * @api
+	 */
+	public static function isAjax()
+	{
+		return ($GLOBALS['TYPO3_AJAX']) || (self::checkRequestType() && (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_AJAX));
+	}
 
-    /**
-     * Returns TRUE if called in install mode.
-     *
-     * @return bool
-     * @api
-     */
-    public static function isInstall()
-    {
-        return (defined('TYPO3_enterInstallScript') && TYPO3_enterInstallScript) || (self::checkRequestType() && (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_INSTALL));
-    }
+	/**
+	 * Returns TRUE if called in install mode.
+	 *
+	 * @return bool
+	 * @api
+	 */
+	public static function isInstall()
+	{
+		return (defined('TYPO3_enterInstallScript') && TYPO3_enterInstallScript) || (self::checkRequestType() && (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_INSTALL));
+	}
 
-    /**
-     * Returns TRUE if called in composer mode.
-     *
-     * @return bool
-     * @api
-     */
-    public static function isComposerMode()
-    {
-        return (defined('TYPO3_COMPOSER_MODE') && TYPO3_COMPOSER_MODE);
-    }
+	/**
+	 * Returns TRUE if called in composer mode.
+	 *
+	 * @return bool
+	 * @api
+	 */
+	public static function isComposerMode()
+	{
+		return (defined('TYPO3_COMPOSER_MODE') && TYPO3_COMPOSER_MODE);
+	}
 }

ext_emconf.php

Indentation +29 added lines, -29 removed lines

@@ -22,33 +22,33 @@
  */
 
 $EM_CONF[$_EXTKEY] = [
-    'title' => 'GS Library',
-    'description' => 'GS Library is a collection of utility functions, base classes and other templates for the usage in other extensions.',
-    'version' => '0.0.9',
-    'category' => 'misc',
-    'constraints' => [
-        'depends' => [
-            'php' => '7.0.0-7.2.99',
-            'typo3' => '8.7.0-9.5.99',
-        ],
-        'conflicts' => [],
-        'suggests' => [],
-    ],
-    'state' => 'beta',
-    'uploadfolder' => 0,
-    'createDirs' => '',
-    'clearCacheOnLoad' => 0,
-    'author' => 'Simon Gilli',
-    'author_email' => 'typo3@gilbertsoft.org',
-    'author_company' => 'Gilbertsoft',
-    'autoload' => [
-        'psr-4' => [
-            'Gilbertsoft\\Lib\\' => 'Classes',
-        ],
-    ],
-    'autoload-dev' => [
-        'psr-4' => [
-            'Gilbertsoft\\Lib\\Tests\\' => 'Tests',
-        ],
-    ],
+	'title' => 'GS Library',
+	'description' => 'GS Library is a collection of utility functions, base classes and other templates for the usage in other extensions.',
+	'version' => '0.0.9',
+	'category' => 'misc',
+	'constraints' => [
+		'depends' => [
+			'php' => '7.0.0-7.2.99',
+			'typo3' => '8.7.0-9.5.99',
+		],
+		'conflicts' => [],
+		'suggests' => [],
+	],
+	'state' => 'beta',
+	'uploadfolder' => 0,
+	'createDirs' => '',
+	'clearCacheOnLoad' => 0,
+	'author' => 'Simon Gilli',
+	'author_email' => 'typo3@gilbertsoft.org',
+	'author_company' => 'Gilbertsoft',
+	'autoload' => [
+		'psr-4' => [
+			'Gilbertsoft\\Lib\\' => 'Classes',
+		],
+	],
+	'autoload-dev' => [
+		'psr-4' => [
+			'Gilbertsoft\\Lib\\Tests\\' => 'Tests',
+		],
+	],
 ];

Classes/Utility/StorageRepositoryUtility.php

Indentation +131 added lines, -131 removed lines

@@ -34,135 +34,135 @@
  */
 class StorageRepositoryUtility
 {
-    /**
-     * @const string Suffix added to storage name
-     */
-    const STORAGE_SUFFIX = '/ (auto-created)';
-
-    /**
-     * Get the storage repository
-     *
-     * @return \TYPO3\CMS\Core\Resource\StorageRepository
-     */
-    public static function getStorageRepository()
-    {
-        return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
-    }
-
-    /**
-     * Searches for a local storage.
-     *
-     * @param string $name Local storage name
-     * @return NULL|\TYPO3\CMS\Core\Resource\ResourceStorage
-     */
-    public static function findLocalStorage($name)
-    {
-        /** @var $storageObjects \TYPO3\CMS\Core\Resource\ResourceStorage[] */
-        $storageObjects = self::getStorageRepository()->findByStorageType('Local');
-
-        foreach ($storageObjects as $storage) {
-            if (isset($storage->getConfiguration()['basePath']) && ($storage->getConfiguration()['basePath'] == rtrim($name, '/') . '/')) {
-                return $storage;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Creates a directory in the web root if it is not existing.
-     *
-     * @param string $name Relative path to folder from web root, see PHP mkdir() function. Removes trailing slash internally.
-     * @return bool TRUE if mkdir went well!
-     */
-    public static function createDirectoryAtWebRoot($name)
-    {
-        if (!@is_dir(Environment::getPublicPath() . '/' . $name)) {
-            return GeneralUtility::mkdir(Environment::getPublicPath() . '/' . $name);
-        }
-
-        return true;
-    }
-
-    /**
-     * Creates a local storage if not exists.
-     *
-     * @param string $extensionKey
-     * @param string $name Local storage name
-     * @param string $message Optional message
-     * @return NULL|int Uid of the inserted or found record
-     * @throws \InvalidArgumentException
-     */
-    public static function createLocalStorage($extensionKey, $name, $message = '')
-    {
-        if (!is_string($name) || empty($name)) {
-            throw new \InvalidArgumentException('$name must be a non empty string.', 1491681665);
-        }
-
-        if (self::createDirectoryAtWebRoot($name) !== true) {
-            FlashMessageUtility::showFlashMessage(
-                $extensionKey,
-                'Local storage ' . $name . ' could not be created!',
-                'Local storage not created',
-                FlashMessage::WARNING
-            );
-
-            return null;
-        }
-
-        $addMessage = (is_string($message) && !empty($message) ? ' ' . $message : '');
-        /** @var $storage \TYPO3\CMS\Core\Resource\ResourceStorage */
-        $storage = self::findLocalStorage($name);
-
-        if ($storage !== null) {
-            FlashMessageUtility::showFlashMessage(
-                $extensionKey,
-                'Local storage ' . $name . ' was found.' . $addMessage,
-                'Local storage found',
-                FlashMessage::NOTICE
-            );
-
-            return $storage->getUid();
-        }
-
-        $uid = self::getStorageRepository()->createLocalStorage(
-            $name . self::STORAGE_SUFFIX,
-            $name,
-            'relative',
-            'This is the local ' . $name . '/ directory. This storage mount has been created automatically by ' . $extensionKey . '.' . $addMessage,
-            false
-        );
-
-        FlashMessageUtility::showFlashMessage(
-            $extensionKey,
-            'Local storage ' . $name . ' successfully created.' . $addMessage,
-            'Local storage created'
-        );
-
-        return $uid;
-    }
-
-    /**
-     * Removes a local storage.
-     *
-     * @param string $extensionKey
-     * @param string $name Local storage name
-     * @return void
-     * @throws \InvalidArgumentException
-     */
-    public static function removeLocalStorage($extensionKey, $name)
-    {
-        if (!is_string($name) || empty($name)) {
-            throw new \InvalidArgumentException('$name must be a non empty string.', 1491682406);
-        }
-
-        if (self::findLocalStorage($name) !== null) {
-            FlashMessageUtility::showFlashMessage(
-                $extensionKey,
-                'Local storage ' . $name . ' must be removed by an admin from the root line in the backend and web root directory.',
-                'Remove local storage',
-                FlashMessage::NOTICE
-            );
-        }
-    }
+	/**
+	 * @const string Suffix added to storage name
+	 */
+	const STORAGE_SUFFIX = '/ (auto-created)';
+
+	/**
+	 * Get the storage repository
+	 *
+	 * @return \TYPO3\CMS\Core\Resource\StorageRepository
+	 */
+	public static function getStorageRepository()
+	{
+		return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
+	}
+
+	/**
+	 * Searches for a local storage.
+	 *
+	 * @param string $name Local storage name
+	 * @return NULL|\TYPO3\CMS\Core\Resource\ResourceStorage
+	 */
+	public static function findLocalStorage($name)
+	{
+		/** @var $storageObjects \TYPO3\CMS\Core\Resource\ResourceStorage[] */
+		$storageObjects = self::getStorageRepository()->findByStorageType('Local');
+
+		foreach ($storageObjects as $storage) {
+			if (isset($storage->getConfiguration()['basePath']) && ($storage->getConfiguration()['basePath'] == rtrim($name, '/') . '/')) {
+				return $storage;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Creates a directory in the web root if it is not existing.
+	 *
+	 * @param string $name Relative path to folder from web root, see PHP mkdir() function. Removes trailing slash internally.
+	 * @return bool TRUE if mkdir went well!
+	 */
+	public static function createDirectoryAtWebRoot($name)
+	{
+		if (!@is_dir(Environment::getPublicPath() . '/' . $name)) {
+			return GeneralUtility::mkdir(Environment::getPublicPath() . '/' . $name);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Creates a local storage if not exists.
+	 *
+	 * @param string $extensionKey
+	 * @param string $name Local storage name
+	 * @param string $message Optional message
+	 * @return NULL|int Uid of the inserted or found record
+	 * @throws \InvalidArgumentException
+	 */
+	public static function createLocalStorage($extensionKey, $name, $message = '')
+	{
+		if (!is_string($name) || empty($name)) {
+			throw new \InvalidArgumentException('$name must be a non empty string.', 1491681665);
+		}
+
+		if (self::createDirectoryAtWebRoot($name) !== true) {
+			FlashMessageUtility::showFlashMessage(
+				$extensionKey,
+				'Local storage ' . $name . ' could not be created!',
+				'Local storage not created',
+				FlashMessage::WARNING
+			);
+
+			return null;
+		}
+
+		$addMessage = (is_string($message) && !empty($message) ? ' ' . $message : '');
+		/** @var $storage \TYPO3\CMS\Core\Resource\ResourceStorage */
+		$storage = self::findLocalStorage($name);
+
+		if ($storage !== null) {
+			FlashMessageUtility::showFlashMessage(
+				$extensionKey,
+				'Local storage ' . $name . ' was found.' . $addMessage,
+				'Local storage found',
+				FlashMessage::NOTICE
+			);
+
+			return $storage->getUid();
+		}
+
+		$uid = self::getStorageRepository()->createLocalStorage(
+			$name . self::STORAGE_SUFFIX,
+			$name,
+			'relative',
+			'This is the local ' . $name . '/ directory. This storage mount has been created automatically by ' . $extensionKey . '.' . $addMessage,
+			false
+		);
+
+		FlashMessageUtility::showFlashMessage(
+			$extensionKey,
+			'Local storage ' . $name . ' successfully created.' . $addMessage,
+			'Local storage created'
+		);
+
+		return $uid;
+	}
+
+	/**
+	 * Removes a local storage.
+	 *
+	 * @param string $extensionKey
+	 * @param string $name Local storage name
+	 * @return void
+	 * @throws \InvalidArgumentException
+	 */
+	public static function removeLocalStorage($extensionKey, $name)
+	{
+		if (!is_string($name) || empty($name)) {
+			throw new \InvalidArgumentException('$name must be a non empty string.', 1491682406);
+		}
+
+		if (self::findLocalStorage($name) !== null) {
+			FlashMessageUtility::showFlashMessage(
+				$extensionKey,
+				'Local storage ' . $name . ' must be removed by an admin from the root line in the backend and web root directory.',
+				'Remove local storage',
+				FlashMessage::NOTICE
+			);
+		}
+	}
 }

Classes/Utility/FlashMessageUtility.php

Indentation +69 added lines, -69 removed lines

@@ -34,76 +34,76 @@
  */
 class FlashMessageUtility
 {
-    /**
-     * @var \TYPO3\CMS\Core\Messaging\FlashMessageService
-     */
-    protected static $flashMessageService = null;
-    /**
-     * Returns the Flash Message Service
-     *
-     * @return \TYPO3\CMS\Core\Messaging\FlashMessageService
-     */
-    public static function getFlashMessageService()
-    {
-        if (self::$flashMessageService === null) {
-            // cache the object for performance-reasons
-            self::$flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
-        }
-        return self::$flashMessageService;
-    }
+	/**
+	 * @var \TYPO3\CMS\Core\Messaging\FlashMessageService
+	 */
+	protected static $flashMessageService = null;
+	/**
+	 * Returns the Flash Message Service
+	 *
+	 * @return \TYPO3\CMS\Core\Messaging\FlashMessageService
+	 */
+	public static function getFlashMessageService()
+	{
+		if (self::$flashMessageService === null) {
+			// cache the object for performance-reasons
+			self::$flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
+		}
+		return self::$flashMessageService;
+	}
 
-    /**
-     * Returns the Flash Message Queue
-     *
-     * @param string $extensionKey
-     * @return \TYPO3\CMS\Core\Messaging\FlashMessageQueue
-     * @throws \InvalidArgumentException
-     */
-    public static function getFlashMessageQueue($extensionKey)
-    {
-        if (!is_string($extensionKey) || empty($extensionKey)) {
-            throw new \InvalidArgumentException('$extensionKey must be a non empty string.', 1491502264);
-        }
-        return self::getFlashMessageService()->getMessageQueueByIdentifier('gslib.flashmessages.' . $extensionKey);
-    }
+	/**
+	 * Returns the Flash Message Queue
+	 *
+	 * @param string $extensionKey
+	 * @return \TYPO3\CMS\Core\Messaging\FlashMessageQueue
+	 * @throws \InvalidArgumentException
+	 */
+	public static function getFlashMessageQueue($extensionKey)
+	{
+		if (!is_string($extensionKey) || empty($extensionKey)) {
+			throw new \InvalidArgumentException('$extensionKey must be a non empty string.', 1491502264);
+		}
+		return self::getFlashMessageService()->getMessageQueueByIdentifier('gslib.flashmessages.' . $extensionKey);
+	}
 
-    /**
-     * Adds a Flash Message to the Flash Message Queue
-     *
-     * @param \TYPO3\CMS\Core\Messaging\FlashMessage $flashMessage
-     * @param string $extensionKey
-     * @return void
-     */
-    public static function addFlashMessageToQueue(FlashMessage $flashMessage, $extensionKey)
-    {
-        if ($flashMessage) {
-            self::getFlashMessageQueue($extensionKey)->enqueue($flashMessage);
-        }
-    }
+	/**
+	 * Adds a Flash Message to the Flash Message Queue
+	 *
+	 * @param \TYPO3\CMS\Core\Messaging\FlashMessage $flashMessage
+	 * @param string $extensionKey
+	 * @return void
+	 */
+	public static function addFlashMessageToQueue(FlashMessage $flashMessage, $extensionKey)
+	{
+		if ($flashMessage) {
+			self::getFlashMessageQueue($extensionKey)->enqueue($flashMessage);
+		}
+	}
 
-    /**
-     * Create a Flash Message and add it to the Queue
-     *
-     * @param string $extensionKey
-     * @param string $message The message.
-     * @param string $title Optional message title.
-     * @param int $severity Optional severity, must be either of one of \TYPO3\CMS\Core\Messaging\FlashMessage constants
-     * @param bool $storeInSession Optional, defines whether the message should be stored in the session or only for one request (default)
-     * @return void
-     */
-    public static function showFlashMessage($extensionKey, $message, $title = '', $severity = FlashMessage::OK, $storeInSession = true)
-    {
-        if (is_string($message) || !empty($message)) {
-            self::addFlashMessageToQueue(
-                GeneralUtility::makeInstance(
-                    FlashMessage::class,
-                    $message,
-                    $title,
-                    $severity,
-                    $storeInSession
-                ), 
-                $extensionKey
-            );
-        }
-    }
+	/**
+	 * Create a Flash Message and add it to the Queue
+	 *
+	 * @param string $extensionKey
+	 * @param string $message The message.
+	 * @param string $title Optional message title.
+	 * @param int $severity Optional severity, must be either of one of \TYPO3\CMS\Core\Messaging\FlashMessage constants
+	 * @param bool $storeInSession Optional, defines whether the message should be stored in the session or only for one request (default)
+	 * @return void
+	 */
+	public static function showFlashMessage($extensionKey, $message, $title = '', $severity = FlashMessage::OK, $storeInSession = true)
+	{
+		if (is_string($message) || !empty($message)) {
+			self::addFlashMessageToQueue(
+				GeneralUtility::makeInstance(
+					FlashMessage::class,
+					$message,
+					$title,
+					$severity,
+					$storeInSession
+				), 
+				$extensionKey
+			);
+		}
+	}
 }