Commit 192efad2 authored by Torsten Oppermann's avatar Torsten Oppermann
Browse files

[TASK] CGL Cleanup

parent 370ff1a8
......@@ -30,10 +30,8 @@ use Exception;
use RuntimeException;
use TYPO3\CMS\Core\Charset\CharsetConverter;
use TYPO3\CMS\Core\Configuration\ConfigurationManager;
use TYPO3\CMS\Core\Localization\Locales;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\VersionNumberUtility;
use TYPO3\CMS\Extbase\Object\ObjectManager;
/**
* includes special typo3 methods
......
......@@ -39,7 +39,7 @@ class AbstractViewHelper extends AbstractBackendViewHelper {
* @return PageRenderer
*/
public function getPageRenderer() {
return $this->objectManager->get(\TYPO3\CMS\Core\Page\PageRenderer::class);
return $this->objectManager->get(PageRenderer::class);
}
/**
......@@ -58,6 +58,4 @@ class AbstractViewHelper extends AbstractBackendViewHelper {
return $baseUrl;
}
}
?>
}
\ No newline at end of file
......@@ -45,5 +45,3 @@ class AddCssFileViewHelper extends AbstractViewHelper {
$this->getPageRenderer()->addCssFile($cssFile, 'stylesheet', 'all', '', FALSE);
}
}
?>
......@@ -45,5 +45,3 @@ class AddJavaScriptFileViewHelper extends AbstractViewHelper {
$this->getPageRenderer()->addJsFile($javaScriptFile);
}
}
?>
......@@ -32,10 +32,6 @@ use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
* Class ActionMenuOptionGroupViewHelper
*/
class ActionMenuOptionGroupViewHelper extends AbstractTagBasedViewHelper {
/**
* @var string
*/
protected $tagName = 'optgroup';
/**
* Initialize
......@@ -44,6 +40,7 @@ class ActionMenuOptionGroupViewHelper extends AbstractTagBasedViewHelper {
*/
public function initializeArguments() {
parent::initializeArguments();
$this->tagName = 'optgroup';
$this->registerUniversalTagAttributes();
$this->registerTagAttribute('label', 'string', 'Specifies a label for an option-group');
$this->registerTagAttribute('disabled', 'string', 'Specifies that an option-group should be disabled');
......
......@@ -36,6 +36,8 @@ class ExtendedIfViewHelper extends AbstractConditionViewHelper {
/**
* Initializes the "then" and "else" arguments
*
* @throws \TYPO3Fluid\Fluid\Core\ViewHelper\Exception
*/
public function initializeArguments() {
parent::initializeArguments();
......@@ -82,13 +84,13 @@ class ExtendedIfViewHelper extends AbstractConditionViewHelper {
* @param array $arguments ViewHelper arguments to evaluate the condition for this ViewHelper, allows for flexiblity in overriding this method.
* @return bool
*/
static protected function evaluateCondition($arguments = NULL) {
protected static function evaluateCondition($arguments = NULL) {
$conditionResult = (
isset($arguments['condition']) && $arguments['condition'] ||
isset($arguments['or']) && $arguments['or'] ||
isset($arguments['or2']) && $arguments['or2'] ||
isset($arguments['or3']) && $arguments['or3'] ||
isset($arguments['or4']) && $arguments['or4']
(isset($arguments['condition']) && $arguments['condition']) ||
(isset($arguments['or']) && $arguments['or']) ||
(isset($arguments['or2']) && $arguments['or2']) ||
(isset($arguments['or3']) && $arguments['or3']) ||
(isset($arguments['or4']) && $arguments['or4'])
) && isset($arguments['and']) && $arguments['and'] &&
isset($arguments['and2']) && $arguments['and2'] &&
isset($arguments['and3']) && $arguments['and3'] &&
......
......@@ -43,7 +43,7 @@ class InlineLanguageLabelsViewHelper extends AbstractViewHelper {
/**
* Renders the required javascript to make the language labels available
*
* @param string $labels Comma separated list of label keys to include
* @param mixed $labels Comma separated list of label keys to include
* @param boolean $htmlEscape
* @return void
*/
......@@ -69,6 +69,4 @@ class InlineLanguageLabelsViewHelper extends AbstractViewHelper {
$this->getPageRenderer()->addJsInlineCode($extensionName, $javascriptCode);
}
}
?>
}
\ No newline at end of file
......@@ -8,5 +8,3 @@ if (!defined('TYPO3_MODE')) {
if (!is_array($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['lfeditor_select_options_cache'])) {
$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['lfeditor_select_options_cache'] = array();
}
?>
\ No newline at end of file
......@@ -4,7 +4,7 @@ if (!defined('TYPO3_MODE')) {
die('Access denied!!!');
}
if (TYPO3_MODE == 'BE') {
if (TYPO3_MODE === 'BE') {
TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule(
'SGalinski.lfeditor',
'user',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment