[TASK] Apply CGL compatibility (PSR-1 and PSR-2) 45/48545/2
authorWouter Wolters <typo3@wouterwolters.nl>
Fri, 10 Jun 2016 07:50:27 +0000 (09:50 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Fri, 10 Jun 2016 09:34:50 +0000 (11:34 +0200)
Resolves: #76449
Releases: 7.6
Change-Id: I8a58a83f75673d340370c2cd6546f3154c31d3d2
Reviewed-on: https://review.typo3.org/48545
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
28 files changed:
typo3/sysext/backend/Classes/Clipboard/Clipboard.php
typo3/sysext/backend/Classes/Controller/FormInlineAjaxController.php
typo3/sysext/backend/Classes/Form/Container/InlineRecordContainer.php
typo3/sysext/backend/Classes/Form/Container/SingleFieldContainer.php
typo3/sysext/backend/Classes/Form/FormDataProvider/TcaFlexProcess.php
typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeCommands.php
typo3/sysext/backend/Classes/Utility/BackendUtility.php
typo3/sysext/backend/Tests/Functional/Controller/Page/LocalizationControllerTest.php
typo3/sysext/backend/Tests/Unit/Controller/FormInlineAjaxControllerTest.php
typo3/sysext/backend/Tests/Unit/Form/Element/InputTextElementTest.php
typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php
typo3/sysext/belog/Classes/Controller/SystemInformationController.php
typo3/sysext/core/Classes/Resource/ResourceStorage.php
typo3/sysext/core/Configuration/DefaultConfiguration.php
typo3/sysext/core/Configuration/TCA/pages.php
typo3/sysext/core/Tests/Functional/DataHandling/FlexformIrre/ActionTestCase.php
typo3/sysext/core/Tests/Unit/Resource/Rendering/YouTubeRendererTest.php
typo3/sysext/extbase/Classes/Mvc/Web/ReferringRequest.php
typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/Blog.php
typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/Post.php
typo3/sysext/filelist/Classes/FileList.php
typo3/sysext/form/Classes/Domain/Validator/FileAllowedTypesValidator.php
typo3/sysext/form/Tests/Unit/Utility/TypoScriptToJsonConverterTest.php
typo3/sysext/lang/Classes/Command/LanguageCommandController.php
typo3/sysext/recordlist/Classes/Browser/FileBrowser.php
typo3/sysext/rtehtmlarea/Classes/Controller/SelectImageController.php
typo3/sysext/rtehtmlarea/Classes/ImageHandler/AddImageHandler.php
typo3/sysext/rtehtmlarea/Configuration/Backend/AjaxRoutes.php

index da285ad..75dd722 100644 (file)
@@ -716,7 +716,6 @@ class Clipboard
         return $message;
     }
 
-
     /**
      * Returns confirm JavaScript message
      *
index a7e698e..da93fbe 100644 (file)
@@ -874,7 +874,6 @@ class FormInlineAjaxController
     {
         list($flexFormPath, $foreignTableName) = $this->splitDomObjectId($domObjectId);
 
-
         $childConfig = $parentConfig['ds']['sheets'];
         $flexFormPath = explode(':', $flexFormPath);
         foreach ($flexFormPath as $flexFormNode) {
@@ -973,11 +972,9 @@ class FormInlineAjaxController
          */
 
         if (preg_match($pattern, $domObjectId, $match)) {
-
             return array($match['flexformPath'], $match['tableName']);
         }
 
         return [];
-
     }
 }
index 443975e..bffa131 100644 (file)
@@ -500,7 +500,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 = $languageService->sL(('LLL:EXT:lang/locallang_mod_web_list.xlf:unHide' . ($isPagesTable ? 'Page' : '')), true);
index ad315dc..fb4dcf0 100644 (file)
@@ -409,7 +409,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">
index 9812128..33a0e35 100644 (file)
@@ -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);
index f099eb4..8c93e1b 100755 (executable)
@@ -25,7 +25,6 @@ use TYPO3\CMS\Core\Database\RelationHandler;
 use TYPO3\CMS\Core\FormProtection\FormProtectionFactory;
 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;
index 98b4c9b..50b4127 100644 (file)
@@ -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
+}
index 0433ea8..4ca1a4c 100644 (file)
@@ -63,7 +63,6 @@ class FormInlineAjaxControllerTest extends UnitTestCase
         $this->assertTrue($mayUploadFile);
     }
 
-
     /**
      * @dataProvider splitDomObjectIdDataProviderForTableName
      * @param string $dataStructure
index f144095..eb19f7e 100644 (file)
@@ -48,7 +48,6 @@ class InputTextElementTest extends UnitTestCase
         parent::tearDown();
     }
 
-
     /**
      * Data provider for renderAppliesCorrectTimestampConversion
      *
index 8ca310b..b3a9b7f 100644 (file)
@@ -1064,7 +1064,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');
index 8372af2..77f5936 100644 (file)
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Belog\Controller;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Backend\Toolbar\Enumeration\InformationStatus;
 use TYPO3\CMS\Backend\Backend\ToolbarItems\SystemInformationToolbarItem;
+use TYPO3\CMS\Backend\Toolbar\Enumeration\InformationStatus;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Belog\Domain\Model\Constraint;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
index 30148fd..c2be560 100644 (file)
@@ -2908,7 +2908,8 @@ class ResourceStorage implements ResourceStorageInterface
                     $processingFolder = $processingFolder->createFolder($folderName);
                 }
             }
-        } catch (Exception\FolderDoesNotExistException $e) {}
+        } catch (Exception\FolderDoesNotExistException $e) {
+        }
 
         return $processingFolder;
     }
index 82ab032..6408d95 100644 (file)
@@ -1153,7 +1153,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 request. Have a look at <a href="http://pear.php.net/manual/en/package.http.http-request2.config.php>HTTP_Request2 Manual</a> for some background information on those settings.
         'adapter' => 'socket',        // String: Default adapter - either "socket" or "curl".
index b909ead..ab61596 100644 (file)
@@ -1059,4 +1059,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
+);
index f068760..870cd7f 100644 (file)
@@ -14,7 +14,6 @@ namespace TYPO3\CMS\Core\Tests\Functional\DataHandling\FlexformIrre;
  * The TYPO3 project - inspiring people to share!
  */
 
-
 class ActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\DataHandling\AbstractDataHandlerActionTestCase
 {
 
@@ -55,5 +54,4 @@ class ActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\DataHandling\Abstr
         // there should be one relation in the live WS and one in the draft WS pointing to the file field.
         $this->assertEquals(2, $this->getDatabaseConnection()->exec_SELECTcountRows('uid', 'sys_file_reference', 'uid_local = 20'));
     }
-
 }
index 78fe780..a9cd3fa 100644 (file)
@@ -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&amp;controls=2&amp;autoplay=1&amp;enablejsapi=1&amp;origin=test.server.org&amp;showinfo=0" allowfullscreen width="300" height="200"></iframe>',
             $this->subject->render($fileReferenceMock, '300m', '200')
index 085b67d..486c26a 100644 (file)
@@ -52,5 +52,4 @@ class ReferringRequest extends Request
                 break;
         }
     }
-
 }
index 0bfda1b..8a510c6 100644 (file)
@@ -443,7 +443,7 @@ class FileList extends AbstractRecordList
                             $elToConfirm[$key] = $clipBoardElement->getName();
                         }
                         if ($addPasteButton) {
-                            $cells[] = '<a class="btn btn-default t3js-modal-trigger"'.
+                            $cells[] = '<a class="btn btn-default t3js-modal-trigger"' .
                                 ' href="' . htmlspecialchars($this->clipObj->pasteUrl(
                                     '_FILE',
                                     $this->folderObject->getCombinedIdentifier()
@@ -956,7 +956,7 @@ class FileList extends AbstractRecordList
                     . ' data-severity="warning"'
                     . ' data-title="' . $this->getLanguageService()->getLL('clip_pasteInto', true) . '"'
                     . ' title="' . $this->getLanguageService()->getLL('clip_pasteInto', true) . '"'
-                    .'>'
+                    . '>'
                     . $this->iconFactory->getIcon('actions-document-paste-into', Icon::SIZE_SMALL)->render()
                     . '</a>';
             }
index 67ce42a..a271d91 100755 (executable)
@@ -78,4 +78,4 @@ class FileAllowedTypesValidator extends AbstractValidator
 
         return $message;
     }
-}
\ No newline at end of file
+}
index 257b1b5..105f53b 100644 (file)
@@ -16,8 +16,8 @@ namespace TYPO3\CMS\Form\Tests\Unit\Utility;
 
 use TYPO3\CMS\Core\Tests\AccessibleObjectInterface;
 use TYPO3\CMS\Core\Tests\UnitTestCase;
-use TYPO3\CMS\Form\Utility\TypoScriptToJsonConverter;
 use TYPO3\CMS\Form\Domain\Model\Json\FormJsonElement;
+use TYPO3\CMS\Form\Utility\TypoScriptToJsonConverter;
 
 /**
  * Test case for \TYPO3\CMS\Form\Utility\TypoScriptToJsonConverter
@@ -36,12 +36,12 @@ class TypoScriptToJsonConverterTest extends UnitTestCase
     public function getChildElementsByIntegerKeyCallsAddElement(array $typoScript, $methodCount)
     {
         /** @var FormJsonElement|\PHPUnit_Framework_MockObject_MockObject $mockSubject */
-        $parentElement = $this->getMock(FormJsonElement::class, ['addElement',]);
+        $parentElement = $this->getMock(FormJsonElement::class, ['addElement']);
         // check if method gets called exactly X times
         $parentElement->expects($this->exactly($methodCount))->method('addElement');
 
         /** @var TypoScriptToJsonConverter|\PHPUnit_Framework_MockObject_MockObject|AccessibleObjectInterface $subjectAccessible */
-        $accessibleSubject = $this->getAccessibleMock(TypoScriptToJsonConverter::class, ['dummy',]);
+        $accessibleSubject = $this->getAccessibleMock(TypoScriptToJsonConverter::class, ['dummy']);
         $accessibleSubject->_call('getChildElementsByIntegerKey', $parentElement, $typoScript);
     }
 
index 9c8c17c..bbb2819 100644 (file)
@@ -15,9 +15,9 @@ namespace TYPO3\CMS\Lang\Command;
  */
 
 use TYPO3\CMS\Core\Cache\CacheManager;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Package\PackageInterface;
 use TYPO3\CMS\Core\Package\PackageManager;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
  * Language command controller updates translation packages
index f825384..48568a5 100644 (file)
@@ -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">&nbsp;' . $pDim . '</td>
                                        </tr>';
             if ($pDim) {
index 7a825d9..fb6e15a 100644 (file)
@@ -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;
     }
 
index 2975c43..0aecd4b 100644 (file)
@@ -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">&nbsp;' . $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
      *