From 72822d30fc80c2754935df224d27d51540d78575 Mon Sep 17 00:00:00 2001
From: Wouter Wolters <typo3@wouterwolters.nl>
Date: Thu, 3 Mar 2016 20:06:48 +0100
Subject: [PATCH] [TASK] Apply CGL compatibility (PSR-1 and PSR-2)
Change-Id: Ie0b546d6baf962ee4d80f5fb08aeaadf54ca1a66
Reviewed-on: https://review.typo3.org/47019
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
---
.../Classes/Controller/ModulesController.php | 2 --
.../ToolbarItems/ShortcutToolbarItem.php | 1 -
.../Controller/ClickMenuController.php | 1 -
.../Module/BackendModuleRepository.php | 1 -
.../FrontendBackendUserAuthentication.php | 1 -
.../backend/Classes/History/RecordHistory.php | 1 -
.../Classes/Utility/BackendUtility.php | 1 -
.../core/Build/FunctionalTestsBootstrap.php | 3 +-
.../sysext/core/Build/UnitTestsBootstrap.php | 2 --
.../core/Classes/Html/RteHtmlParser.php | 1 -
.../core/Classes/Localization/Locales.php | 2 --
.../core/Classes/Messaging/FlashMessage.php | 2 --
.../core/Classes/Package/PackageManager.php | 3 +-
.../Utility/ExtensionManagementUtility.php | 1 -
typo3/sysext/core/Configuration/TCA/pages.php | 2 +-
.../Backend/LoginBadCredentialsCest.php | 4 +--
.../Acceptance/Backend/LoginMouseOverCest.php | 4 +--
.../core/Tests/AcceptanceCoreEnvironment.php | 8 ++---
.../sysext/core/Tests/FunctionalTestCase.php | 1 -
typo3/sysext/core/Tests/Testbase.php | 5 +--
.../core/Tests/Unit/Html/HtmlParserTest.php | 6 ++--
.../Tests/Unit/Localization/LocalesTest.php | 1 -
.../Unit/Migrations/TcaMigrationTest.php | 3 +-
.../Rendering/YouTubeRendererTest.php | 1 -
.../Classes/ViewHelpers/ImageViewHelper.php | 2 --
.../ViewHelpers/Uri/ImageViewHelper.php | 2 --
.../EscapeChildrenRenderingStandaloneTest.php | 6 ++--
.../EscapeChildrenRenderingTest.php | 7 ++--
.../Extensions/fluid_test/ext_emconf.php | 34 +++++++++----------
.../ContentObjectRendererTest.php | 1 -
.../TypoScriptFrontendControllerTest.php | 1 -
.../InfoPageTyposcriptConfigController.php | 1 -
.../Classes/Browser/FileBrowser.php | 2 +-
.../Controller/SelectImageController.php | 6 ++--
.../Classes/ImageHandler/AddImageHandler.php | 4 +--
.../Configuration/Backend/AjaxRoutes.php | 1 -
36 files changed, 49 insertions(+), 75 deletions(-)
diff --git a/typo3/sysext/about/Classes/Controller/ModulesController.php b/typo3/sysext/about/Classes/Controller/ModulesController.php
index 09cd4f39d540..ec113c3afd85 100644
--- a/typo3/sysext/about/Classes/Controller/ModulesController.php
+++ b/typo3/sysext/about/Classes/Controller/ModulesController.php
@@ -17,9 +17,7 @@ namespace TYPO3\CMS\About\Controller;
use TYPO3\CMS\Backend\Module\ModuleLoader;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Backend\View\BackendTemplateView;
-use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\PathUtility;
use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
use TYPO3\CMS\Lang\LanguageService;
diff --git a/typo3/sysext/backend/Classes/Backend/ToolbarItems/ShortcutToolbarItem.php b/typo3/sysext/backend/Classes/Backend/ToolbarItems/ShortcutToolbarItem.php
index 7af80d89725a..318cb828f261 100644
--- a/typo3/sysext/backend/Classes/Backend/ToolbarItems/ShortcutToolbarItem.php
+++ b/typo3/sysext/backend/Classes/Backend/ToolbarItems/ShortcutToolbarItem.php
@@ -27,7 +27,6 @@ use TYPO3\CMS\Core\Resource\Exception\ResourceDoesNotExistException;
use TYPO3\CMS\Core\Resource\ResourceFactory;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\MathUtility;
-use TYPO3\CMS\Core\Utility\PathUtility;
/**
* Class to render the shortcut menu
diff --git a/typo3/sysext/backend/Classes/Controller/ClickMenuController.php b/typo3/sysext/backend/Classes/Controller/ClickMenuController.php
index d8a3559cd967..24428afae3de 100644
--- a/typo3/sysext/backend/Classes/Controller/ClickMenuController.php
+++ b/typo3/sysext/backend/Classes/Controller/ClickMenuController.php
@@ -18,7 +18,6 @@ use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Backend\ClickMenu\ClickMenu;
use TYPO3\CMS\Backend\Clipboard\Clipboard;
-use TYPO3\CMS\Backend\Template\DocumentTemplate;
use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
diff --git a/typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php b/typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php
index 24fee0d34898..7feeb89dfae4 100644
--- a/typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php
+++ b/typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php
@@ -19,7 +19,6 @@ use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Imaging\IconRegistry;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\PathUtility;
/**
* Repository for backend module menu
diff --git a/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php b/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
index 87f1bb2021de..89af1ee87c29 100755
--- a/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
+++ b/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
@@ -15,7 +15,6 @@ namespace TYPO3\CMS\Backend;
*/
use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
-use TYPO3\CMS\Core\Charset\CharsetConverter;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Lang\LanguageService;
diff --git a/typo3/sysext/backend/Classes/History/RecordHistory.php b/typo3/sysext/backend/Classes/History/RecordHistory.php
index ed2e7df32a70..0c8097eaeafc 100644
--- a/typo3/sysext/backend/Classes/History/RecordHistory.php
+++ b/typo3/sysext/backend/Classes/History/RecordHistory.php
@@ -14,7 +14,6 @@ namespace TYPO3\CMS\Backend\History;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3\CMS\Backend\Backend\Avatar\Avatar;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\DataHandling\DataHandler;
use TYPO3\CMS\Core\Imaging\Icon;
diff --git a/typo3/sysext/backend/Classes/Utility/BackendUtility.php b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
index 0b474ea785d2..e8bbe370af4e 100755
--- a/typo3/sysext/backend/Classes/Utility/BackendUtility.php
+++ b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
@@ -23,7 +23,6 @@ use TYPO3\CMS\Core\Database\PreparedStatement;
use TYPO3\CMS\Core\Database\RelationHandler;
use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
-use TYPO3\CMS\Core\Messaging\FlashMessage;
use TYPO3\CMS\Core\Resource\AbstractFile;
use TYPO3\CMS\Core\Resource\Exception\ResourceDoesNotExistException;
use TYPO3\CMS\Core\Resource\File;
diff --git a/typo3/sysext/core/Build/FunctionalTestsBootstrap.php b/typo3/sysext/core/Build/FunctionalTestsBootstrap.php
index afa82459edd5..f7d578707e71 100644
--- a/typo3/sysext/core/Build/FunctionalTestsBootstrap.php
+++ b/typo3/sysext/core/Build/FunctionalTestsBootstrap.php
@@ -17,7 +17,6 @@
* before instantiating the test suites, it must also be included
* with phpunit parameter --bootstrap if executing single test case classes.
*/
-
call_user_func(function () {
// Ensure cli only as security measure
if (PHP_SAPI !== 'cli') {
@@ -30,4 +29,4 @@ call_user_func(function () {
$testbase->defineOriginalRootPath();
$testbase->createDirectory(ORIGINAL_ROOT . 'typo3temp/var/tests');
$testbase->createDirectory(ORIGINAL_ROOT . 'typo3temp/var/transient');
-});
\ No newline at end of file
+});
diff --git a/typo3/sysext/core/Build/UnitTestsBootstrap.php b/typo3/sysext/core/Build/UnitTestsBootstrap.php
index e2fb5fae2287..ed129a1c9d97 100644
--- a/typo3/sysext/core/Build/UnitTestsBootstrap.php
+++ b/typo3/sysext/core/Build/UnitTestsBootstrap.php
@@ -26,7 +26,6 @@
* - typo3/../bin/phpunit -c typo3/sysext/core/Build/UnitTests.xml
* typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
*/
-
call_user_func(function () {
// Ensure cli only as security measure
if (PHP_SAPI !== 'cli') {
@@ -69,4 +68,3 @@ call_user_func(function () {
// Find all class names
->ensureClassLoadingInformationExists();
});
-
diff --git a/typo3/sysext/core/Classes/Html/RteHtmlParser.php b/typo3/sysext/core/Classes/Html/RteHtmlParser.php
index da895816f79d..634efc74b91f 100644
--- a/typo3/sysext/core/Classes/Html/RteHtmlParser.php
+++ b/typo3/sysext/core/Classes/Html/RteHtmlParser.php
@@ -432,7 +432,6 @@ class RteHtmlParser extends HtmlParser
return implode('', $imgSplit);
}
-
/**
* Transformation handler: 'ts_links' / direction: "db"
* Converting <A>-tags to <link tags>
diff --git a/typo3/sysext/core/Classes/Localization/Locales.php b/typo3/sysext/core/Classes/Localization/Locales.php
index e8be8dab7873..f863749422be 100644
--- a/typo3/sysext/core/Classes/Localization/Locales.php
+++ b/typo3/sysext/core/Classes/Localization/Locales.php
@@ -211,7 +211,6 @@ class Locales implements \TYPO3\CMS\Core\SingletonInterface
return $dependencies;
}
-
/**
* Converts the language codes that we get from the client (usually HTTP_ACCEPT_LANGUAGE)
* into a TYPO3-readable language code
@@ -260,5 +259,4 @@ class Locales implements \TYPO3\CMS\Core\SingletonInterface
}
return $selectedLanguage;
}
-
}
diff --git a/typo3/sysext/core/Classes/Messaging/FlashMessage.php b/typo3/sysext/core/Classes/Messaging/FlashMessage.php
index 2484b14bc00d..1c25cd13443d 100644
--- a/typo3/sysext/core/Classes/Messaging/FlashMessage.php
+++ b/typo3/sysext/core/Classes/Messaging/FlashMessage.php
@@ -14,8 +14,6 @@ namespace TYPO3\CMS\Core\Messaging;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-
/**
* A class representing flash messages.
*/
diff --git a/typo3/sysext/core/Classes/Package/PackageManager.php b/typo3/sysext/core/Classes/Package/PackageManager.php
index 5bd26709b4a0..84d83824038c 100644
--- a/typo3/sysext/core/Classes/Package/PackageManager.php
+++ b/typo3/sysext/core/Classes/Package/PackageManager.php
@@ -1030,7 +1030,8 @@ class PackageManager implements \TYPO3\CMS\Core\SingletonInterface
*
* @return array
*/
- protected function getPackageBasePaths() {
+ protected function getPackageBasePaths()
+ {
if (empty($this->packagesBasePaths)) {
// Check if the directory even exists and if it is not empty
if (is_dir(PATH_typo3conf . 'ext') && count(scandir(PATH_typo3conf . 'ext')) > 2) {
diff --git a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
index 6b16a8293e69..a26e36daa792 100644
--- a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
+++ b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
@@ -15,7 +15,6 @@ namespace TYPO3\CMS\Core\Utility;
*/
use TYPO3\CMS\Core\Category\CategoryRegistry;
-use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider;
use TYPO3\CMS\Core\Imaging\IconRegistry;
use TYPO3\CMS\Core\Migrations\TcaMigration;
diff --git a/typo3/sysext/core/Configuration/TCA/pages.php b/typo3/sysext/core/Configuration/TCA/pages.php
index d75d52e554f6..39f6ce0d33f2 100644
--- a/typo3/sysext/core/Configuration/TCA/pages.php
+++ b/typo3/sysext/core/Configuration/TCA/pages.php
@@ -1058,4 +1058,4 @@ return array(
'showitem' => 'tsconfig_includes;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.tsconfig_includes, --linebreak--, TSconfig;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.TSconfig_formlabel',
)
)
-);
\ No newline at end of file
+);
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/LoginBadCredentialsCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/LoginBadCredentialsCest.php
index cbbf436868fc..7a6081ab5996 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/LoginBadCredentialsCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/LoginBadCredentialsCest.php
@@ -33,12 +33,12 @@ class LoginBadCredentialsCest
$I->waitForElement('#t3-username');
$I->wantTo('check empty credentials');
- $required = $I->executeInSelenium(function(\Facebook\WebDriver\Remote\RemoteWebDriver $webdriver) {
+ $required = $I->executeInSelenium(function (\Facebook\WebDriver\Remote\RemoteWebDriver $webdriver) {
return $webdriver->findElement(\WebDriverBy::cssSelector('#t3-username'))->getAttribute('required');
});
$I->assertEquals('true', $required, '#t3-username');
- $required = $I->executeInSelenium(function(\Facebook\WebDriver\Remote\RemoteWebDriver $webdriver) {
+ $required = $I->executeInSelenium(function (\Facebook\WebDriver\Remote\RemoteWebDriver $webdriver) {
return $webdriver->findElement(\WebDriverBy::cssSelector('#t3-password'))->getAttribute('required');
});
$I->assertEquals('true', $required, '#t3-password');
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/LoginMouseOverCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/LoginMouseOverCest.php
index 7004b02ca027..cea7cd6fe30a 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/LoginMouseOverCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/LoginMouseOverCest.php
@@ -35,13 +35,13 @@ class LoginMouseOverCest
// Make sure mouse is not over submit button from a previous test
$I->moveMouseOver('#t3-username');
- $bs = $I->executeInSelenium(function(\Facebook\WebDriver\Remote\RemoteWebDriver $webdriver) {
+ $bs = $I->executeInSelenium(function (\Facebook\WebDriver\Remote\RemoteWebDriver $webdriver) {
return $webdriver->findElement(\WebDriverBy::cssSelector('#t3-login-submit'))->getCSSValue('box-shadow');
});
$I->moveMouseOver('#t3-login-submit');
$I->wait(1);
- $bsmo = $I->executeInSelenium(function(\Facebook\WebDriver\Remote\RemoteWebDriver $webdriver) {
+ $bsmo = $I->executeInSelenium(function (\Facebook\WebDriver\Remote\RemoteWebDriver $webdriver) {
return $webdriver->findElement(\WebDriverBy::cssSelector('#t3-login-submit'))->getCSSValue('box-shadow');
});
$I->assertFalse($bs === $bsmo);
diff --git a/typo3/sysext/core/Tests/AcceptanceCoreEnvironment.php b/typo3/sysext/core/Tests/AcceptanceCoreEnvironment.php
index efcd25ac427c..cd7e9849a40a 100644
--- a/typo3/sysext/core/Tests/AcceptanceCoreEnvironment.php
+++ b/typo3/sysext/core/Tests/AcceptanceCoreEnvironment.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Core\Tests;
* The TYPO3 project - inspiring people to share!
*/
-use Codeception\Events;
use Codeception\Event\SuiteEvent;
+use Codeception\Events;
use Codeception\Extension;
use TYPO3\CMS\Core\Cache\Backend\NullBackend;
@@ -148,7 +148,8 @@ class AcceptanceCoreEnvironment extends Extension
* @param SuiteEvent $suiteEvent
* @throws Exception
*/
- public function bootstrapTypo3Environment(SuiteEvent $suiteEvent) {
+ public function bootstrapTypo3Environment(SuiteEvent $suiteEvent)
+ {
$testbase = new Testbase();
$testbase->enableDisplayErrors();
$testbase->defineBaseConstants();
@@ -221,11 +222,10 @@ class AcceptanceCoreEnvironment extends Extension
// Alternative solution:
// unset($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys']['extbase']);
$suite = $suiteEvent->getSuite();
- $suite->setBackupGlobals(FALSE);
+ $suite->setBackupGlobals(false);
foreach ($this->xmlDatabaseFixtures as $fixture) {
$testbase->importXmlDatabaseFixture(ORIGINAL_ROOT . $fixture);
}
}
-
}
diff --git a/typo3/sysext/core/Tests/FunctionalTestCase.php b/typo3/sysext/core/Tests/FunctionalTestCase.php
index 8d6f8f76178f..491e6eb117ec 100644
--- a/typo3/sysext/core/Tests/FunctionalTestCase.php
+++ b/typo3/sysext/core/Tests/FunctionalTestCase.php
@@ -401,5 +401,4 @@ abstract class FunctionalTestCase extends BaseTestCase
$response = new Response($result['status'], $result['content'], $result['error']);
return $response;
}
-
}
diff --git a/typo3/sysext/core/Tests/Testbase.php b/typo3/sysext/core/Tests/Testbase.php
index 979eb7e8712a..5773412a645a 100644
--- a/typo3/sysext/core/Tests/Testbase.php
+++ b/typo3/sysext/core/Tests/Testbase.php
@@ -31,7 +31,8 @@ use TYPO3\CMS\Install\Service\SqlSchemaMigrationService;
* Use the classes "UnitTestCase", "FunctionalTestCase" or "AcceptanceCoreEnvironment"
* to indirectly benefit from this class in own extensions.
*/
-class Testbase {
+class Testbase
+{
/**
* Makes sure error messages during the tests get displayed no matter what is set in php.ini.
@@ -708,4 +709,4 @@ class Testbase {
}
return false;
}
-}
\ No newline at end of file
+}
diff --git a/typo3/sysext/core/Tests/Unit/Html/HtmlParserTest.php b/typo3/sysext/core/Tests/Unit/Html/HtmlParserTest.php
index 01711fc020aa..cbc656ffa188 100644
--- a/typo3/sysext/core/Tests/Unit/Html/HtmlParserTest.php
+++ b/typo3/sysext/core/Tests/Unit/Html/HtmlParserTest.php
@@ -356,7 +356,8 @@ class HtmlParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
/**
* @return array
*/
- public function stripEmptyTagsKeepsConfiguredTagsDataProvider() {
+ public function stripEmptyTagsKeepsConfiguredTagsDataProvider()
+ {
return [
array(
'tr,td',
@@ -381,7 +382,8 @@ class HtmlParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
* @param string $content The HTML content that should be parsed.
* @param string $expectedResult The expected HTML code result.
*/
- public function stripEmptyTagsKeepsConfiguredTags($tagList, $treatNonBreakingSpaceAsEmpty, $content, $expectedResult) {
+ public function stripEmptyTagsKeepsConfiguredTags($tagList, $treatNonBreakingSpaceAsEmpty, $content, $expectedResult)
+ {
$tsConfig = array(
'keepNonMatchedTags' => 1,
'stripEmptyTags' => 1,
diff --git a/typo3/sysext/core/Tests/Unit/Localization/LocalesTest.php b/typo3/sysext/core/Tests/Unit/Localization/LocalesTest.php
index a830a6e2d40d..c36cf65900b1 100644
--- a/typo3/sysext/core/Tests/Unit/Localization/LocalesTest.php
+++ b/typo3/sysext/core/Tests/Unit/Localization/LocalesTest.php
@@ -15,7 +15,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Localization;
*/
use TYPO3\CMS\Core\Localization\Locales;
-use TYPO3\CMS\Core\Localization\LocalizationFactory;
use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
diff --git a/typo3/sysext/core/Tests/Unit/Migrations/TcaMigrationTest.php b/typo3/sysext/core/Tests/Unit/Migrations/TcaMigrationTest.php
index a41a30f53333..426accd10829 100644
--- a/typo3/sysext/core/Tests/Unit/Migrations/TcaMigrationTest.php
+++ b/typo3/sysext/core/Tests/Unit/Migrations/TcaMigrationTest.php
@@ -1380,7 +1380,8 @@ class TcaMigrationTest extends UnitTestCase
* @param array $givenConfig
* @param array $expectedConfig
*/
- public function migrateRemovesRteTransformOptions(array $givenConfig, array $expectedConfig) {
+ public function migrateRemovesRteTransformOptions(array $givenConfig, array $expectedConfig)
+ {
$subject = new TcaMigration();
$this->assertEquals($expectedConfig, $subject->migrate($givenConfig));
}
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Rendering/YouTubeRendererTest.php b/typo3/sysext/core/Tests/Unit/Resource/Rendering/YouTubeRendererTest.php
index 78fe780b30cf..a9cd3fad4f7c 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Rendering/YouTubeRendererTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Rendering/YouTubeRendererTest.php
@@ -140,7 +140,6 @@ class YouTubeRendererTest extends UnitTestCase
$fileReferenceMock->expects($this->any())->method('getProperty')->will($this->returnValue(1));
$fileReferenceMock->expects($this->any())->method('getOriginalFile')->willReturn($fileResourceMock);
-
$this->assertSame(
'<iframe src="//www.youtube.com/embed/7331?autohide=1&controls=2&autoplay=1&enablejsapi=1&origin=test.server.org&showinfo=0" allowfullscreen width="300" height="200"></iframe>',
$this->subject->render($fileReferenceMock, '300m', '200')
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/ImageViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/ImageViewHelper.php
index d11004c262ec..914906bf19ac 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/ImageViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/ImageViewHelper.php
@@ -15,9 +15,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers;
* */
use TYPO3\CMS\Core\Resource\Exception\ResourceDoesNotExistException;
-use TYPO3\CMS\Core\Resource\FileInterface;
use TYPO3\CMS\Core\Resource\FileReference;
-use TYPO3\CMS\Extbase\Domain\Model\AbstractFileFolder;
/**
* Resizes a given image (if required) and renders the respective img tag
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ImageViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ImageViewHelper.php
index 628844b0f2b6..48cb30acebd2 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ImageViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ImageViewHelper.php
@@ -15,10 +15,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Uri;
* */
use TYPO3\CMS\Core\Resource\Exception\ResourceDoesNotExistException;
-use TYPO3\CMS\Core\Resource\FileInterface;
use TYPO3\CMS\Core\Resource\FileReference;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Domain\Model\AbstractFileFolder;
use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Extbase\Service\ImageService;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface;
diff --git a/typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingStandaloneTest.php b/typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingStandaloneTest.php
index 04c047e36ed5..8f3074c1a485 100644
--- a/typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingStandaloneTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingStandaloneTest.php
@@ -3,7 +3,6 @@ namespace TYPO3\Fluid\Tests\Functional;
use TYPO3\CMS\Core\Tests\FunctionalTestCase;
use TYPO3\CMS\Fluid\View\StandaloneView;
-use TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperResolver;
class EscapeChildrenRenderingStandaloneTest extends FunctionalTestCase
{
@@ -55,7 +54,6 @@ class EscapeChildrenRenderingStandaloneTest extends FunctionalTestCase
'<strong>Bla</strong>'
],
-
'EscapeChildrenDisabledAndEscapeOutputDisabled: Tag syntax with children, properly encodes variable value' =>
[
'<ft:escapeChildrenDisabledAndEscapeOutputDisabled>{settings.test}</ft:escapeChildrenDisabledAndEscapeOutputDisabled>',
@@ -110,8 +108,8 @@ class EscapeChildrenRenderingStandaloneTest extends FunctionalTestCase
public function renderingTest($viewHelperTemplate, $expectedOutput)
{
$view = new StandaloneView();
- $view->getRenderingContext()->getViewHelperResolver()->addNamespace('ft', 'TYPO3Fluid\\FluidTest\\ViewHelpers');
- $view->getRenderingContext()->getTemplatePaths()->setTemplateSource($viewHelperTemplate);
+ $view->getRenderingContext()->getViewHelperResolver()->addNamespace('ft', 'TYPO3Fluid\\FluidTest\\ViewHelpers');
+ $view->getRenderingContext()->getTemplatePaths()->setTemplateSource($viewHelperTemplate);
$view->assign('settings', ['test' => '<strong>Bla</strong>']);
diff --git a/typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingTest.php b/typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingTest.php
index 67958816fd8d..273c941af5c2 100644
--- a/typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/EscapeChildrenRenderingTest.php
@@ -54,7 +54,6 @@ class EscapeChildrenRenderingTest extends FunctionalTestCase
'<strong>Bla</strong>'
],
-
'EscapeChildrenDisabledAndEscapeOutputDisabled: Tag syntax with children, properly encodes variable value' =>
[
'<ft:escapeChildrenDisabledAndEscapeOutputDisabled>{settings.test}</ft:escapeChildrenDisabledAndEscapeOutputDisabled>',
@@ -110,10 +109,10 @@ class EscapeChildrenRenderingTest extends FunctionalTestCase
{
$view = new TemplateView();
$view->assign('settings', ['test' => '<strong>Bla</strong>']);
- $templateString = "{namespace ft=TYPO3Fluid\\FluidTest\\ViewHelpers}";
+ $templateString = '{namespace ft=TYPO3Fluid\\FluidTest\\ViewHelpers}';
$templateString .= $viewHelperTemplate;
- $view->getRenderingContext()->getViewHelperResolver()->addNamespace('ft', 'TYPO3Fluid\\FluidTest\\ViewHelpers');
- $view->getRenderingContext()->getTemplatePaths()->setTemplateSource($viewHelperTemplate);
+ $view->getRenderingContext()->getViewHelperResolver()->addNamespace('ft', 'TYPO3Fluid\\FluidTest\\ViewHelpers');
+ $view->getRenderingContext()->getTemplatePaths()->setTemplateSource($viewHelperTemplate);
$this->assertSame($expectedOutput, $view->render());
}
diff --git a/typo3/sysext/fluid/Tests/Functional/Fixtures/Extensions/fluid_test/ext_emconf.php b/typo3/sysext/fluid/Tests/Functional/Fixtures/Extensions/fluid_test/ext_emconf.php
index 8f98522a9f92..fadb716791e5 100644
--- a/typo3/sysext/fluid/Tests/Functional/Fixtures/Extensions/fluid_test/ext_emconf.php
+++ b/typo3/sysext/fluid/Tests/Functional/Fixtures/Extensions/fluid_test/ext_emconf.php
@@ -1,5 +1,5 @@
<?php
-$EM_CONF[$_EXTKEY] = array (
+$EM_CONF[$_EXTKEY] = array(
'title' => 'Extension skeleton for TYPO3 7',
'description' => 'Description for ext',
'category' => 'Example Extensions',
@@ -17,30 +17,30 @@ $EM_CONF[$_EXTKEY] = array (
'clearCacheOnLoad' => 0,
'lockType' => '',
'version' => '0.0.2',
- 'constraints' =>
- array (
- 'depends' =>
- array (
+ 'constraints' =>
+ array(
+ 'depends' =>
+ array(
'typo3' => '7.5.0-7.99.99',
),
- 'conflicts' =>
- array (
+ 'conflicts' =>
+ array(
),
- 'suggests' =>
- array (
+ 'suggests' =>
+ array(
),
),
- 'autoload' =>
- array (
- 'psr-4' =>
- array (
+ 'autoload' =>
+ array(
+ 'psr-4' =>
+ array(
'TYPO3Fluid\\FluidTest\\' => 'Classes',
),
),
- 'autoload-dev' =>
- array (
- 'psr-4' =>
- array (
+ 'autoload-dev' =>
+ array(
+ 'psr-4' =>
+ array(
'TYPO3Fluid\\FluidTest\\Tests\\' => 'Tests',
),
),
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
index 93076dbdebff..0247404cddd7 100755
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
@@ -18,7 +18,6 @@ use Psr\Log\LoggerInterface;
use TYPO3\CMS\Core\Charset\CharsetConverter;
use TYPO3\CMS\Core\Core\ApplicationContext;
use TYPO3\CMS\Core\Log\LogManager;
-use TYPO3\CMS\Core\TimeTracker\TimeTracker;
use TYPO3\CMS\Core\TypoScript\TemplateService;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Frontend\ContentObject\AbstractContentObject;
diff --git a/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php b/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php
index 869d945b86d2..ff0e06a21e68 100644
--- a/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Frontend\Tests\Unit\Controller;
use TYPO3\CMS\Core\Cache\CacheManager;
use TYPO3\CMS\Core\Database\DatabaseConnection;
-use TYPO3\CMS\Core\TimeTracker\TimeTracker;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
use TYPO3\CMS\Frontend\Page\PageRepository;
diff --git a/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php b/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php
index b577d458ed2b..bb966a581ee6 100644
--- a/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php
+++ b/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php
@@ -144,7 +144,6 @@ class InfoPageTyposcriptConfigController extends \TYPO3\CMS\Backend\Module\Abstr
$url = BackendUtility::getModuleUrl('record_edit', $urlParameters);
$editIcon = htmlspecialchars($url);
$editTitle = 'editTSconfig_all';
-
} else {
$editIcon = '';
$editTitle = '';
diff --git a/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php b/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php
index f8253841ce2f..48568a5c69f2 100644
--- a/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php
+++ b/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php
@@ -333,7 +333,7 @@ class FileBrowser extends AbstractElementBrowser implements ElementBrowserInterf
<div class="btn-group">' . $ATag . '<span title="' . $lang->getLL('addToList', true) . '">' . $this->iconFactory->getIcon('actions-edit-add', Icon::SIZE_SMALL)->render() . '</span>' . $ATag_e . '
<a href="' . htmlspecialchars($Ahref) . '" class="btn btn-default" title="' . $lang->getLL('info', true) . '">' . $this->iconFactory->getIcon('actions-document-info', Icon::SIZE_SMALL) . '</a>
</td>
- <td class="col-clipboard" valign="top">'. $bulkCheckBox .'</td>
+ <td class="col-clipboard" valign="top">' . $bulkCheckBox . '</td>
<td nowrap="nowrap"> ' . $pDim . '</td>
</tr>';
if ($pDim) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Controller/SelectImageController.php b/typo3/sysext/rtehtmlarea/Classes/Controller/SelectImageController.php
index 7a825d96a732..fb6e15ab4bea 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Controller/SelectImageController.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Controller/SelectImageController.php
@@ -259,14 +259,16 @@ class SelectImageController extends AbstractLinkBrowserController
/**
* @return array
*/
- public function getButtonConfiguration() {
+ public function getButtonConfiguration()
+ {
return $this->buttonConfig;
}
/**
* @return array
*/
- public function getRteProperties() {
+ public function getRteProperties()
+ {
return $this->RTEProperties;
}
diff --git a/typo3/sysext/rtehtmlarea/Classes/ImageHandler/AddImageHandler.php b/typo3/sysext/rtehtmlarea/Classes/ImageHandler/AddImageHandler.php
index 2975c4348e69..0aecd4b9dca0 100644
--- a/typo3/sysext/rtehtmlarea/Classes/ImageHandler/AddImageHandler.php
+++ b/typo3/sysext/rtehtmlarea/Classes/ImageHandler/AddImageHandler.php
@@ -145,7 +145,6 @@ class AddImageHandler implements LinkParameterProviderInterface, LinkHandlerInte
: $buttonConfiguration['options.']['plain.']['maxHeight'];
$this->getLanguageService()->includeLLFile('EXT:rtehtmlarea/Resources/Private/Language/locallang_selectimagecontroller.xlf');
-
}
/**
@@ -398,7 +397,7 @@ class AddImageHandler implements LinkParameterProviderInterface, LinkHandlerInte
<div class="btn-group">' . $ATag . '<span title="' . $lang->getLL('addToList', true) . '">' . $this->iconFactory->getIcon('actions-edit-add', Icon::SIZE_SMALL)->render() . '</span>' . $ATag_e . '
<a href="' . htmlspecialchars($Ahref) . '" class="btn btn-default" title="' . $lang->getLL('info', true) . '">' . $this->iconFactory->getIcon('actions-document-info', Icon::SIZE_SMALL) . '</a>
</td>
- <td class="col-clipboard" valign="top">'. $bulkCheckBox .'</td>
+ <td class="col-clipboard" valign="top">' . $bulkCheckBox . '</td>
<td nowrap="nowrap"> ' . $pDim . '</td>
</tr>';
if ($pDim) {
@@ -428,7 +427,6 @@ class AddImageHandler implements LinkParameterProviderInterface, LinkHandlerInte
return $out;
}
-
/**
* Get a list of Files in a folder filtered by extension
*
diff --git a/typo3/sysext/rtehtmlarea/Configuration/Backend/AjaxRoutes.php b/typo3/sysext/rtehtmlarea/Configuration/Backend/AjaxRoutes.php
index 8c705f2d2461..a384215c6e5c 100644
--- a/typo3/sysext/rtehtmlarea/Configuration/Backend/AjaxRoutes.php
+++ b/typo3/sysext/rtehtmlarea/Configuration/Backend/AjaxRoutes.php
@@ -1,5 +1,4 @@
<?php
-use TYPO3\CMS\Backend\Controller;
/**
* Definitions for routes provided by EXT:backend
--
GitLab