[BUGFIX] Fix CGL violations "SemicolonSpacingIncorrect"
authorRoland Waldner <most.wanted@gmx.at>
Thu, 17 May 2012 18:48:09 +0000 (20:48 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Thu, 17 May 2012 21:32:08 +0000 (23:32 +0200)
Change-Id: Id5bf3756e215b50eb9d789648b2bca57bb8bb712
Resolves: #37264
Releases: 6.0
Reviewed-on: http://review.typo3.org/11277
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
22 files changed:
t3lib/class.t3lib_cs.php
t3lib/class.t3lib_db.php
t3lib/class.t3lib_div.php
t3lib/class.t3lib_stdgraphic.php
t3lib/class.t3lib_tceforms.php
t3lib/class.t3lib_tcemain.php
t3lib/search/class.t3lib_search_livesearch.php
t3lib/tree/tca/class.t3lib_tree_tca_databasetreedataprovider.php
typo3/sysext/about/Classes/Controller/AboutController.php
typo3/sysext/aboutmodules/Classes/Controller/ModulesController.php
typo3/sysext/cms/tslib/class.tslib_content.php
typo3/sysext/cms/tslib/content/class.tslib_content_flowplayer.php
typo3/sysext/cms/tslib/content/class.tslib_content_shockwaveflashobject.php
typo3/sysext/cms/tslib/media/scripts/plaintextLib.inc
typo3/sysext/lowlevel/class.tx_lowlevel_cleaner_core.php
typo3/sysext/lowlevel/clmods/class.lost_files.php
typo3/sysext/rtehtmlarea/extensions/Acronym/class.tx_rtehtmlarea_acronym.php
typo3/sysext/rtehtmlarea/hooks/install/class.tx_rtehtmlarea_deprecatedrteproperties.php
typo3/sysext/statictemplates/media/scripts/plaintextLib.inc
typo3/sysext/sys_action/task/class.tx_sysaction_task.php
typo3/sysext/viewpage/Classes/Controller/ViewController.php
typo3/template.php

index 7b70c25..c86b408 100644 (file)
@@ -1923,7 +1923,6 @@ class t3lib_cs {
                if (ord($str{$i}) & 0x80) {
                        for (; $i > 0 && !(ord($str{$i}) & 0x40); $i--) {
                                // find the first byte
-                               ;
                        }
                        if ($i <= 0) {
                                return '';
index de2f9b6..a4eb418 100644 (file)
@@ -288,7 +288,6 @@ class t3lib_DB {
                                }
                        } else {
                                while ($output[] = $this->sql_fetch_assoc($res)) {
-                                       ;
                                }
                                array_pop($output);
                        }
index f8525fe..497e745 100644 (file)
@@ -5360,7 +5360,6 @@ final class t3lib_div {
         */
        public static function cleanOutputBuffers() {
                while (ob_end_clean()) {
-                       ;
                }
                header('Content-Encoding: None', TRUE);
        }
@@ -5375,7 +5374,6 @@ final class t3lib_div {
                $obContent = '';
 
                while ($obContent .= ob_get_clean()) {
-                       ;
                }
 
                        // if previously a "Content-Encoding: whatever" has been set, we have to unset it
index 24d4b04..468cfdf 100644 (file)
@@ -2738,7 +2738,6 @@ class t3lib_stdGraphic {
                                                $quality = t3lib_utility_Math::forceIntegerInRange($this->setup['quality'], 10, 100);
                                        }
                                        if ($this->ImageWrite($this->im, $file, $quality)) {
-                                               ;
                                        }
                                break;
                        }
index a8945f8..bc3e9c9 100644 (file)
@@ -1700,7 +1700,7 @@ class t3lib_TCEforms {
                                if (!strcmp($p[1], '--div--')) {
                                        $selIcon = '';
                                        if (isset($p[2]) && $p[2] != 'empty-emtpy') {
-                                               $selIcon = $this->getIconHtml($p[2]) ;
+                                               $selIcon = $this->getIconHtml($p[2]);
                                        }
                                        $tRows[] = '
                                                <tr class="c-header">
index 7fd3764..763ce0a 100644 (file)
@@ -1071,7 +1071,6 @@ class t3lib_TCEmain {
                                $this->log($table, $id, 5, 0, 1, "You cannot change the 'doktype' of page '%s' to the desired value.", 1, array($propArr['header']), $propArr['event_pid']);
                                return $res;
                        }
-                       ;
                        if ($status == 'update') {
                                        // This checks 1) if we should check for disallowed tables and 2) if there are records from disallowed tables on the current page
                                $onlyAllowedTables = (isset($GLOBALS['PAGES_TYPES'][$value]['onlyAllowedTables'])
@@ -6210,7 +6209,6 @@ class t3lib_TCEmain {
         */
        function getTableEntries($table, $TSconfig) {
                $tA = is_array($TSconfig['table.'][$table . '.']) ? $TSconfig['table.'][$table . '.'] : array();
-               ;
                $dA = is_array($TSconfig['default.']) ? $TSconfig['default.'] : array();
                return t3lib_div::array_merge_recursive_overrule($dA, $tA);
        }
index 1182e75..c74cd33 100644 (file)
@@ -313,7 +313,6 @@ class t3lib_search_livesearch {
                }
 
                return htmlspecialchars(t3lib_div::fixed_lgd_cs($title, $titleLength));
-               ;
        }
 
        /**
index 7786904..5255fbc 100644 (file)
@@ -335,7 +335,6 @@ class t3lib_tree_Tca_DatabaseTreeDataProvider extends t3lib_tree_Tca_AbstractTca
                        $storage = t3lib_div::makeInstance('t3lib_tree_NodeCollection');
                        foreach ($children as $child) {
                                $node = t3lib_div::makeInstance('t3lib_tree_Node');
-                               ;
                                $node->setId($child);
                                if ($level <= $this->levelMaximum) {
                                        $children = $this->getChildrenOf($node, $level + 1);
index 94f6559..6613787 100644 (file)
@@ -60,8 +60,7 @@ class Tx_About_Controller_AboutController extends Tx_Extbase_MVC_Controller_Acti
                        ->assign('TYPO3CopyrightYear', TYPO3_copyright_year)
                        ->assign('TYPO3UrlDonate', TYPO3_URL_DONATE)
                        ->assign('loadedExtensions', $extensions)
-                       ->assign('customContents', $this->getCustomContent())
-               ;
+                       ->assign('customContents', $this->getCustomContent());
        }
 
        /**
index ee1e93a..ab8aa8a 100644 (file)
@@ -47,8 +47,7 @@ class Tx_Aboutmodules_Controller_ModulesController  extends Tx_Extbase_MVC_Contr
                        ->assign('TYPO3Version', TYPO3_version)
                        ->assign('copyRightNotice', t3lib_BEfunc::TYPO3_copyRightNotice())
                        ->assign('warningMessages', t3lib_BEfunc::displayWarningMessages())
-                       ->assign('modules', $this->getModulesData())
-               ;
+                       ->assign('modules', $this->getModulesData());
        }
 
        /**
index d29c215..c656849 100644 (file)
@@ -1872,19 +1872,15 @@ class tslib_cObj {
                                if (is_callable(array($hookObject, 'stdWrapPreProcess'))) {
                                        $conf['stdWrapPreProcess'] = 1;
                                }
-                               ;
                                if (is_callable(array($hookObject, 'stdWrapOverride'))) {
                                        $conf['stdWrapOverride'] = 1;
                                }
-                               ;
                                if (is_callable(array($hookObject, 'stdWrapProcess'))) {
                                        $conf['stdWrapProcess'] = 1;
                                }
-                               ;
                                if (is_callable(array($hookObject, 'stdWrapPostProcess'))) {
                                        $conf['stdWrapPostProcess'] = 1;
                                }
-                               ;
                        }
                }
 
index be28cfb..0093965 100644 (file)
@@ -211,7 +211,6 @@ class tslib_content_FlowPlayer extends tslib_content_Abstract {
                if ($GLOBALS['TSFE']->absRefPrefix) {
                        $prefix = $GLOBALS['TSFE']->absRefPrefix;
                }
-               ;
                        // Initialize content
                $replaceElementIdString = uniqid('mmswf');
                $GLOBALS['TSFE']->register['MMSWFID'] = $replaceElementIdString;
index 0d083e9..713d530 100644 (file)
@@ -48,7 +48,6 @@ class tslib_content_ShockwaveFlashObject extends tslib_content_Abstract {
                if ($GLOBALS['TSFE']->absRefPrefix) {
                        $prefix = $GLOBALS['TSFE']->absRefPrefix;
                }
-               ;
 
                $type = isset($conf['type.'])
                        ? $this->cObj->stdWrap($conf['type'], $conf['type.'])
index 02cb686..014aa69 100644 (file)
@@ -393,7 +393,7 @@ class user_plaintext {
        function breakTable($str)       {
                $cParts = explode(chr(10),$str);
                $lines=array();
-               $cols = intval($this->conf['cols']) ? intval($this->conf['cols']) : 0 ;
+               $cols = intval($this->conf['cols']) ? intval($this->conf['cols']) : 0;
                $c=0;
                foreach ($cParts as $substrs) {
                        $c++;
index 15c43f9..58ee9b6 100644 (file)
@@ -412,8 +412,7 @@ class tx_lowlevel_cleaner_core extends t3lib_cli {
                if ($echoLevel>0)
                        echo LF.$accumulatedPath.' ['.$rootID.']'.
                                ($pageRecord['deleted'] ? ' (DELETED)':'').
-                               ($this->recStats['versions_published']['pages'][$rootID] ? ' (PUBLISHED)':'')
-                               ;
+                               ($this->recStats['versions_published']['pages'][$rootID] ? ' (PUBLISHED)':'');
                if ($echoLevel>1 && $this->recStats['versions_lost_workspace']['pages'][$rootID])
                        echo LF.'       ERROR! This version belongs to non-existing workspace ('.$pageRecord['t3ver_wsid'].')!';
                if ($echoLevel>1 && $this->recStats['versions_inside_versioned_page']['pages'][$rootID])
index 345fb63..a8d9668 100644 (file)
@@ -129,7 +129,7 @@ Will report lost files.';
                        if ($include)   {
                                        // First, allow "index.html", ".htaccess" files since they are often used for good reasons
                                if (substr($value,-11) == '/index.html' || substr($value,-10) == '/.htaccess')  {
-                                       unset($fileArr[$key])   ;
+                                       unset($fileArr[$key]);
                                        $resultArray['ignoredFiles'][$shortKey] = $value;
                                } else {
                                                // Looking for a reference from a field which is NOT a soft reference (thus, only fields with a proper TCA/Flexform configuration)
@@ -145,7 +145,7 @@ Will report lost files.';
 
                                                // If found, unset entry:
                                        if (count($recs))               {
-                                               unset($fileArr[$key])   ;
+                                               unset($fileArr[$key]);
                                                $resultArray['managedFiles'][$shortKey] = $value;
                                                if (count($recs)>1)     {
                                                        $resultArray['warnings'][$shortKey] = 'Warning: File "'.$value.'" had '.count($recs).' references from group-fields, should have only one!';
@@ -153,11 +153,11 @@ Will report lost files.';
                                        } else {
                                                        // When here it means the file was not found. So we test if it has a RTEmagic-image name and if so, we allow it:
                                                if (preg_match('/^RTEmagic[P|C]_/',basename($value)))   {
-                                                       unset($fileArr[$key])   ;
+                                                       unset($fileArr[$key]);
                                                        $resultArray['RTEmagicFiles'][$shortKey] = $value;
                                                } else {
                                                                // We conclude that the file is lost...:
-                                                       unset($fileArr[$key])   ;
+                                                       unset($fileArr[$key]);
                                                        $resultArray['lostFiles'][$shortKey] = $value;
                                                }
                                        }
index 1ba6efd..14868e3 100644 (file)
@@ -131,7 +131,7 @@ class tx_rtehtmlarea_acronym extends tx_rtehtmlarea_api {
                        }
                        $webMounts = $GLOBALS['BE_USER']->returnWebmounts();
                        $perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(1);
-                       $recursive = isset($this->thisConfig['buttons.'][$button.'.']['recursive']) ? intval($this->thisConfig['buttons.'][$button.'.']['recursive']) : 0 ;
+                       $recursive = isset($this->thisConfig['buttons.'][$button.'.']['recursive']) ? intval($this->thisConfig['buttons.'][$button.'.']['recursive']) : 0;
                        if (trim($this->thisConfig['buttons.'][$button.'.']['pages'])) {
                                $pids = t3lib_div::trimExplode(',', $this->thisConfig['buttons.'][$button.'.']['pages'], 1);
                                foreach ($pids as $key => $val) {
index 613e21f..62bb0fc 100644 (file)
@@ -168,7 +168,7 @@ class tx_rtehtmlarea_deprecatedRteProperties extends Tx_Install_Updates_Base {
                                        $success = TRUE;
                                }
                        } else {
-                               $customMessages = '<p>No deprecated Page TSconfig properties were found on page records.</p>' . LF ;
+                               $customMessages = '<p>No deprecated Page TSconfig properties were found on page records.</p>' . LF;
                                $success = TRUE;
                        }
                        $customMessages .= '<p>Only page records were searched for deprecated properties. However, such properties can also be used in BE group and BE user records (prepended with page.). These are not searched nor updated by this wizard.</p>' . LF .
index e87f3fa..4303ef3 100644 (file)
@@ -398,7 +398,7 @@ class user_plaintext {
                $cParts = explode(chr(10),$str);
                reset($cParts);
                $lines=array();
-               $cols = intval($this->conf['cols']) ? intval($this->conf['cols']) : 0 ;
+               $cols = intval($this->conf['cols']) ? intval($this->conf['cols']) : 0;
                $c=0;
                while(list(,$substrs)=each($cParts))    {
                        $c++;
index db9b51f..b26d399 100644 (file)
@@ -329,7 +329,7 @@ class tx_sysaction_task implements tx_taskcenter_Task {
                                        $GLOBALS['LANG']->getLL('success'),
                                        t3lib_FlashMessage::OK
                                );
-                               $content .= $flashMessage->render() . '<br />' ;
+                               $content .= $flashMessage->render() . '<br />';
                        }
 
                }
index 6174a65..497fb94 100644 (file)
@@ -82,8 +82,7 @@ class Tx_Viewpage_Controller_ViewController extends Tx_Extbase_MVC_Controller_Ac
                        . '/index.php?id=' . $finalPageIdToShow
                        . $this->getTypeParameterIfSet($finalPageIdToShow)
                        . $mountPointMpParameter
-                       . $adminCommand
-               ;
+                       . $adminCommand;
 
                return $url;
        }
index 1a3dc25..f87718b 100644 (file)
@@ -811,7 +811,7 @@ class template {
                        $str .= ($this->divClass?'
 
 <!-- Wrapping DIV-section for whole page END -->
-</div>':'') . $this->endOfPageJsBlock ;
+</div>':'') . $this->endOfPageJsBlock;
                }