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

…cement.FoundMixed (#21730) * Enable rule PSR12.ControlStructures.BooleanOperatorPlacement.FoundMixed * autoapply cs
matomo-org · Dec 21, 2023 · 2e3c515 · 2e3c515
1 parent 8f6e92f
commit 2e3c515
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 20 deletions.
diff --git a/core/CronArchive.php b/core/CronArchive.php
@@ -1406,13 +1406,13 @@ private function hasReachedMaxConcurrentArchivers()
             foreach ($processes as $process) {
                 if (strpos($process, ' core:archive') !== false &&
                     strpos($process, 'console ') !== false &&
-                    (!$instanceId
-                        || strpos($process, '--matomo-domain=' . $instanceId) !== false
-                        || strpos($process, '--matomo-domain="' . $instanceId . '"') !== false
-                        || strpos($process, '--matomo-domain=\'' . $instanceId . "'") !== false
-                        || strpos($process, '--piwik-domain=' . $instanceId) !== false
-                        || strpos($process, '--piwik-domain="' . $instanceId . '"') !== false
-                        || strpos($process, '--piwik-domain=\'' . $instanceId . "'") !== false)) {
+                    (!$instanceId ||
+                        strpos($process, '--matomo-domain=' . $instanceId) !== false ||
+                        strpos($process, '--matomo-domain="' . $instanceId . '"') !== false ||
+                        strpos($process, '--matomo-domain=\'' . $instanceId . "'") !== false ||
+                        strpos($process, '--piwik-domain=' . $instanceId) !== false ||
+                        strpos($process, '--piwik-domain="' . $instanceId . '"') !== false ||
+                        strpos($process, '--piwik-domain=\'' . $instanceId . "'") !== false)) {
                     $numRunning++;
                 }
             }

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

diff --git a/core/Period/Range.php b/core/Period/Range.php
@@ -379,9 +379,9 @@ protected function processOptimalSubperiods($startDate, $endDate)
                     $endOfPeriod = $endOfMonth;
                 } //   If end of this week is later than end date, we use days
                 elseif ($this->isEndOfWeekLaterThanEndDate($endDate, $endOfWeek) &&
-                    ($endOfWeek->isEarlier($this->today)
-                        || $startOfWeek->toString() != $startDate->toString()
-                        || $endDate->isEarlier($this->today))
+                    ($endOfWeek->isEarlier($this->today) ||
+                        $startOfWeek->toString() != $startDate->toString() ||
+                        $endDate->isEarlier($this->today))
                 ) {
                     $this->fillArraySubPeriods($startDate, $endDate, 'day');
                     break 1;

diff --git a/core/Plugin/Visualization.php b/core/Plugin/Visualization.php
@@ -727,8 +727,8 @@ protected function getClientSideParametersToSet()
 
         if ($this->dataTable &&
             // Set doesn't have the method
-            !($this->dataTable instanceof DataTable\Map)
-            && empty($javascriptVariablesToSet['totalRows'])
+            !($this->dataTable instanceof DataTable\Map) &&
+            empty($javascriptVariablesToSet['totalRows'])
         ) {
             $javascriptVariablesToSet['totalRows'] =
                 $this->dataTable->getMetadata(DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME) ?: $this->dataTable->getRowsCount();

diff --git a/core/ReportRenderer/Pdf.php b/core/ReportRenderer/Pdf.php
@@ -256,9 +256,9 @@ private function paintReportHeader()
         $rowCount = $reportHasData ? $this->report->getRowsCount() + self::TABLE_HEADER_ROW_COUNT : self::NO_DATA_ROW_COUNT;
 
         // Only a page break before if the current report has some data
-        if ($reportHasData &&
+        if ($reportHasData
             // and
-            (
+            && (
                 // it is the first report
                 $this->currentPage == 0
                 // or, it is a graph-only report and it is the first of a series of self::MAX_GRAPH_REPORTS

diff --git a/core/Updates/4.0.0-b1.php b/core/Updates/4.0.0-b1.php
@@ -269,9 +269,9 @@ public static function ensureCorePluginsThatWereMovedToMarketplaceCanBeUpdated()
                 $pluginDir = Manager::getPluginDirectory($plugin);
 
                 if (is_dir($pluginDir) &&
-                    file_exists($pluginDir . '/' . $plugin . '.php')
-                    && !file_exists($pluginDir . '/plugin.json')
-                    && is_writable($pluginDir)) {
+                    file_exists($pluginDir . '/' . $plugin . '.php') &&
+                    !file_exists($pluginDir . '/plugin.json') &&
+                    is_writable($pluginDir)) {
                     file_put_contents($pluginDir . '/plugin.json', '{
   "name": "' . $plugin . '",
   "description": "' . $plugin . '",

diff --git a/phpcs.xml b/phpcs.xml
@@ -31,7 +31,6 @@
         <exclude name="Generic.Files.LineLength" />
         <exclude name="Generic.PHP.LowerCaseConstant.Found" />
         <exclude name="Generic.PHP.LowerCaseKeyword.Found" />
-        <exclude name="PSR12.ControlStructures.BooleanOperatorPlacement.FoundMixed" />
         <exclude name="PSR12.ControlStructures.ControlStructureSpacing.CloseParenthesisIndent" />
         <exclude name="PSR12.ControlStructures.ControlStructureSpacing.CloseParenthesisLine" />
         <exclude name="PSR12.ControlStructures.ControlStructureSpacing.FirstExpressionLine" />