[Coding Style] Enable rule PSR12.ControlStructures.ControlStructureSp…

…acing.LineIndent (#21818) * [Coding Style] Enable rule PSR12.ControlStructures.ControlStructureSpacing.LineIndent * Apply CS * add new CS commits to ignore list
matomo-org · Jan 17, 2024 · 8878b7a · 8878b7a
1 parent d7801a7
commit 8878b7a
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 18 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -51,3 +51,29 @@ b9c6430c0569308350c3b33231646016d19924ea
 6fa0f5bb8bd0cb06c44db97e226612af9f844a81
 # [Coding Style] Enable rule Generic.Formatting.DisallowMultipleStatements.SameLine (#21700)
 942300387c974a8313b2bd5ecdb486957cca02c4
+# [Coding Style] Enable rule PSR2.ControlStructures.SwitchDeclaration.BodyOnNextLineCASE (#21702)
+f5719461b8342b2fcefe148c8c7174cdc72a89a7
+# [Coding Style] Enable rule Generic.Functions.FunctionCallArgumentSpacing.TooMuchSpaceAfterComma (#21707)
+01c30b930db2e8f96b0c146c21f895832e26fab0
+# [Coding Style] Enable rules Generic.Functions.FunctionCallArgumentSpacing.* (#21710)
+22162916d36389c7c7f3380ab3467890a0c2ef6e
+# [Coding Style] Enable rule Squiz.Functions.MultiLineFunctionDeclaration.ContentAfterBrace (#21716)
+4bf4190287d599d4ae6a67ba4bec1366d5cc541c
+# Enable rule Squiz.Functions.MultiLineFunctionDeclaration.SpaceBeforeBrace (#21717)
+2cb62b61716129dca0b5d9fa2f8a5b3ac1eebac4
+# [Coding Style] Enable rule PSR2.Classes.ClassDeclaration.SpaceAfterKeyword (#21720)
+d6742943fe234d9f80727ae49ffebfb1539a3e67
+# [Coding Style] Enable rules PSR2.Classes.ClassDeclaration.* (#21727)
+8bfe2c7465a25081d8e5a23fcfa9b2f888272d41
+# [Coding Style] Enable rule PSR12.Keywords.ShortFormTypeKeywords.LongFound (#21728)
+04f8ed7c3406afbb155ba3af765169e6579eb3e4
+# [Coding Style] Enable rule PSR2.ControlStructures.SwitchDeclaration.WrongOpenercase (#21731)
+8f6e92f4b5c0e813fb09f2bae2fb91f7ade024d1
+# [Coding Style] Enable rule PSR12.ControlStructures.BooleanOperatorPlacement.FoundMixed (#21730)
+2e3c5156818f5c3b986243870d02ff99c3319f2f
+# [Coding Style] Enable rule Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose (#21742)
+16f8db6d5c6e5cf1e79344877749077ead1361bf
+# [Coding Style] Enable rule PSR2.Methods.FunctionClosingBrace.SpacingBeforeClose (#21747)
+d209158e6ee34dc4b7c50df98c078954a750979f
+# [Coding Style] Enable rule Squiz.Functions.FunctionDeclarationArgumentSpacing.NoSpaceBeforeArg (#21754)
+7ccae042b39c80b26243f18f93b1c8042de178ca
diff --git a/core/ArchiveProcessor/Loader.php b/core/ArchiveProcessor/Loader.php
@@ -125,7 +125,7 @@ private function prepareArchiveImpl($pluginName)
         // invalidate existing archives before we start archiving in case data was tracked in the past. if the archive is
         // made invalid, we will correctly re-archive below.
         if ($this->invalidateBeforeArchiving
-          && Rules::isBrowserTriggerEnabled()
+            && Rules::isBrowserTriggerEnabled()
         ) {
             $this->invalidatedReportsIfNeeded();
         }

diff --git a/core/ArchiveProcessor/Rules.php b/core/ArchiveProcessor/Rules.php
@@ -56,7 +56,7 @@ class Rules
     public static function getDoneStringFlagFor(array $idSites, $segment, $periodLabel, $plugin)
     {
         if (!empty($plugin)
-          && !self::shouldProcessReportsAllPlugins($idSites, $segment, $periodLabel)
+            && !self::shouldProcessReportsAllPlugins($idSites, $segment, $periodLabel)
         ) {
             return self::getDoneFlagArchiveContainsOnePlugin($segment, $plugin);
         }
@@ -143,7 +143,7 @@ public static function getMinTimeProcessedForInProgressArchive(
         $isArchivingDisabled = Rules::isArchivingDisabledFor($idSites, $segment, $period->getLabel());
         if ($isArchivingDisabled) {
             if ($period->getNumberOfSubperiods() == 0
-              && $dateStart->getTimestamp() <= $now
+                && $dateStart->getTimestamp() <= $now
             ) {
                 // Today: accept any recent enough archive
                 $minimumArchiveTime = false;
@@ -216,7 +216,7 @@ public static function isArchivingEnabledFor(array $idSites, Segment $segment, $
 
         if ($periodLabel === 'range') {
             if (isset($generalConfig['archiving_range_force_on_browser_request'])
-              && $generalConfig['archiving_range_force_on_browser_request'] == false
+                && $generalConfig['archiving_range_force_on_browser_request'] == false
             ) {
                 Log::debug("Not forcing archiving for range period.");
                 return $isArchivingEnabled;
@@ -231,8 +231,8 @@ public static function isArchivingEnabledFor(array $idSites, Segment $segment, $
         }
 
         if (!$isArchivingEnabled
-          && (!self::isBrowserArchivingAvailableForSegments() || self::isSegmentPreProcessed($idSites, $segment))
-          && !SettingsServer::isArchivePhpTriggered() // Only applies when we are not running core:archive command
+            && (!self::isBrowserArchivingAvailableForSegments() || self::isSegmentPreProcessed($idSites, $segment))
+            && !SettingsServer::isArchivePhpTriggered() // Only applies when we are not running core:archive command
         ) {
             Log::debug("Archiving is disabled because of config setting browser_archiving_disabled_enforce=1 or because the segment is selected to be pre-processed.");
             return false;

diff --git a/core/DataTable/Row.php b/core/DataTable/Row.php
@@ -761,7 +761,7 @@ public static function isEqual(Row $row1, Row $row2)
         // or both have a value
         if (!(is_null($row1->getIdSubDataTable())
             && is_null($row2->getIdSubDataTable())
-        )
+            )
         ) {
             $subtable1 = $row1->getSubtable();
             $subtable2 = $row2->getSubtable();

diff --git a/core/Nonce.php b/core/Nonce.php
@@ -137,7 +137,7 @@ public static function verifyNonceWithErrorMessage($id, $cnonce, $allowedReferre
         // validate origin
         $origin = self::getOrigin();
         if (!empty($origin) &&
-          ($origin == 'null' ||
+            ($origin == 'null' ||
             !in_array($origin, self::getAcceptableOrigins()))
         ) {
             return Piwik::translate('Login_InvalidNonceOrigin') . $additionalErrors;

diff --git a/core/Tracker/GoalManager.php b/core/Tracker/GoalManager.php
@@ -170,10 +170,10 @@ public function detectGoalMatch($goal, Action $action, VisitProperties $visitor,
 
         // if the attribute to match is not the type of the current action
         if ((($attribute == 'url' || $attribute == 'title') && $actionType != Action::TYPE_PAGE_URL)
-          || ($attribute == 'file' && $actionType != Action::TYPE_DOWNLOAD)
-          || ($attribute == 'external_website' && $actionType != Action::TYPE_OUTLINK)
-          || ($attribute == 'manually')
-          || self::isEventMatchingGoal($goal) && $actionType != Action::TYPE_EVENT
+            || ($attribute == 'file' && $actionType != Action::TYPE_DOWNLOAD)
+            || ($attribute == 'external_website' && $actionType != Action::TYPE_OUTLINK)
+            || ($attribute == 'manually')
+            || self::isEventMatchingGoal($goal) && $actionType != Action::TYPE_EVENT
         ) {
             return null;
         }

diff --git a/phpcs.xml b/phpcs.xml
@@ -34,7 +34,6 @@
         <exclude name="PSR12.ControlStructures.ControlStructureSpacing.CloseParenthesisIndent" />
         <exclude name="PSR12.ControlStructures.ControlStructureSpacing.CloseParenthesisLine" />
         <exclude name="PSR12.ControlStructures.ControlStructureSpacing.FirstExpressionLine" />
-        <exclude name="PSR12.ControlStructures.ControlStructureSpacing.LineIndent" />
         <exclude name="PSR12.ControlStructures.ControlStructureSpacing.SpaceBeforeCloseBrace" />
         <exclude name="PSR12.ControlStructures.ControlStructureSpacing.SpacingAfterOpenBrace" />
         <exclude name="PSR12.Files.FileHeader" />

diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
@@ -117,7 +117,7 @@ public function uploadPlugin()
         if (!$this->passwordVerify->isPasswordCorrect(
             Piwik::getCurrentUserLogin(),
             \Piwik\Request::fromRequest()->getStringParameter('confirmPassword')
-        )) {
+            )) {
             throw new \Exception($this->translator->translate('Login_LoginPasswordNotCorrect'));
         }
 

diff --git a/plugins/CustomDimensions/Tracker/CustomDimensionsRequestProcessor.php b/plugins/CustomDimensions/Tracker/CustomDimensionsRequestProcessor.php
@@ -147,8 +147,8 @@ private function getCustomDimensionsInScope($scope, Request $request)
             if (is_array($extractions)) {
                 foreach ($extractions as $extraction) {
                     if (!array_key_exists('dimension', $extraction)
-                     || !array_key_exists('pattern', $extraction)
-                     || empty($extraction['pattern'])) {
+                        || !array_key_exists('pattern', $extraction)
+                        || empty($extraction['pattern'])) {
                         continue;
                     }
 

diff --git a/plugins/UsersManager/UserAccessFilter.php b/plugins/UsersManager/UserAccessFilter.php
@@ -121,7 +121,7 @@ public function filterUsers($users)
     public function filterUser($user)
     {
         if ($this->access->hasSuperUserAccess()
-          || (!empty($user['login']) && $this->isNonSuperUserAllowedToSeeThisLogin($user['login']))
+            || (!empty($user['login']) && $this->isNonSuperUserAllowedToSeeThisLogin($user['login']))
         ) {
             return $user;
         }

diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php
@@ -145,7 +145,7 @@ function prepareTestDatabaseConfig(Config $config)
 function checkPiwikSetupForTests()
 {
     if (empty($_SERVER['REQUEST_URI'])
-      || $_SERVER['REQUEST_URI'] == '@REQUEST_URI@'
+        || $_SERVER['REQUEST_URI'] == '@REQUEST_URI@'
     ) {
         echo "WARNING: for tests to pass, you must first:
 1) Install webserver on localhost, eg. apache