Apply coding style around FunctionCallSignature #2 (#21928)

matomo-org · Feb 15, 2024 · b97a995 · b97a995
1 parent e02d087
commit b97a995
Show file tree

Hide file tree

Showing 30 changed files with 218 additions and 86 deletions.
diff --git a/core/Db/Schema/Mysql.php b/core/Db/Schema/Mysql.php
@@ -539,12 +539,14 @@ public function createTable($nameWithoutPrefix, $createDefinition)
         $dbSettings   = new Db\Settings();
         $charset      = $dbSettings->getUsedCharset();
 
-        $statement = sprintf("CREATE TABLE IF NOT EXISTS `%s` ( %s ) ENGINE=%s DEFAULT CHARSET=%s %s;",
-                             Common::prefixTable($nameWithoutPrefix),
-                             $createDefinition,
-                             $this->getTableEngine(),
-                             $charset,
-          $dbSettings->getRowFormat());
+        $statement = sprintf(
+            "CREATE TABLE IF NOT EXISTS `%s` ( %s ) ENGINE=%s DEFAULT CHARSET=%s %s;",
+            Common::prefixTable($nameWithoutPrefix),
+            $createDefinition,
+            $this->getTableEngine(),
+            $charset,
+            $dbSettings->getRowFormat()
+        );
 
         try {
             Db::exec($statement);

diff --git a/core/Http.php b/core/Http.php
@@ -103,9 +103,26 @@ public static function sendHttpRequest(
         $file = self::ensureDestinationDirectoryExists($destinationPath);
 
         $acceptLanguage = $acceptLanguage ? 'Accept-Language: ' . $acceptLanguage : '';
-        return self::sendHttpRequestBy(self::getTransportMethod(), $aUrl, $timeout, $userAgent, $destinationPath, $file,
-            $followDepth, $acceptLanguage, $acceptInvalidSslCertificate = false, $byteRange, $getExtendedInfo, $httpMethod,
-            $httpUsername, $httpPassword, null, [], null, $checkHostIsAllowed);
+        return self::sendHttpRequestBy(
+            self::getTransportMethod(),
+            $aUrl,
+            $timeout,
+            $userAgent,
+            $destinationPath,
+            $file,
+            $followDepth,
+            $acceptLanguage,
+            $acceptInvalidSslCertificate = false,
+            $byteRange,
+            $getExtendedInfo,
+            $httpMethod,
+            $httpUsername,
+            $httpPassword,
+            null,
+            [],
+            null,
+            $checkHostIsAllowed
+        );
     }
 
     public static function ensureDestinationDirectoryExists($destinationPath)
@@ -882,7 +899,8 @@ public static function downloadChunk($url, $outputPath, $isContinuation)
         ) {
             throw new Exception(
                 Piwik::translate('General_DownloadFail_FileExists', "'" . $outputPath . "'")
-                . ' ' . Piwik::translate('General_DownloadPleaseRemoveExisting'));
+                . ' ' . Piwik::translate('General_DownloadPleaseRemoveExisting')
+            );
         }
 
         // if we're starting a download, get the expected file size & save as an option
@@ -924,7 +942,8 @@ public static function downloadChunk($url, $outputPath, $isContinuation)
         if ($existingSize >= $expectedFileSize) {
             throw new Exception(
                 Piwik::translate('General_DownloadFail_FileExistsContinue', "'" . $outputPath . "'")
-                . ' ' . Piwik::translate('General_DownloadPleaseRemoveExisting'));
+                . ' ' . Piwik::translate('General_DownloadPleaseRemoveExisting')
+            );
         }
 
         // download a chunk of the file
@@ -944,8 +963,13 @@ public static function downloadChunk($url, $outputPath, $isContinuation)
             || $result['status'] > 299
         ) {
             $result['data'] = self::truncateStr($result['data'], 1024);
-            Log::info("Failed to download range '%s-%s' of file from url '%s'. Got result: %s",
-                $byteRange[0], $byteRange[1], $url, print_r($result, true));
+            Log::info(
+                "Failed to download range '%s-%s' of file from url '%s'. Got result: %s",
+                $byteRange[0],
+                $byteRange[1],
+                $url,
+                print_r($result, true)
+            );
 
             throw new Exception(Piwik::translate('General_DownloadFail_HttpRequestFail'));
         }

diff --git a/core/Menu/MenuAbstract.php b/core/Menu/MenuAbstract.php
@@ -219,8 +219,18 @@ private function buildMenuItem(
     private function buildMenu()
     {
         foreach ($this->menuEntries as $menuEntry) {
-            $this->buildMenuItem($menuEntry[0], $menuEntry[1], $menuEntry[2], $menuEntry[3], $menuEntry[4],
-                $menuEntry[5], $menuEntry[6], $menuEntry[7], $menuEntry[8], $menuEntry[9]);
+            $this->buildMenuItem(
+                $menuEntry[0],
+                $menuEntry[1],
+                $menuEntry[2],
+                $menuEntry[3],
+                $menuEntry[4],
+                $menuEntry[5],
+                $menuEntry[6],
+                $menuEntry[7],
+                $menuEntry[8],
+                $menuEntry[9]
+            );
         }
     }
 
@@ -388,7 +398,8 @@ protected function menuCompare($itemOne, $itemTwo)
         if ($itemOne['_order'] == $itemTwo['_order']) {
             return strcmp(
                 $itemOne['_name'] ?? '',
-                $itemTwo['_name'] ?? '');
+                $itemTwo['_name'] ?? ''
+            );
         }
 
         return ($itemOne['_order'] < $itemTwo['_order']) ? -1 : 1;

diff --git a/core/Nonce.php b/core/Nonce.php
@@ -101,15 +101,16 @@ public static function verifyNonceWithErrorMessage($id, $cnonce, $allowedReferre
         //  The Session cookie is set to a secure cookie, when SSL is mis-configured, it can cause the PHP session cookie ID to change on each page view.
         //  Indicate to user how to solve this particular use case by forcing secure connections.
         if (Url::isSecureConnectionAssumedByPiwikButNotForcedYet()) {
-            $additionalErrors =  '<br/><br/>' . Piwik::translate('Login_InvalidNonceSSLMisconfigured',
+            $additionalErrors =  '<br/><br/>' . Piwik::translate(
+                'Login_InvalidNonceSSLMisconfigured',
                 array(
                   '<a target="_blank" rel="noreferrer noopener" href="' . Url::addCampaignParametersToMatomoLink('https://matomo.org/faq/how-to/faq_91/') . '">',
                   '</a>',
                   'config/config.ini.php',
                   '<pre>force_ssl=1</pre>',
                   '<pre>[General]</pre>',
                 )
-              );
+            );
         }
 
         // validate token

diff --git a/core/Period/Year.php b/core/Period/Year.php
@@ -66,8 +66,8 @@ protected function generate()
         $year = $this->date->toString("Y");
         for ($i = 1; $i <= 12; $i++) {
             $this->addSubperiod(new Month(
-                    Date::factory("$year-$i-01")
-                ));
+                Date::factory("$year-$i-01")
+            ));
         }
     }
 

diff --git a/core/Piwik.php b/core/Piwik.php
@@ -135,8 +135,13 @@ public static function getQuotientSafe($dividend, $divisor, $precision = 0)
             $dividend = 0;
         }
         if (!is_numeric($dividend) || !is_numeric($divisor)) {
-            throw new \Exception(sprintf('Trying to round unsupported operands for dividend %s (%s) and divisor %s (%s)',
-                $dividend, gettype($dividend), $divisor, gettype($divisor)));
+            throw new \Exception(sprintf(
+                'Trying to round unsupported operands for dividend %s (%s) and divisor %s (%s)',
+                $dividend,
+                gettype($dividend),
+                $divisor,
+                gettype($divisor)
+            ));
         }
         return round($dividend / $divisor, $precision);
     }
@@ -365,7 +370,8 @@ public static function requestTemporarySystemAuthToken($reason, $validForHours)
                 'System generated ' . $reason,
                 Date::now()->getDatetime(),
                 $expireDate,
-            true);
+                true
+            );
 
             return $token[$reason];
         }
@@ -722,9 +728,9 @@ public static function getArrayFromApiParameter($columns, $unique = true)
     public static function redirectToModule($newModule, $newAction = '', $parameters = array())
     {
         $newUrl = 'index.php' . Url::getCurrentQueryStringWithParametersModified(
-                array('module' => $newModule, 'action' => $newAction)
+            array('module' => $newModule, 'action' => $newAction)
                 + $parameters
-            );
+        );
         Url::redirectToUrl($newUrl);
     }
 

diff --git a/core/Plugin.php b/core/Plugin.php
@@ -388,8 +388,13 @@ public function findComponent($componentName, $expectedSubclass)
                 }
 
                 if (!empty($expectedSubclass) && !is_subclass_of($classname, $expectedSubclass)) {
-                    Log::warning(sprintf('Cannot use component %s for plugin %s, class %s does not extend %s',
-                    $componentName, $this->pluginName, $classname, $expectedSubclass));
+                    Log::warning(sprintf(
+                        'Cannot use component %s for plugin %s, class %s does not extend %s',
+                        $componentName,
+                        $this->pluginName,
+                        $classname,
+                        $expectedSubclass
+                    ));
                     return null;
                 }
 

diff --git a/core/Plugin/ComponentFactory.php b/core/Plugin/ComponentFactory.php
@@ -37,8 +37,12 @@ class ComponentFactory
     public static function factory($pluginName, $componentClassSimpleName, $componentTypeClass)
     {
         if (empty($pluginName) || empty($componentClassSimpleName)) {
-            Log::debug("ComponentFactory::%s: empty plugin name or component simple name requested (%s, %s)",
-                __FUNCTION__, $pluginName, $componentClassSimpleName);
+            Log::debug(
+                "ComponentFactory::%s: empty plugin name or component simple name requested (%s, %s)",
+                __FUNCTION__,
+                $pluginName,
+                $componentClassSimpleName
+            );
 
             return null;
         }
@@ -58,8 +62,13 @@ public static function factory($pluginName, $componentClassSimpleName, $componen
             }
         }
 
-        Log::debug("ComponentFactory::%s: Could not find requested component (args = ['%s', '%s', '%s']).",
-            __FUNCTION__, $pluginName, $componentClassSimpleName, $componentTypeClass);
+        Log::debug(
+            "ComponentFactory::%s: Could not find requested component (args = ['%s', '%s', '%s']).",
+            __FUNCTION__,
+            $pluginName,
+            $componentClassSimpleName,
+            $componentTypeClass
+        );
 
         return null;
     }
@@ -99,8 +108,13 @@ public static function getComponentIf($componentTypeClass, $pluginName, $predica
             }
         }
 
-        Log::debug("ComponentFactory::%s: Could not find component that satisfies predicate (args = ['%s', '%s', '%s']).",
-            __FUNCTION__, $componentTypeClass, $pluginName, get_class($predicate));
+        Log::debug(
+            "ComponentFactory::%s: Could not find component that satisfies predicate (args = ['%s', '%s', '%s']).",
+            __FUNCTION__,
+            $componentTypeClass,
+            $pluginName,
+            get_class($predicate)
+        );
 
         return null;
     }
@@ -115,8 +129,11 @@ private static function getActivatedPlugin($function, $pluginName)
         $pluginManager = PluginManager::getInstance();
         try {
             if (!$pluginManager->isPluginActivated($pluginName)) {
-                Log::debug("ComponentFactory::%s: component for deactivated plugin ('%s') requested.",
-                    $function, $pluginName);
+                Log::debug(
+                    "ComponentFactory::%s: component for deactivated plugin ('%s') requested.",
+                    $function,
+                    $pluginName
+                );
 
                 return null;
             }

diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php
@@ -405,7 +405,11 @@ protected function renderReport($apiAction, $controllerAction = false)
     protected function getLastUnitGraph($currentModuleName, $currentControllerAction, $apiMethod)
     {
         $view = ViewDataTableFactory::build(
-            Evolution::ID, $apiMethod, $currentModuleName . '.' . $currentControllerAction, $forceDefault = true);
+            Evolution::ID,
+            $apiMethod,
+            $currentModuleName . '.' . $currentControllerAction,
+            $forceDefault = true
+        );
         $view->config->show_goals = false;
         return $view;
     }

diff --git a/core/Plugin/Dimension/DimensionMetadataProvider.php b/core/Plugin/Dimension/DimensionMetadataProvider.php
@@ -64,7 +64,8 @@ public function getActionReferenceColumnsByTable()
 
         $dimensionIdActionColumns = $this->getVisitActionTableActionReferences();
         $result['log_link_visit_action'] = array_unique(
-            array_merge($result['log_link_visit_action'], $dimensionIdActionColumns));
+            array_merge($result['log_link_visit_action'], $dimensionIdActionColumns)
+        );
 
         foreach ($this->actionReferenceColumnsOverride as $table => $columns) {
             if (empty($result[$table])) {

diff --git a/core/Plugin/ViewDataTable.php b/core/Plugin/ViewDataTable.php
@@ -219,8 +219,10 @@ public function __construct($controllerAction, $apiMethodToRequestDataTable, $ov
 
                     $relatedReportName = $relatedReport->getName();
 
-                    $this->config->addRelatedReport($relatedReport->getModule() . '.' . $relatedReport->getAction(),
-                                                    $relatedReportName);
+                    $this->config->addRelatedReport(
+                        $relatedReport->getModule() . '.' . $relatedReport->getAction(),
+                        $relatedReportName
+                    );
                 }
             }
 

diff --git a/core/Plugin/Visualization.php b/core/Plugin/Visualization.php
@@ -838,8 +838,10 @@ private function logMessageIfRequestPropertiesHaveChanged(array $requestProperti
     {
         $requestProperties = $this->requestConfig->getProperties();
 
-        $diff = array_diff_assoc($this->makeSureArrayContainsOnlyStrings($requestProperties),
-                                 $this->makeSureArrayContainsOnlyStrings($requestPropertiesBefore));
+        $diff = array_diff_assoc(
+            $this->makeSureArrayContainsOnlyStrings($requestProperties),
+            $this->makeSureArrayContainsOnlyStrings($requestPropertiesBefore)
+        );
 
         if (!empty($diff['filter_sort_column'])) {
             // this here might be ok as it can be changed after data loaded but before filters applied

diff --git a/core/ProfessionalServices/Advertising.php b/core/ProfessionalServices/Advertising.php
@@ -56,7 +56,8 @@ public function areAdsForProfessionalServicesEnabled()
      */
     public function getPromoUrlForProfessionalServices($campaignMedium, $campaignContent = '')
     {
-        return Url::addCampaignParametersToMatomoLink('https://matomo.org/support-plans/',
+        return Url::addCampaignParametersToMatomoLink(
+            'https://matomo.org/support-plans/',
             self::CAMPAIGN_NAME_PROFESSIONAL_SERVICES,
             null,
             $campaignMedium

diff --git a/core/ReportRenderer/Html.php b/core/ReportRenderer/Html.php
@@ -83,8 +83,15 @@ private function epilogue()
 
     public function renderFrontPage($reportTitle, $prettyDate, $description, $reportMetadata, $segment)
     {
-        $frontPageView = new View\HtmlReportEmailHeaderView($reportTitle, $prettyDate, $description, $reportMetadata,
-            $segment, $this->idSite, $this->report['period']);
+        $frontPageView = new View\HtmlReportEmailHeaderView(
+            $reportTitle,
+            $prettyDate,
+            $description,
+            $reportMetadata,
+            $segment,
+            $this->idSite,
+            $this->report['period']
+        );
         $this->rendering .= $frontPageView->render();
     }
 

diff --git a/core/Scheduler/Schedule/Daily.php b/core/Scheduler/Schedule/Daily.php
@@ -28,7 +28,8 @@ public function getRescheduledTime()
         $currentTime = $this->getTime();
 
         // Add one day
-        $rescheduledTime = mktime(date('H', $currentTime),
+        $rescheduledTime = mktime(
+            date('H', $currentTime),
             date('i', $currentTime),
             date('s', $currentTime),
             date('n', $currentTime),

diff --git a/core/Scheduler/Schedule/Hourly.php b/core/Scheduler/Schedule/Hourly.php
@@ -27,7 +27,8 @@ public function getRescheduledTime()
         $currentTime = $this->getTime();
 
         // Adds one hour and reset the number of minutes
-        $rescheduledTime = mktime(date('H', $currentTime) + 1,
+        $rescheduledTime = mktime(
+            date('H', $currentTime) + 1,
             0,
             date('s', $currentTime),
             date('n', $currentTime),

diff --git a/core/Scheduler/Schedule/Monthly.php b/core/Scheduler/Schedule/Monthly.php
@@ -64,7 +64,8 @@ public function getRescheduledTime()
         $currentTime = $this->getTime();
 
         // Adds one month
-        $rescheduledTime = mktime(date('H', $currentTime),
+        $rescheduledTime = mktime(
+            date('H', $currentTime),
             date('i', $currentTime),
             date('s', $currentTime),
             date('n', $currentTime) + 1,

diff --git a/core/Scheduler/Schedule/Schedule.php b/core/Scheduler/Schedule/Schedule.php
@@ -164,7 +164,8 @@ protected function adjustHour($rescheduledTime)
     {
         if ($this->hour !== null) {
             // Reset the number of minutes and set the scheduled hour to the one specified with setHour()
-            $rescheduledTime = mktime($this->hour,
+            $rescheduledTime = mktime(
+                $this->hour,
                 0,
                 date('s', $rescheduledTime),
                 date('n', $rescheduledTime),

diff --git a/core/Scheduler/Schedule/Weekly.php b/core/Scheduler/Schedule/Weekly.php
@@ -38,7 +38,8 @@ public function getRescheduledTime()
         }
 
         // Adds correct number of days
-        $rescheduledTime = mktime(date('H', $currentTime),
+        $rescheduledTime = mktime(
+            date('H', $currentTime),
             date('i', $currentTime),
             date('s', $currentTime),
             date('n', $currentTime),