[BUGFIX] Fix nightly CGL check 53/56653/4
authorAnja Leichsenring <aleichsenring@ab-softlab.de>
Sat, 14 Apr 2018 10:50:50 +0000 (12:50 +0200)
committerBenni Mack <benni@typo3.org>
Sun, 15 Apr 2018 11:07:41 +0000 (13:07 +0200)
PHP-CS-Fixer introduced a notice about overridden config paths,
which causes the cgl check to fail.
See https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/2999

Resolves: #84719
Releases: 8.7
Change-Id: I542a7d91b485569195e3049922dd9823eeba0601
Reviewed-on: https://review.typo3.org/56653
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Frans Saris <franssaris@gmail.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
Build/bamboo/src/main/java/core/NightlySpec.java
typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php
typo3/sysext/backend/Classes/Form/InlineStackProcessor.php
typo3/sysext/core/Classes/DataHandling/DataHandler.php
typo3/sysext/core/Classes/DataHandling/Localization/DataMapProcessor.php
typo3/sysext/filelist/Classes/FileList.php
typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
typo3/sysext/frontend/Classes/DataProcessing/GalleryProcessor.php

index e4d44a1..bf47c22 100644 (file)
@@ -169,7 +169,7 @@ public class NightlySpec extends AbstractCoreSpec {
                     .inlineBody(
                         this.getScriptTaskBashInlineBody() +
                         this.getScriptTaskBashPhpNoXdebug() +
-                        "php_no_xdebug ./bin/php-cs-fixer fix -v --dry-run --config=Build/.php_cs typo3/\n" +
+                        "php_no_xdebug ./bin/php-cs-fixer fix -v --dry-run --path-mode intersection --config=Build/.php_cs typo3/\n" +
                         "exit $?\n"
                     )
             )
index 627e67e..910b947 100644 (file)
@@ -303,7 +303,7 @@ class ElementInformationController
                     true
                 );
 
-                // else check if we can create an Image preview
+            // else check if we can create an Image preview
             } elseif (GeneralUtility::inList($GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'], $fileExtension)) {
                 $preview['fileObject'] = $this->fileObject;
                 $preview['width'] = $width;
index babd40f..fd9be66 100644 (file)
@@ -289,7 +289,7 @@ class InlineStackProcessor
                     $parts[] = implode('][', $levelData['flexform']);
                 }
                 $name = '[' . implode('][', $parts) . ']';
-                // Use in object id attributes:
+            // Use in object id attributes:
             } else {
                 $name = implode('-', $parts);
 
index 41bec2c..f227450 100644 (file)
@@ -4011,7 +4011,7 @@ class DataHandler
                 } else {
                     if (!MathUtility::canBeInterpretedAsInteger($realDestPid)) {
                         $newId = $this->copyRecord($v['table'], $v['id'], -$v['id']);
-                        // If the destination page id is a NEW string, keep it on the same page
+                    // If the destination page id is a NEW string, keep it on the same page
                     } elseif ($this->BE_USER->workspace > 0 && BackendUtility::isTableWorkspaceEnabled($v['table'])) {
                         // A filled $workspaceOptions indicated that this call
                         // has it's origin in previous versionizeRecord() processing
@@ -4025,7 +4025,7 @@ class DataHandler
                                 (isset($workspaceOptions['label']) ? $workspaceOptions['label'] : 'Auto-created for WS #' . $this->BE_USER->workspace),
                                 (isset($workspaceOptions['delete']) ? $workspaceOptions['delete'] : false)
                             );
-                            // Otherwise just use plain copyRecord() to create placeholders etc.
+                        // Otherwise just use plain copyRecord() to create placeholders etc.
                         } else {
                             // If a record has been copied already during this request,
                             // prevent superfluous duplication and use the existing copy
@@ -7786,14 +7786,14 @@ class DataHandler
         // Thus, check whether strings are the same or whether integer values are empty ("0" or "").
         if (!$allowNull) {
             $result = (string)$submittedValue === (string)$storedValue || $storedType === 'int' && (int)$storedValue === (int)$submittedValue;
-            // Null values are allowed, but currently there's a real (not NULL) value.
+        // Null values are allowed, but currently there's a real (not NULL) value.
         // Thus, ensure no NULL value was submitted and fallback to the regular behaviour.
         } elseif ($storedValue !== null) {
             $result = (
                 $submittedValue !== null
                 && $this->isSubmittedValueEqualToStoredValue($submittedValue, $storedValue, $storedType, false)
             );
-            // Null values are allowed, and currently there's a NULL value.
+        // Null values are allowed, and currently there's a NULL value.
         // Thus, check whether a NULL value was submitted.
         } else {
             $result = ($submittedValue === null);
index 256b093..6e6655d 100644 (file)
@@ -997,7 +997,7 @@ class DataMapProcessor
             // implicit: use origin pointer if table cannot be translated
             if (!$isTranslatable) {
                 $ancestorId = (int)$dependentElement[$fieldNames['origin']];
-                // only consider element if it reflects the desired language
+            // only consider element if it reflects the desired language
             } elseif ((int)$dependentElement[$fieldNames['language']] === $desiredLanguage) {
                 $ancestorId = $this->resolveAncestorId($fieldNames, $dependentElement);
             } else {
index ebde46b..983cf84 100644 (file)
@@ -737,7 +737,7 @@ class FileList extends AbstractRecordList
                             $theData[$field] .= '<span class="label label-danger label-space-left">'
                                 . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.file_missing'))
                                 . '</span>';
-                            // Thumbnails?
+                        // Thumbnails?
                         } elseif ($this->thumbs && ($this->isImage($ext) || $this->isMediaFile($ext))) {
                             $processedFile = $fileObject->process(ProcessedFile::CONTEXT_IMAGEPREVIEW, []);
                             if ($processedFile) {
index cc19fbb..271b177 100644 (file)
@@ -3010,7 +3010,7 @@ class TypoScriptFrontendController
                 // Actually $cachedRow contains content that we could show instead of rendering. Maybe we should do that to gain more performance but then we should set all the stuff done in $this->getFromCache()... For now we stick to this...
                 $this->set_no_cache('Another process wrote into the cache since the beginning of the render process', true);
 
-                // Since the new Locking API this should never be the case
+            // Since the new Locking API this should never be the case
             } else {
                 $this->tempContent = true;
                 // This flag shows that temporary content is put in the cache
index 6ad4c9e..ab96180 100644 (file)
@@ -422,7 +422,7 @@ class GalleryProcessor implements DataProcessorInterface
             // Recalculate gallery width
             $this->galleryData['width'] = floor($maximumRowWidth / $mediaScalingCorrection);
 
-            // User entered a predefined width
+        // User entered a predefined width
         } elseif ($this->equalMediaWidth) {
             $mediaScalingCorrection = 1;
 
@@ -446,7 +446,7 @@ class GalleryProcessor implements DataProcessorInterface
             // Recalculate gallery width
             $this->galleryData['width'] = floor($totalRowWidth / $mediaScalingCorrection);
 
-            // Automatic setting of width and height
+        // Automatic setting of width and height
         } else {
             $maxMediaWidth = (int)($galleryWidthMinusBorderAndSpacing / $this->galleryData['count']['columns']);
             foreach ($this->fileObjects as $key => $fileObject) {