[TASK] Apply CGL compatibility (PSR-1 and PSR-2) 42/48442/4
authorHelmut Hummel <info@helhum.io>
Fri, 3 Jun 2016 10:10:32 +0000 (12:10 +0200)
committerHelmut Hummel <helmut.hummel@typo3.org>
Fri, 10 Jun 2016 09:12:30 +0000 (11:12 +0200)
Resolves: #76449
Releases: master
Change-Id: Ie0a7302d8a2f2d9aabfb7a351114f7e91e7d7ac8
Reviewed-on: https://review.typo3.org/48442
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Helmut Hummel <helmut.hummel@typo3.org>
Tested-by: Helmut Hummel <helmut.hummel@typo3.org>
58 files changed:
typo3/sysext/backend/Classes/Command/ReferenceIndexUpdateCommand.php
typo3/sysext/backend/Classes/Controller/FormInlineAjaxController.php
typo3/sysext/backend/Classes/Form/Container/InlineRecordContainer.php
typo3/sysext/backend/Classes/Form/Element/InputColorPickerElement.php
typo3/sysext/backend/Classes/View/Wizard/Element/BackendLayoutWizardElement.php
typo3/sysext/backend/Tests/Unit/Controller/FormInlineAjaxControllerTest.php
typo3/sysext/belog/Classes/ViewHelpers/ErrorIconViewHelper.php
typo3/sysext/beuser/Classes/Domain/Repository/BackendUserRepository.php
typo3/sysext/core/Classes/Cache/Frontend/VariableFrontend.php
typo3/sysext/core/Classes/Package/PackageManager.php
typo3/sysext/core/Classes/Resource/ResourceStorage.php
typo3/sysext/core/Classes/Tests/FunctionalTestCase.php
typo3/sysext/core/Classes/TimeTracker/TimeTracker.php
typo3/sysext/core/Classes/Utility/DebugUtility.php
typo3/sysext/core/Classes/Utility/GeneralUtility.php
typo3/sysext/core/Configuration/DefaultConfiguration.php
typo3/sysext/core/Tests/Acceptance/Backend/Extensionmanager/InstalledExtensionsCest.php
typo3/sysext/core/Tests/Acceptance/Backend/Formhandler/CategoryTreeCest.php
typo3/sysext/core/Tests/Acceptance/Backend/General/ModuleMenuCest.php
typo3/sysext/core/Tests/Acceptance/Backend/Login/BackendLoginCest.php
typo3/sysext/core/Tests/Acceptance/Backend/Topbar/SearchCest.php
typo3/sysext/core/Tests/AcceptanceCoreEnvironment.php
typo3/sysext/core/Tests/Functional/DataHandling/FlexformIrre/ActionTestCase.php
typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php
typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php
typo3/sysext/core/Tests/Unit/Cache/CacheFactoryTest.php
typo3/sysext/core/Tests/Unit/Cache/Fixtures/BackendConfigurationOptionFixture.php
typo3/sysext/core/Tests/Unit/Core/ClassLoadingInformationGeneratorTest.php
typo3/sysext/core/Tests/Unit/Imaging/IconProvider/FontawesomeIconProviderTest.php
typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
typo3/sysext/core/Tests/Unit/Utility/StringUtilityTest.php
typo3/sysext/extbase/Classes/Mvc/Web/ReferringRequest.php
typo3/sysext/extbase/Tests/Functional/Persistence/Generic/Mapper/DataMapperTest.php
typo3/sysext/extbase/Tests/Unit/Service/ExtensionServiceTest.php
typo3/sysext/extensionmanager/Classes/ViewHelpers/Form/TypoScriptConstantsViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Be/TableListViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Form/ValidationResultsViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Link/TypolinkViewHelper.php
typo3/sysext/fluid_styled_content/Classes/ViewHelpers/Link/ClickEnlargeViewHelper.php
typo3/sysext/fluid_styled_content/Classes/ViewHelpers/Menu/KeywordsViewHelper.php
typo3/sysext/fluid_styled_content/Classes/ViewHelpers/Menu/SectionViewHelper.php
typo3/sysext/form/Classes/View/Wizard/Element/FormWizardElement.php
typo3/sysext/form/Tests/Unit/Validator/InArrayValidatorTest.php
typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php
typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
typo3/sysext/frontend/Tests/Unit/Page/PageRepositoryTest.php
typo3/sysext/install/Classes/Controller/BackendModuleController.php
typo3/sysext/install/Classes/Updates/ExtensionManagerTables.php
typo3/sysext/install/Tests/Unit/FolderStructure/DirectoryNodeTest.php
typo3/sysext/install/Tests/Unit/FolderStructure/FileNodeTest.php
typo3/sysext/install/Tests/Unit/FolderStructure/LinkNodeTest.php
typo3/sysext/install/Tests/Unit/Service/SilentConfigurationUpgradeServiceTest.php
typo3/sysext/install/Tests/Unit/Status/StatusUtilityTest.php
typo3/sysext/opendocs/Classes/Backend/ToolbarItems/OpendocsToolbarItem.php
typo3/sysext/scheduler/Classes/Task/AbstractTask.php
typo3/sysext/scheduler/Tests/Unit/CronCommand/NormalizeCommandTest.php
typo3/sysext/setup/Tests/Unit/SetupModuleControllerTest.php
typo3/sysext/workspaces/Classes/Service/WorkspaceService.php

index 7a59633..75be9a4 100644 (file)
@@ -26,7 +26,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  */
 class ReferenceIndexUpdateCommand extends Command
 {
-
     /**
      * Configure the command by defining the name, options and arguments
      */
index ac69943..9dfdbfc 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-declare(strict_types = 1);
+declare (strict_types = 1);
 namespace TYPO3\CMS\Backend\Controller;
 
 /*
@@ -818,7 +818,8 @@ class FormInlineAjaxController
      * @param BackendUserAuthentication $backendUser
      * @return bool
      */
-    protected function backendUserHasUcInlineView(BackendUserAuthentication $backendUser) {
+    protected function backendUserHasUcInlineView(BackendUserAuthentication $backendUser)
+    {
         return !empty($backendUser->uc['inlineView']);
     }
 
@@ -993,11 +994,9 @@ class FormInlineAjaxController
          */
 
         if (preg_match($pattern, $domObjectId, $match)) {
-
             return array($match['flexformPath'], $match['tableName']);
         }
 
         return [];
-
     }
 }
index 113a2f8..a8dfab1 100644 (file)
@@ -502,7 +502,7 @@ class InlineRecordContainer extends AbstractContainer
             $hiddenField = $tcaTableCtrl['enablecolumns']['disabled'];
             if ($enabledControls['hide'] && $permsEdit && $hiddenField && $tcaTableCols[$hiddenField] && (!$tcaTableCols[$hiddenField]['exclude'] || $backendUser->check('non_exclude_fields', $foreignTable . ':' . $hiddenField))) {
                 $onClick = 'return inline.enableDisableRecord(' . GeneralUtility::quoteJSvalue($nameObjectFtId) . ',' .
-                    GeneralUtility::quoteJSvalue($hiddenField) .')';
+                    GeneralUtility::quoteJSvalue($hiddenField) . ')';
                 $className = 't3js-' . $nameObjectFtId . '_disabled';
                 if ($rec[$hiddenField]) {
                     $title = htmlspecialchars($languageService->sL(('LLL:EXT:lang/locallang_mod_web_list.xlf:unHide' . ($isPagesTable ? 'Page' : ''))));
index 3e80c9c..76d6695 100644 (file)
@@ -14,9 +14,7 @@ namespace TYPO3\CMS\Backend\Form\Element;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Backend\Form\Element\AbstractFormElement;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
-use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
 use TYPO3\CMS\Core\Utility\StringUtility;
@@ -26,7 +24,6 @@ use TYPO3\CMS\Core\Utility\StringUtility;
  */
 class InputColorPickerElement extends AbstractFormElement
 {
-
     /**
      * This will render a single-line input form field, possibly with various control/validation features
      *
index f17b347..843aca4 100644 (file)
@@ -23,7 +23,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  */
 class BackendLayoutWizardElement extends AbstractFormElement
 {
-
     /**
      * @var array
      */
index b40ebd0..dea7a32 100644 (file)
@@ -64,7 +64,6 @@ class FormInlineAjaxControllerTest extends UnitTestCase
         $this->assertTrue($mayUploadFile);
     }
 
-
     /**
      * @dataProvider splitDomObjectIdDataProviderForTableName
      * @param string $dataStructure
@@ -193,7 +192,6 @@ class FormInlineAjaxControllerTest extends UnitTestCase
         $this->assertEmpty($result);
     }
 
-
     /**
      * Unserialize uc inline view string for IRRE item
      * @issue https://forge.typo3.org/issues/76561
index 7ff420d..43f18c5 100644 (file)
@@ -14,7 +14,6 @@ namespace TYPO3\CMS\Belog\ViewHelpers;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Backend\Template\DocumentTemplate;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
index dbd0f72..a867ce6 100644 (file)
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Beuser\Domain\Repository;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Database\ConnectionPool;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
  * Repository for \TYPO3\CMS\Beuser\Domain\Model\BackendUser
index 0385608..12d1eee 100644 (file)
@@ -21,7 +21,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  */
 class VariableFrontend extends AbstractFrontend
 {
-
     /**
      * Saves the value of a PHP variable in the cache. Note that the variable
      * will be serialized if necessary.
index 421aae8..6d58476 100644 (file)
@@ -279,7 +279,8 @@ class PackageManager implements \TYPO3\CMS\Core\SingletonInterface
     /**
      * @param PackageInterface $package
      */
-    protected function registerActivePackage(PackageInterface $package) {
+    protected function registerActivePackage(PackageInterface $package)
+    {
         // reset the active packages so they are rebuilt.
         $this->activePackages = [];
         $this->packageStatesConfiguration['packages'][$package->getPackageKey()] = ['packagePath' => str_replace($this->packagesBasePath, '',  $package->getPackagePath())];
index 4ecb615..b29ba90 100644 (file)
@@ -2927,7 +2927,8 @@ class ResourceStorage implements ResourceStorageInterface
                     $processingFolder = $processingFolder->createFolder($folderName);
                 }
             }
-        } catch (Exception\FolderDoesNotExistException $e) {}
+        } catch (Exception\FolderDoesNotExistException $e) {
+        }
 
         return $processingFolder;
     }
index 5dc01fe..8679415 100644 (file)
@@ -52,7 +52,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  */
 abstract class FunctionalTestCase extends BaseTestCase
 {
-
     /**
      * An unique identifier for this test case. Location of the test
      * instance and database name depend on this. Calculated early in setUp()
index 6f43dcb..5cc040c 100755 (executable)
@@ -25,7 +25,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  */
 class TimeTracker implements SingletonInterface
 {
-
     /**
      * If set to true (see constructor) then then the timetracking is enabled
      * @var bool
index 6f88a58..c11c161 100644 (file)
@@ -23,12 +23,12 @@ class DebugUtility
     /**
      * @var bool
      */
-    static protected $plainTextOutput = true;
+    protected static $plainTextOutput = true;
 
     /**
      * @var bool
      */
-    static protected $ansiColorUsage = true;
+    protected static $ansiColorUsage = true;
 
     /**
      * Debug
index 73c7229..8ea1697 100755 (executable)
@@ -3207,7 +3207,6 @@ class GeneralUtility
         return $bInfo;
     }
 
-
     /**
      * Get the fully-qualified domain name of the host.
      *
@@ -3415,7 +3414,7 @@ class GeneralUtility
             } elseif (strpos($testAbsoluteUrl, self::getIndpEnv('TYPO3_SITE_PATH')) === 0 && $decodedUrl[0] === '/') {
                 $sanitizedUrl = $url;
             } elseif (empty($parsedUrl['scheme']) && strpos($testRelativeUrl, self::getIndpEnv('TYPO3_SITE_PATH')) === 0
-                && $decodedUrl[0] !== '/' && strpbrk($decodedUrl, "*:|\"<>") === FALSE && strpos($decodedUrl, '\\\\') === false
+                && $decodedUrl[0] !== '/' && strpbrk($decodedUrl, '*:|"<>') === false && strpos($decodedUrl, '\\\\') === false
             ) {
                 $sanitizedUrl = $url;
             }
index 2547927..92819f7 100644 (file)
@@ -1132,7 +1132,7 @@ return array(
         'transport_sendmail_command' => '',        // String: <em>only with transport=sendmail</em>: The command to call to send a mail locally.
         'transport_mbox_file' => '',        // String: <em>only with transport=mbox</em>: The file where to write the mails into. This file will be conforming the mbox format described in RFC 4155. It is a simple text file with a concatenation of all mails. Path must be absolute.
         'defaultMailFromAddress' => '',        // String: This default email address is used when no other "from" address is set for a TYPO3-generated email. You can specify an email address only (ex. info@example.org).
-        'defaultMailFromName' => '',    // String: This default name is used when no other "from" name is set for a TYPO3-generated email.
+        'defaultMailFromName' => ''// String: This default name is used when no other "from" name is set for a TYPO3-generated email.
     ),
     'HTTP' => array(    // HTTP configuration to tune how TYPO3 behaves on HTTP requests made by TYPO3. Have a look at http://docs.guzzlephp.org/en/latest/request-options.html for some background information on those settings.
         'allow_redirects' => array( // Mixed, set to false if you want to allow redirects, or use it as an array to add more values, see http://docs.guzzlephp.org/en/latest/request-options.html#allow-redirects for syntax
index 92d92df..c987eb5 100644 (file)
@@ -14,7 +14,6 @@ namespace TYPO3\CMS\Core\Tests\Acceptance\Backend\Extensionmanager;
  * The TYPO3 project - inspiring people to share!
  */
 
-use Facebook\WebDriver\Remote\DriverCommand;
 use TYPO3\CMS\Core\Tests\Acceptance\Step\Backend\Admin;
 
 /**
@@ -77,7 +76,8 @@ class InstalledExtensionsCest
      * @param Admin $I
      * @return Admin
      */
-    public function checkIfInstallingAnExtensionWithBackendModuleAddsTheModuleToTheModuleMenu(Admin $I) {
+    public function checkIfInstallingAnExtensionWithBackendModuleAddsTheModuleToTheModuleMenu(Admin $I)
+    {
         $I->switchToIFrame();
         $I->canSeeElement('.typo3-module-menu-item');
         $I->cantSeeElement('#system_BeuserTxBeuser');
@@ -93,7 +93,6 @@ class InstalledExtensionsCest
         $I->switchToIFrame();
         $I->canSeeElement('#system_BeuserTxBeuser');
 
-
         return $I;
     }
 
index fc98a43..afc7388 100644 (file)
@@ -39,7 +39,7 @@ class CategoryTreeCest
         $I->click('#web_list');
         $I->switchToIFrame('content');
         $I->waitForElement('#recordlist-sys_category');
-        $I->seeNumberOfElements('#recordlist-sys_category table > tbody > tr', [5,100]);
+        $I->seeNumberOfElements('#recordlist-sys_category table > tbody > tr', [5, 100]);
     }
 
     /**
@@ -54,7 +54,7 @@ class CategoryTreeCest
         // Select category with id 7
         $I->click('#recordlist-sys_category tr[data-uid="7"] a[data-original-title="Edit record"]');
         // Change title and level to root
-        $I->fillField('input[data-formengine-input-name="data[sys_category][7][title]"]','level-1-4');
+        $I->fillField('input[data-formengine-input-name="data[sys_category][7][title]"]', 'level-1-4');
         $I->click('div[ext\:tree-node-id="7"]');
         $I->click('div[ext\:tree-node-id="3"]');
         $I->click('button[name="_savedok"]');
@@ -62,7 +62,4 @@ class CategoryTreeCest
         $I->waitForElement('.x-panel.x-tree');
         $I->see('level-1-4', '.x-panel.x-tree');
     }
-
-
-
 }
index 95d72b7..2453fbe 100644 (file)
@@ -61,7 +61,7 @@ class ModuleMenuCest
      */
     public function selectingAModuleDoesHighlightIt(Admin $I)
     {
-        $I->seeNumberOfElements('#web .typo3-module-menu-item-link', [2,20]);
+        $I->seeNumberOfElements('#web .typo3-module-menu-item-link', [2, 20]);
 
         $I->wantTo('check that the second element has no "active" class\'');
         $I->cantSeeElement('#web #web_list.active');
index 61984f8..047bf47 100644 (file)
@@ -160,4 +160,4 @@ class BackendLoginCest
         $I->click('Logout');
         $I->waitForElement('#t3-username');
     }
-}
\ No newline at end of file
+}
index f0d1470..557c46f 100644 (file)
@@ -49,7 +49,7 @@ class SearchCest
         $I->canSee('Backend user', self::$topBarModuleSelector);
         $I->click('.icon-status-user-admin', self::$topBarModuleSelector);
 
-        $I->switchToIFrame("content");
+        $I->switchToIFrame('content');
         $I->waitForElementVisible('#EditDocumentController');
         $I->canSee('Edit Backend user "admin" on root level');
     }
index f5d134c..f05b6f2 100644 (file)
@@ -31,7 +31,6 @@ use TYPO3\CMS\Styleguide\TcaDataGenerator\Generator;
  */
 class AcceptanceCoreEnvironment extends Extension
 {
-
     /**
      * Additional core extensions to load.
      *
index 870cd7f..a5815a1 100644 (file)
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Core\Tests\Functional\DataHandling\FlexformIrre;
 
 class ActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\DataHandling\AbstractDataHandlerActionTestCase
 {
-
     /**
      * @var array
      */
index 40a8bdc..8a3822c 100644 (file)
@@ -532,7 +532,6 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function requireOnceThrowsExceptionForInvalidIdentifier($identifier)
     {
-
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionCode(1282073036);
 
index ecb4de4..9606124 100644 (file)
@@ -115,7 +115,6 @@ class RedisBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionCode(1279763057);
 
-
         $this->setUpBackend(array('database' => 'foo'));
     }
 
@@ -168,7 +167,6 @@ class RedisBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setThrowsExceptionIfIdentifierIsNotAString()
     {
-
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionCode(1377006651);
 
index d65c36f..ea7b562 100644 (file)
@@ -19,7 +19,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache;
  *
  * This file is a backport from FLOW3
  */
-class FactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
+class CacheFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 {
     /**
      * @test
index eb4e6e9..ce6e761 100644 (file)
@@ -35,5 +35,4 @@ class BackendConfigurationOptionFixture extends BackendFixture
             throw new \RuntimeException('', 1464555007);
         }
     }
-
 }
index e0bc8e2..350467c 100644 (file)
@@ -29,7 +29,6 @@ class ClassLoadingInformationGeneratorTest extends UnitTestCase
      */
     public function buildClassAliasMapForPackageThrowsExceptionForWrongComposerManifestInformation()
     {
-
         $this->expectException(\TYPO3\CMS\Core\Error\Exception::class);
         $this->expectExceptionCode(1444142481);
 
index 6ea8f3e..0cc37a2 100644 (file)
@@ -73,7 +73,7 @@ class FontawesomeIconProviderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     /**
      * @dataProvider wrongNamesDataProvider
      * @param string $name
-     * @param integer $expectedExceptionCode
+     * @param int $expectedExceptionCode
      * @test
      */
     public function prepareIconMarkupWithInvalidNameThrowsException($name, $expectedExceptionCode)
index 1b00529..0858e51 100644 (file)
@@ -4461,7 +4461,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      * @test
      * @dataProvider callUserFunctionInvalidParameterDataprovider
      * @param string $functionName
-     * @param integer $expectedException
+     * @param int $expectedException
      */
     public function callUserFunctionWillThrowExceptionForInvalidParameters($functionName, $expectedException)
     {
index 56ff978..86fcbd1 100644 (file)
@@ -191,9 +191,8 @@ class StringUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      *
      * @param mixed $string
      * @param mixed $part
-     * @param integer $expectedException
+     * @param int $expectedException
      */
-
     public function beginsWithReturnsThrowsExceptionWithInvalidArguments($string, $part, $expectedException)
     {
         $this->expectException(\InvalidArgumentException::class);
index 085b67d..486c26a 100644 (file)
@@ -52,5 +52,4 @@ class ReferringRequest extends Request
                 break;
         }
     }
-
 }
index 879cbbd..76e7e5b 100644 (file)
@@ -5,10 +5,8 @@ use ExtbaseTeam\BlogExample\Domain\Model\Comment;
 use TYPO3\CMS\Core\Tests\FunctionalTestCase;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-
 class DataMapperTest extends FunctionalTestCase
 {
-
     /**
      * @var \TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager
      */
@@ -29,7 +27,6 @@ class DataMapperTest extends FunctionalTestCase
      */
     protected $objectManager;
 
-
     /**
      * Sets up this test suite.
      */
index 60e42b0..a6f2b48 100644 (file)
@@ -13,8 +13,6 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Service;
  *
  * The TYPO3 project - inspiring people to share!
  */
-use TYPO3\CMS\Extbase\Exception;
-
 use Doctrine\DBAL\Statement;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
@@ -24,6 +22,7 @@ use TYPO3\CMS\Core\Database\Query\Expression\ExpressionBuilder;
 use TYPO3\CMS\Core\Database\Query\QueryBuilder;
 use TYPO3\CMS\Core\Tests\Unit\Database\Mocks\MockPlatform;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Exception;
 
 /**
  * Test case
index 09aa218..501b7d5 100644 (file)
@@ -14,8 +14,6 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers\Form;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Backend\Utility\BackendUtility;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper;
 
 /**
index 9f70a7a..e051b8d 100644 (file)
@@ -43,7 +43,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  */
 class TableListViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper
 {
-
     /**
      * As this ViewHelper renders HTML, the output must not be escaped.
      *
index 30a6743..fe47715 100644 (file)
@@ -63,7 +63,6 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Form;
  */
 class ValidationResultsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper
 {
-
     /**
      * As this ViewHelper renders HTML, the output must not be escaped.
      *
index 4e7b8c9..d92aede 100644 (file)
@@ -51,7 +51,6 @@ use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
  */
 class TypolinkViewHelper extends AbstractViewHelper
 {
-
     /**
      * @var bool
      */
index 196cee6..345e366 100644 (file)
@@ -37,7 +37,6 @@ use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
  */
 class ClickEnlargeViewHelper extends AbstractViewHelper
 {
-
     /**
      * @var bool
      */
index fd523ee..0faef79 100644 (file)
@@ -39,7 +39,6 @@ use TYPO3\CMS\Core\Database\DatabaseConnection;
  */
 class KeywordsViewHelper extends AbstractMenuViewHelper
 {
-
     /**
      * Output escaping is disabled as child content contains HTML by default
      *
index a024abc..ce96b15 100644 (file)
@@ -46,7 +46,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  */
 class SectionViewHelper extends AbstractMenuViewHelper
 {
-
     /**
      * Output escaping is disabled as child content contains HTML by default
      *
index 2f3908b..5886f4f 100644 (file)
@@ -27,7 +27,6 @@ use TYPO3\CMS\Form\Utility\TypoScriptToJsonConverter;
  */
 class FormWizardElement extends AbstractFormElement
 {
-
     /**
      * @var array
      */
index 5e41f9b..96d9484 100644 (file)
@@ -20,7 +20,6 @@ use TYPO3\CMS\Form\Domain\Validator\InArrayValidator;
  */
 class InArrayValidatorTest extends AbstractValidatorTest
 {
-
     /**
      * @var string
      */
index c707848..669b30a 100644 (file)
@@ -17,13 +17,12 @@ namespace TYPO3\CMS\Frontend\Controller;
 
 use TYPO3\CMS\Backend\Tree\View\PageTreeView;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Core\Database\ConnectionPool;
+use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
+use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Database\Query\QueryBuilder;
-use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
-use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
 
 /**
  * Class for displaying translation status of pages in the tree.
@@ -352,8 +351,8 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
         $res = $queryBuilder->execute();
         $outputArray = [];
         if (is_array($allowed_languages) && !empty($allowed_languages)) {
-            while($output = $res->fetch()){
-                if(isset($allowed_languages[$output['uid']])){
+            while ($output = $res->fetch()) {
+                if (isset($allowed_languages[$output['uid']])) {
                     $outputArray[] = $output;
                 }
             }
index 1ac7ccb..34b4338 100755 (executable)
@@ -2812,7 +2812,7 @@ class ContentObjectRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             '; sourounded' => [',one,two,', ' ; one ; two ; '],
             'nl sourounded' => [
                 ',one,two,',
-                ' ' . PHP_EOL .' one ' . PHP_EOL . ' two ' . PHP_EOL . ' '
+                ' ' . PHP_EOL . ' one ' . PHP_EOL . ' two ' . PHP_EOL . ' '
             ],
             'mixed' => [
                 'one,two,three,four',
index 6b4c082..e589c0c 100644 (file)
@@ -393,7 +393,6 @@ class PageRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->assertSame(' AND pages.deleted=0 AND (pages.t3ver_wsid=0 OR pages.t3ver_wsid=2)', $this->pageSelectObject->where_hid_del);
     }
 
-
     /**
      * @test
      */
index 36fa7e6..fc19a3e 100644 (file)
@@ -20,7 +20,6 @@ use TYPO3\CMS\Backend\Template\ModuleTemplate;
 use TYPO3\CMS\Core\FormProtection\AbstractFormProtection;
 use TYPO3\CMS\Core\FormProtection\FormProtectionFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\PathUtility;
 use TYPO3\CMS\Fluid\View\StandaloneView;
 use TYPO3\CMS\Install\Service\EnableFileService;
 
index 26da1aa..db27c56 100644 (file)
@@ -22,7 +22,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  */
 class ExtensionManagerTables extends AbstractUpdate
 {
-
     /**
      * @var string
      */
index df30b20..2d30b9f 100644 (file)
@@ -15,6 +15,7 @@ namespace TYPO3\CMS\Install\Tests\Unit\FolderStructure;
  */
 use TYPO3\CMS\Install\FolderStructure\Exception;
 use TYPO3\CMS\Install\FolderStructure\Exception\InvalidArgumentException;
+
 /**
  * Test case
  */
index 92f6f80..018be2e 100644 (file)
@@ -15,6 +15,7 @@ namespace TYPO3\CMS\Install\Tests\Unit\FolderStructure;
  */
 use TYPO3\CMS\Install\FolderStructure\Exception;
 use TYPO3\CMS\Install\FolderStructure\Exception\InvalidArgumentException;
+
 /**
  * Test case
  */
index abfba7b..204b07a 100644 (file)
@@ -14,6 +14,7 @@ namespace TYPO3\CMS\Install\Tests\Unit\FolderStructure;
  * The TYPO3 project - inspiring people to share!
  */
 use TYPO3\CMS\Install\FolderStructure\Exception\InvalidArgumentException;
+
 /**
  * Test case
  */
index 5413dbe..71bd306 100644 (file)
@@ -599,4 +599,4 @@ class SilentConfigurationUpgradeServiceTest extends \TYPO3\CMS\Core\Tests\UnitTe
 
         $silentConfigurationUpgradeServiceInstance->_call('setImageMagickDetailSettings');
     }
-}
\ No newline at end of file
+}
index 4898dc2..bd29a01 100644 (file)
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Install\Tests\Unit\Status;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Install\Status\StatusUtility;
 use TYPO3\CMS\Install\Status\Exception;
+use TYPO3\CMS\Install\Status\StatusUtility;
 
 /**
  * Test case
index fc966c4..f796caf 100644 (file)
@@ -21,7 +21,6 @@ namespace TYPO3\CMS\Scheduler\Task;
  */
 abstract class AbstractTask
 {
-
     const TYPE_SINGLE = 1;
     const TYPE_RECURRING = 2;
 
index d367c95..36a6765 100644 (file)
@@ -195,7 +195,7 @@ class NormalizeCommandTest extends UnitTestCase
      * @dataProvider normalizeMonthAndWeekdayFieldInvalidDataProvider
      * @param string $expression Cron command partial expression for month and weekday fields (invalid)
      * @param bool $isMonthField Flag to designate month field or not
-     * @param integer $expectedExceptionCode Expected exception code from provider
+     * @param int $expectedExceptionCode Expected exception code from provider
      */
     public function normalizeMonthAndWeekdayFieldThrowsExceptionForInvalidExpression(
         $expression,
@@ -372,7 +372,7 @@ class NormalizeCommandTest extends UnitTestCase
      * @test
      * @dataProvider invalidRangeDataProvider
      * @param string $range Cron command range expression (invalid)
-     * @param integer $expectedExceptionCode Expected exception code from provider
+     * @param int $expectedExceptionCode Expected exception code from provider
      */
     public function convertRangeToListOfValuesThrowsExceptionForInvalidRanges($range, $expectedExceptionCode)
     {
@@ -428,7 +428,7 @@ class NormalizeCommandTest extends UnitTestCase
      * @test
      * @dataProvider invalidStepsDataProvider
      * @param string $stepExpression Cron command step expression (invalid)
-     * @param integer $expectedExceptionCode Expected exception code
+     * @param int $expectedExceptionCode Expected exception code
      */
     public function reduceListOfValuesByStepValueThrowsExceptionForInvalidStepExpressions(
         $stepExpression,
@@ -548,7 +548,7 @@ class NormalizeCommandTest extends UnitTestCase
      * @test
      * @dataProvider invalidMonthNamesDataProvider
      * @param string $invalidMonthName Month name (invalid)
-     * @param integer $expectedExceptionCode Expected exception code
+     * @param int $expectedExceptionCode Expected exception code
      */
     public function normalizeMonthThrowsExceptionForInvalidMonthRepresentation(
         $invalidMonthName,
index 0d6090b..2ab8920 100644 (file)
@@ -22,7 +22,6 @@ use TYPO3\CMS\Setup\Controller\SetupModuleController;
  */
 class SetupModuleControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 {
-
     /**
      * @test
      * @return void
index 204abfd..ff252eb 100644 (file)
@@ -837,7 +837,6 @@ class WorkspaceService implements SingletonInterface
             $joinStatement = '(A.t3ver_oid=B.uid AND A.t3ver_state<>' . $movePointer
                 . ' OR A.t3ver_oid=B.t3ver_move_id AND A.t3ver_state=' . $movePointer . ')';
 
-
             $pageIds = $this->getDatabaseConnection()->exec_SELECTgetRows(
                 'B.pid AS pageId',
                 $tableName . ' A,' . $tableName . ' B',