Apply coding style around FunctionCallSignature #5 (#21931)

matomo-org · Feb 15, 2024 · 2821cba · 2821cba
1 parent 3149b9b
commit 2821cba
Show file tree

Hide file tree

Showing 30 changed files with 210 additions and 91 deletions.
diff --git a/plugins/Dashboard/Model.php b/plugins/Dashboard/Model.php
@@ -33,8 +33,10 @@ public function __construct()
      */
     public function getLayoutForUser($login, $idDashboard)
     {
-        $query   = sprintf('SELECT layout FROM %s WHERE login = ? AND iddashboard = ?',
-                           $this->table);
+        $query   = sprintf(
+            'SELECT layout FROM %s WHERE login = ? AND iddashboard = ?',
+            $this->table
+        );
         $bind    = array($login, $idDashboard);
         $layouts = Db::fetchAll($query, $bind);
 
@@ -98,8 +100,10 @@ public function createNewDashboardForUser($login, $name, $layout)
     public function createOrUpdateDashboard($login, $idDashboard, $layout)
     {
         $bind   = array($login, $idDashboard, $layout, $layout);
-        $query  = sprintf('INSERT INTO %s (login, iddashboard, layout) VALUES (?,?,?) ON DUPLICATE KEY UPDATE layout=?',
-                          $this->table);
+        $query  = sprintf(
+            'INSERT INTO %s (login, iddashboard, layout) VALUES (?,?,?) ON DUPLICATE KEY UPDATE layout=?',
+            $this->table
+        );
         Db::query($query, $bind);
     }
 
@@ -125,8 +129,10 @@ private function getNextIdDashboard($login)
     public function updateLayoutForUser($login, $idDashboard, $layout)
     {
         $bind  = array($login, $idDashboard, $layout, $layout);
-        $query = sprintf('INSERT INTO %s (login, iddashboard, layout) VALUES (?,?,?) ON DUPLICATE KEY UPDATE layout=?',
-                         $this->table);
+        $query = sprintf(
+            'INSERT INTO %s (login, iddashboard, layout) VALUES (?,?,?) ON DUPLICATE KEY UPDATE layout=?',
+            $this->table
+        );
         Db::query($query, $bind);
     }
 

diff --git a/plugins/DevicesDetection/Columns/Os.php b/plugins/DevicesDetection/Columns/Os.php
@@ -54,8 +54,12 @@ public function configureSegments(SegmentsList $segmentsList, DimensionSegmentFa
             return $result;
         });
         $segment->setSuggestedValuesCallback(function ($idSite, $maxValuesToReturn, $table) {
-            return $this->sortStaticListByUsage(OperatingSystem::getAvailableOperatingSystems(), $table,
-                'operatingSystemCode', $maxValuesToReturn);
+            return $this->sortStaticListByUsage(
+                OperatingSystem::getAvailableOperatingSystems(),
+                $table,
+                'operatingSystemCode',
+                $maxValuesToReturn
+            );
         });
         $segmentsList->addSegment($dimensionSegmentFactory->createSegment($segment));
     }

diff --git a/plugins/DevicesDetection/Menu.php b/plugins/DevicesDetection/Menu.php
@@ -18,9 +18,11 @@ class Menu extends \Piwik\Plugin\Menu
     public function configureAdminMenu(MenuAdmin $menu)
     {
         if (Piwik::isUserHasSomeAdminAccess()) {
-            $menu->addDiagnosticItem('DevicesDetection_DeviceDetection',
-                                     $this->urlForAction('detection'),
-                                     $order = 40);
+            $menu->addDiagnosticItem(
+                'DevicesDetection_DeviceDetection',
+                $this->urlForAction('detection'),
+                $order = 40
+            );
         }
     }
 }
diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php
@@ -331,9 +331,9 @@ function _mapLegacyOsShortCodes($shortCode): string
         //'VMS' => '', // OpenVMS => ??
     ];
     return ($shortCode && array_key_exists(
-            $shortCode,
-            $legacyShortCodes
-        )) ? $legacyShortCodes[$shortCode] : (string)$shortCode;
+        $shortCode,
+        $legacyShortCodes
+    )) ? $legacyShortCodes[$shortCode] : (string)$shortCode;
 }
 
 /**

diff --git a/plugins/DevicesDetection/tests/Fixtures/MultiDeviceGoalConversions.php b/plugins/DevicesDetection/tests/Fixtures/MultiDeviceGoalConversions.php
@@ -41,8 +41,14 @@ private function setUpWebsitesAndGoals()
 
         if (!self::goalExists($idSite = 1, $idGoal = 1)) {
             API::getInstance()->addGoal(
-                $this->idSite, 'Goal 1 - Thank you', 'title', 'Thank you', 'contains', $caseSensitive = false,
-                $revenue = 10, $allowMultipleConversions = 1
+                $this->idSite,
+                'Goal 1 - Thank you',
+                'title',
+                'Thank you',
+                'contains',
+                $caseSensitive = false,
+                $revenue = 10,
+                $allowMultipleConversions = 1
             );
         }
     }

diff --git a/plugins/Diagnostics/Commands/ArchivingConfig.php b/plugins/Diagnostics/Commands/ArchivingConfig.php
@@ -21,8 +21,11 @@ class ArchivingConfig extends ConsoleCommand
     protected function configure()
     {
         $this->setName('diagnostics:archiving-config');
-        $this->addNoValueOption('json', null,
-            "If supplied, the command will return data in json format");
+        $this->addNoValueOption(
+            'json',
+            null,
+            "If supplied, the command will return data in json format"
+        );
         $this->setDescription('Show configuration settings that can affect archiving performance');
     }
 

diff --git a/plugins/Diagnostics/Commands/ArchivingInstanceStatistics.php b/plugins/Diagnostics/Commands/ArchivingInstanceStatistics.php
@@ -21,8 +21,11 @@ class ArchivingInstanceStatistics extends ConsoleCommand
     protected function configure()
     {
         $this->setName('diagnostics:archiving-instance-statistics');
-        $this->addNoValueOption('json', null,
-            "If supplied, the command will return data in json format");
+        $this->addNoValueOption(
+            'json',
+            null,
+            "If supplied, the command will return data in json format"
+        );
         $this->setDescription('Show data statistics which can affect archiving performance');
     }
 
@@ -59,14 +62,16 @@ public function getArchivingInstanceStatistics(): array
             [
                 Date::now()->setDay(1)->subMonth(1)->setTime('00:00:00')->toString('Y-m-d H:i:s'),
                 Date::now()->setDay(1)->subDay(1)->setTime('23:59:59')->toString('Y-m-d H:i:s')
-            ])
+            ]
+        )
         ];
         $stats[] = ['Last 12 Month Hits', (int) Db::fetchOne(
             "SELECT COUNT(*) FROM " . Common::prefixTable("log_link_visit_action") . " WHERE server_time >= ? AND server_time <= ?",
             [
                 Date::now()->setDay(1)->subMonth(12)->setTime('00:00:00')->toString('Y-m-d H:i:s'),
                 Date::now()->setDay(1)->subDay(1)->setTime('23:59:59')->toString('Y-m-d H:i:s')
-            ])
+            ]
+        )
         ];
         return $stats;
     }

diff --git a/plugins/Diagnostics/Commands/ArchivingMetrics.php b/plugins/Diagnostics/Commands/ArchivingMetrics.php
@@ -21,8 +21,11 @@ class ArchivingMetrics extends ConsoleCommand
     protected function configure()
     {
         $this->setName('diagnostics:archiving-metrics');
-        $this->addNoValueOption('json', null,
-            "If supplied, the command will return data in json format");
+        $this->addNoValueOption(
+            'json',
+            null,
+            "If supplied, the command will return data in json format"
+        );
         $this->setDescription('Show metrics describing the current archiving status');
     }
 

diff --git a/plugins/Diagnostics/Commands/ArchivingQueue.php b/plugins/Diagnostics/Commands/ArchivingQueue.php
@@ -19,8 +19,11 @@ class ArchivingQueue extends ConsoleCommand
     protected function configure()
     {
         $this->setName('diagnostics:archiving-queue');
-        $this->addNoValueOption('json', null,
-            "If supplied, the command will return table data in json format");
+        $this->addNoValueOption(
+            'json',
+            null,
+            "If supplied, the command will return table data in json format"
+        );
         $this->setDescription('Show the current state of the archive invalidations queue as a table');
     }
 

diff --git a/plugins/Diagnostics/Commands/ArchivingStatus.php b/plugins/Diagnostics/Commands/ArchivingStatus.php
@@ -22,10 +22,16 @@ class ArchivingStatus extends ConsoleCommand
     protected function configure()
     {
         $this->setName('diagnostics:archiving-status');
-        $this->addNoValueOption('with-stats', null,
-            "If supplied, the command will include instance statistics such as monthly hits and site count");
-        $this->addOptionalValueOption('email', null,
-            "If supplied, the command will email the output to the supplied email address");
+        $this->addNoValueOption(
+            'with-stats',
+            null,
+            "If supplied, the command will include instance statistics such as monthly hits and site count"
+        );
+        $this->addOptionalValueOption(
+            'email',
+            null,
+            "If supplied, the command will email the output to the supplied email address"
+        );
         $this->setDescription('');
     }
 

diff --git a/plugins/Diagnostics/Diagnostic/CronArchivingCheck.php b/plugins/Diagnostics/Diagnostic/CronArchivingCheck.php
@@ -75,8 +75,10 @@ public function execute()
             $comment .= $this->translator->translate('Installation_NotSupported')
                 . ' ' . $this->translator->translate('Goals_Optional')
                 . ' (' . $this->translator->translate('General_Reasons') . ': ' . $reasonText . ')'
-                . $this->translator->translate('General_LearnMore',
-                    [' <a target="_blank" href="' . Url::addCampaignParametersToMatomoLink('https://matomo.org/faq/troubleshooting/how-to-make-the-diagnostic-managing-processes-via-cli-to-display-ok/') . '">', '</a>']);
+                . $this->translator->translate(
+                    'General_LearnMore',
+                    [' <a target="_blank" href="' . Url::addCampaignParametersToMatomoLink('https://matomo.org/faq/troubleshooting/how-to-make-the-diagnostic-managing-processes-via-cli-to-display-ok/') . '">', '</a>']
+                );
             $status = DiagnosticResult::STATUS_INFORMATIONAL;
         }
 

diff --git a/plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php b/plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php
@@ -57,8 +57,10 @@ public function execute()
         $lastRunTime = (int)Option::get(CronArchive::OPTION_ARCHIVING_FINISHED_TS);
         if (empty($lastRunTime)) {
             $comment = $this->translator->translate('Diagnostics_CronArchivingHasNotRun')
-                . '<br/><br/>' . $this->translator->translate('Diagnostics_CronArchivingRunDetails',
-                    [$coreArchiveShort, $mailto, $commandToRerun, '<a href="' . Url::addCampaignParametersToMatomoLink('https://matomo.org/docs/setup-auto-archiving/') . '" target="_blank" rel="noreferrer noopener">', '</a>']);
+                . '<br/><br/>' . $this->translator->translate(
+                    'Diagnostics_CronArchivingRunDetails',
+                    [$coreArchiveShort, $mailto, $commandToRerun, '<a href="' . Url::addCampaignParametersToMatomoLink('https://matomo.org/docs/setup-auto-archiving/') . '" target="_blank" rel="noreferrer noopener">', '</a>']
+                );
             return [DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_ERROR, $comment)];
         }
 

diff --git a/plugins/Diagnostics/Diagnostic/DatabaseAbilitiesCheck.php b/plugins/Diagnostics/Diagnostic/DatabaseAbilitiesCheck.php
@@ -62,7 +62,8 @@ protected function checkUtf8mb4Charset()
 
         if (DbHelper::getDefaultCharset() === 'utf8mb4') {
             return new DiagnosticResultItem(
-                DiagnosticResult::STATUS_WARNING, 'UTF8mb4 charset<br/><br/>' .
+                DiagnosticResult::STATUS_WARNING,
+                'UTF8mb4 charset<br/><br/>' .
                 $this->translator->translate('Diagnostics_DatabaseUtf8mb4CharsetAvailableButNotUsed', '<code>' . PIWIK_INCLUDE_PATH . '/console core:convert-to-utf8mb4</code>') .
                 '<br/><br/>' .
                 $this->translator->translate('Diagnostics_DatabaseUtf8Requirement', ['�',
@@ -72,7 +73,8 @@ protected function checkUtf8mb4Charset()
         }
 
         return new DiagnosticResultItem(
-            DiagnosticResult::STATUS_WARNING, 'UTF8mb4 charset<br/><br/>' .
+            DiagnosticResult::STATUS_WARNING,
+            'UTF8mb4 charset<br/><br/>' .
             $this->translator->translate('Diagnostics_DatabaseUtf8mb4CharsetRecommended') .
             '<br/><br/>' .
             $this->translator->translate('Diagnostics_DatabaseUtf8Requirement', ['�',

diff --git a/plugins/Diagnostics/Diagnostic/DbMaxPacket.php b/plugins/Diagnostics/Diagnostic/DbMaxPacket.php
@@ -43,9 +43,13 @@ public function execute()
             $formatter = new Formatter\Html();
             $pretty = $formatter->getPrettySizeFromBytes($maxPacketBytes['Value'], 'M', $precision = 1);
             $configured = str_replace(array(' M', '&nbsp;M'), 'MB', $pretty);
-            $comment = Piwik::translate('Diagnostics_MysqlMaxPacketSizeWarning',
+            $comment = Piwik::translate(
+                'Diagnostics_MysqlMaxPacketSizeWarning',
                 ['<a href="https://dev.mysql.com/doc/refman/en/packet-too-large.html" rel="noreferrer noopener" target="_blank">',
-                 '</a>', '64MB', $configured]);
+                '</a>',
+                '64MB',
+                $configured]
+            );
         }
 
         return array(DiagnosticResult::singleResult($label, $status, $comment));

diff --git a/plugins/Diagnostics/Diagnostic/RecommendedPrivateDirectories.php b/plugins/Diagnostics/Diagnostic/RecommendedPrivateDirectories.php
@@ -26,11 +26,13 @@ public function __construct(Translator $translator)
 
     protected function addError(DiagnosticResult &$result)
     {
-        $result->addItem(new DiagnosticResultItem(DiagnosticResult::STATUS_INFORMATIONAL,
+        $result->addItem(new DiagnosticResultItem(
+            DiagnosticResult::STATUS_INFORMATIONAL,
             $this->translator->translate('Diagnostics_UrlsAccessibleViaBrowser') . ' ' .
             $this->translator->translate('General_ReadThisToLearnMore', [
                 '<a target="_blank" rel="noopener noreferrer" href="' . Url::addCampaignParametersToMatomoLink('https://matomo.org/faq/troubleshooting/how-do-i-fix-the-error-private-directories-are-accessible/') . '">',
                 '</a>',
-            ])));
+            ])
+        ));
     }
 }
diff --git a/plugins/Ecommerce/Reports/BaseItem.php b/plugins/Ecommerce/Reports/BaseItem.php
@@ -50,8 +50,10 @@ public function getMetricsDocumentation()
         // we do not check whether it is abandon carts if not set re performance improvements
         if ($this->isAbandonedCart($fetchIfNotSet = false)) {
             return array(
-                'revenue'         => Piwik::translate('Goals_ColumnRevenueDocumentation',
-                                            Piwik::translate('Goals_DocumentationRevenueGeneratedByProductSales')),
+                'revenue'         => Piwik::translate(
+                    'Goals_ColumnRevenueDocumentation',
+                    Piwik::translate('Goals_DocumentationRevenueGeneratedByProductSales')
+                ),
                 'quantity'        => Piwik::translate('Goals_ColumnQuantityDocumentation', $this->name),
                 'orders'          => Piwik::translate('Goals_ColumnOrdersDocumentation', $this->name),
                 'avg_price'       => Piwik::translate('Goals_ColumnAveragePriceDocumentation', $this->name),

diff --git a/plugins/Ecommerce/Tracker/EcommerceRequestProcessor.php b/plugins/Ecommerce/Tracker/EcommerceRequestProcessor.php
@@ -68,7 +68,8 @@ public function afterRequestProcessed(VisitProperties $visitProperties, Request
         $goalsConverted = $request->getMetadata('Goals', 'goalsConverted');
         if (!empty($goalsConverted)) {
             $isThereExistingCartInVisit = $this->goalManager->detectIsThereExistingCartInVisit(
-                $visitProperties->getProperties());
+                $visitProperties->getProperties()
+            );
             $request->setMetadata('Goals', 'isThereExistingCartInVisit', $isThereExistingCartInVisit);
         }
     }

diff --git a/plugins/Ecommerce/VisitorDetails.php b/plugins/Ecommerce/VisitorDetails.php
@@ -33,8 +33,10 @@ public function extendVisitorDetails(&$visitor)
     {
         if(Site::isEcommerceEnabledFor($visitor['idSite']))
         {
-            $ecommerceMetrics                     = $this->queryEcommerceConversionsVisitorLifeTimeMetricsForVisitor($visitor['idSite'],
-                $visitor['visitorId']);
+            $ecommerceMetrics                     = $this->queryEcommerceConversionsVisitorLifeTimeMetricsForVisitor(
+                $visitor['idSite'],
+                $visitor['visitorId']
+            );
             $visitor['totalEcommerceRevenue']     = $ecommerceMetrics['totalEcommerceRevenue'];
             $visitor['totalEcommerceConversions'] = $ecommerceMetrics['totalEcommerceConversions'];
             $visitor['totalEcommerceItems']       = $ecommerceMetrics['totalEcommerceItems'];

diff --git a/plugins/Ecommerce/tests/Fixtures/AbandonedCartWithoutConversions.php b/plugins/Ecommerce/tests/Fixtures/AbandonedCartWithoutConversions.php
@@ -34,8 +34,14 @@ private function setUpWebsitesAndGoals()
 
         if (!self::goalExists($this->idSite, $this->idGoalStandard)) {
             GoalsAPI::getInstance()->addGoal(
-                $this->idSite, 'title match, triggered NEVER', 'title', 'saldkfjaslkdfjsalkdjf', 'contains',
-                $caseSensitive = false, $revenue = 10, $allowMultipleConversions = true
+                $this->idSite,
+                'title match, triggered NEVER',
+                'title',
+                'saldkfjaslkdfjsalkdjf',
+                'contains',
+                $caseSensitive = false,
+                $revenue = 10,
+                $allowMultipleConversions = true
             );
         }
     }

diff --git a/plugins/ExampleLogTables/Dao/CustomGroupLog.php b/plugins/ExampleLogTables/Dao/CustomGroupLog.php
@@ -55,8 +55,12 @@ public function addGroupInformation($group, $isAdmin)
         $bind = array_values($columns);
         $placeholder = Common::getSqlStringFieldsArray($columns);
 
-        $sql = sprintf('INSERT INTO %s (`%s`) VALUES(%s)',
-            $this->tablePrefixed, implode('`,`', array_keys($columns)), $placeholder);
+        $sql = sprintf(
+            'INSERT INTO %s (`%s`) VALUES(%s)',
+            $this->tablePrefixed,
+            implode('`,`', array_keys($columns)),
+            $placeholder
+        );
 
         $db = $this->getDb();
 

diff --git a/plugins/ExampleLogTables/Dao/CustomUserLog.php b/plugins/ExampleLogTables/Dao/CustomUserLog.php
@@ -57,8 +57,12 @@ public function addUserInformation($userId, $group, $gender)
         $bind = array_values($columns);
         $placeholder = Common::getSqlStringFieldsArray($columns);
 
-        $sql = sprintf('INSERT INTO %s (`%s`) VALUES(%s)',
-            $this->tablePrefixed, implode('`,`', array_keys($columns)), $placeholder);
+        $sql = sprintf(
+            'INSERT INTO %s (`%s`) VALUES(%s)',
+            $this->tablePrefixed,
+            implode('`,`', array_keys($columns)),
+            $placeholder
+        );
 
         $db = $this->getDb();
 

diff --git a/plugins/Feedback/API.php b/plugins/Feedback/API.php
@@ -58,7 +58,8 @@ public function sendFeedbackForFeature($featureName, $like = null, $choice = nul
 
         $body .= sprintf("Feedback:\n%s\n", trim($message));
 
-        $subject = sprintf("%s for %s",
+        $subject = sprintf(
+            "%s for %s",
             empty($like) ? "-1" : "+1",
             $featureName
         );
@@ -106,10 +107,11 @@ public function sendFeedbackForSurvey($question, $message = false)
 
         $body .= $feedbackMessage ? $feedbackMessage : " \n";
 
-        $subject = sprintf("%s for %s %s",
-          empty($like) ? "-1" : "+1",
-          $featureName,
-          empty($feedbackMessage) ? "" : "(w/ feedback Survey)"
+        $subject = sprintf(
+            "%s for %s %s",
+            empty($like) ? "-1" : "+1",
+            $featureName,
+            empty($feedbackMessage) ? "" : "(w/ feedback Survey)"
         );
 
         $this->sendMail($subject, $body);