Commit 7b045d93 authored by Wouter Wolters's avatar Wouter Wolters Committed by Christian Kuhn
Browse files

[TASK] Apply CGL compatibility (PSR-1 and PSR-2)

Change-Id: I6fb8b355ceb4f734e4df5aaf2954c624693c11ad
Reviewed-on: https://review.typo3.org/47677

Reviewed-by: Georg Ringer's avatarGeorg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer's avatarGeorg Ringer <georg.ringer@gmail.com>
Reviewed-by: default avatarDaniel Goerz <ervaude@gmail.com>
Reviewed-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
parent 4a8f5ae3
......@@ -419,7 +419,7 @@ class SingleFieldContainer extends AbstractContainer
<div class="t3-form-original-language-diff">
<div class="t3-form-original-language-diffheader">'
. htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.changeInOrig'))
. '</div>
. '</div>
<div class="t3-form-original-language-diffcontent">
<div class="diff">
<div class="diff-item">
......
......@@ -15,7 +15,6 @@ namespace TYPO3\CMS\Backend\Form\Element;
*/
use TYPO3\CMS\Backend\Routing\UriBuilder;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Resource\Exception\FileDoesNotExistException;
use TYPO3\CMS\Core\Resource\File;
use TYPO3\CMS\Core\Resource\ResourceFactory;
......
......@@ -26,7 +26,6 @@ use TYPO3\CMS\Core\Messaging\FlashMessageService;
use TYPO3\CMS\Core\Utility\ArrayUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\MathUtility;
use TYPO3\CMS\Core\Utility\PathUtility;
use TYPO3\CMS\Lang\LanguageService;
/**
......
......@@ -594,5 +594,4 @@ class TcaFlexProcess implements FormDataProviderInterface
{
return $GLOBALS['BE_USER'];
}
}
......@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Backend\Module;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Lang\LanguageService;
......@@ -398,7 +397,6 @@ class ModuleLoader
'title' => isset($labels[$language]['tabs']['tab']) ? $labels[$language]['tabs']['tab'] : $labels['default']['tabs']['tab'],
];
}
}
}
......
......@@ -356,7 +356,7 @@ class ExtdirectTreeCommands
if (empty($mountPoints)) {
$mountPoints = array(0);
}
if (!empty(static::getBackendUser()->uc['pageTree_temporaryMountPoint'])){
if (!empty(static::getBackendUser()->uc['pageTree_temporaryMountPoint'])) {
$mountPoints[] = (int)static::getBackendUser()->uc['pageTree_temporaryMountPoint'];
}
$mountPoints = array_unique($mountPoints);
......
......@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Backend\ViewHelpers;
*/
use TYPO3\CMS\Backend\Backend\Avatar\Avatar;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Get avatar for backend user
......
......@@ -25,7 +25,7 @@ if (version_compare(PHP_VERSION, '7.0.0', '<')) {
* Valid cliKeys must be registered in
* $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys'].
*/
call_user_func(function() {
call_user_func(function () {
$classLoader = require __DIR__ . '/../../../../../../vendor/autoload.php';
(new \TYPO3\CMS\Backend\Console\Application($classLoader))->run();
......
......@@ -273,4 +273,4 @@ class LocalizationControllerTest extends FunctionalTestCase
$results = $this->getDatabaseConnection()->exec_SELECTgetRows('pid, sys_language_uid, l18n_parent, header', 'tt_content', 'pid = 1 AND sys_language_uid = 1', '', 'sorting ASC');
$this->assertSame($expectedResults, $results);
}
}
\ No newline at end of file
}
......@@ -48,7 +48,6 @@ class InputTextElementTest extends UnitTestCase
parent::tearDown();
}
/**
* Data provider for renderAppliesCorrectTimestampConversion
*
......
......@@ -148,4 +148,4 @@ class SuggestWizardTest extends UnitTestCase
$subject->_call('getFieldConfiguration', $parts, $dataStructure);
}
}
\ No newline at end of file
}
......@@ -1055,7 +1055,8 @@ class BackendUtilityTest extends UnitTestCase
/**
* @test
*/
public function dateTimeAgeReturnsCorrectValues() {
public function dateTimeAgeReturnsCorrectValues()
{
/** @var ObjectProphecy|LanguageService $languageServiceProphecy */
$languageServiceProphecy = $this->prophesize(LanguageService::class);
$languageServiceProphecy->sL(Argument::cetera())->willReturn(' min| hrs| days| yrs| min| hour| day| year');
......
......@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Belog\ViewHelpers\Be;
* The TYPO3 project - inspiring people to share!
*/
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Get page path string from page id
......
......@@ -16,8 +16,8 @@ namespace TYPO3\CMS\Belog\ViewHelpers;
use TYPO3\CMS\Backend\Template\DocumentTemplate;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Display error icon from error integer value
......
......@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Belog\ViewHelpers;
*/
use TYPO3\CMS\Belog\Domain\Model\LogEntry;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Create detail string from log entry
......
......@@ -22,8 +22,8 @@ use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Get history entry from for log entry
......
......@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Belog\ViewHelpers;
*/
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Returns true, if a specific extension is loaded
......
......@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Belog\ViewHelpers;
* The TYPO3 project - inspiring people to share!
*/
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Get username from backend user id
......
......@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Belog\ViewHelpers;
* The TYPO3 project - inspiring people to share!
*/
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Get workspace title from workspace id
......
......@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Beuser\ViewHelpers;
* The TYPO3 project - inspiring people to share!
*/
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Get a value from an array by given key.
......
Markdown is supported
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