[Coding Style] Enable rule Squiz.ControlStructures.ControlSignature.S…

…paceAfterKeyword (#22098) * [Coding Style] Enable rule Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword * Apply CS
matomo-org · Apr 11, 2024 · 73823f7 · 73823f7
1 parent 6ca6c34
commit 73823f7
Show file tree

Hide file tree

Showing 120 changed files with 212 additions and 214 deletions.
diff --git a/core/API/DocumentationGenerator.php b/core/API/DocumentationGenerator.php
@@ -82,7 +82,7 @@ protected function prepareMethodToDisplay($moduleName, $info, $methods, $class,
     {
         $str = '';
         $str .= "\n<a name='$moduleName' id='$moduleName'></a>";
-        if($displayTitlesAsEnrichedHeadline) {
+        if ($displayTitlesAsEnrichedHeadline) {
             $str .= "<div vue-entry=\"CoreHome.ContentBlock\" content-title='Module " . $moduleName . "'>";
         } else {
             $str .= "<h2>Module " . $moduleName . "</h2>";
@@ -105,7 +105,7 @@ protected function prepareMethodToDisplay($moduleName, $info, $methods, $class,
             $str .= "</div>\n";
         }
 
-        if($displayTitlesAsEnrichedHeadline) {
+        if ($displayTitlesAsEnrichedHeadline) {
             $str .= "</div>";
         }
 
@@ -343,7 +343,7 @@ protected function getParametersString($class, $name)
 
             $str = '';
 
-            if(!empty($parameter['type'])) {
+            if (!empty($parameter['type'])) {
                 $prefix = $parameter['allowsNull'] ? '?' : '';
                 $str = '<i>' . $prefix . $parameter['type'] . '</i> ';
             }

diff --git a/core/Application/Kernel/EnvironmentValidator.php b/core/Application/Kernel/EnvironmentValidator.php
@@ -42,19 +42,19 @@ public function validate()
     {
         $this->checkConfigFileExists($this->settingsProvider->getPathGlobal());
 
-        if(SettingsPiwik::isMatomoInstalled()) {
+        if (SettingsPiwik::isMatomoInstalled()) {
             $this->checkConfigFileExists($this->settingsProvider->getPathLocal(), $startInstaller = false);
             return;
         }
 
         $startInstaller = true;
 
-        if(SettingsServer::isTrackerApiRequest()) {
+        if (SettingsServer::isTrackerApiRequest()) {
             // if Piwik is not installed yet, the piwik.php should do nothing and not return an error
             throw new NotYetInstalledException("As Matomo is not installed yet, the Tracking API cannot proceed and will exit without error.");
         }
 
-        if(Common::isPhpCliMode()) {
+        if (Common::isPhpCliMode()) {
             // in CLI, do not start/redirect to installer, simply output the exception at the top
             $startInstaller = false;
         }
@@ -117,7 +117,7 @@ private function startInstallation($exception)
     private function getMessageWhenFileExistsButNotReadable($path)
     {
         $format = " \n<b>» %s </b>";
-        if(Common::isPhpCliMode()) {
+        if (Common::isPhpCliMode()) {
             $format = "\n » %s \n";
         }
 

diff --git a/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php b/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php
@@ -46,7 +46,7 @@ protected function getMergedAssets()
         $this->lessCompiler->setFormatter('classic');
         try {
             $compiled = $this->lessCompiler->compile($concatenatedAssets);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             // save the concated less files so we can debug the issue
             $this->saveConcatenatedAssets($concatenatedAssets);
 

diff --git a/core/Changes/Model.php b/core/Changes/Model.php
@@ -99,7 +99,7 @@ public function removeChanges(string $pluginName): void
      */
     public function addChange(string $pluginName, array $change): void
     {
-        if(!isset($change['version']) || !isset($change['title']) || !isset($change['description'])) {
+        if (!isset($change['version']) || !isset($change['title']) || !isset($change['description'])) {
             StaticContainer::get(LoggerInterface::class)->warning(
                 "Change item for plugin {plugin} missing version, title or description fields - ignored",
                 ['plugin' => $pluginName]

diff --git a/core/Common.php b/core/Common.php
@@ -133,11 +133,11 @@ public static function isPhpCliMode()
             return self::$isCliMode;
         }
 
-        if(PHP_SAPI === 'cli') {
+        if (PHP_SAPI === 'cli') {
             return true;
         }
 
-        if(self::isPhpCgiType() && (!isset($_SERVER['REMOTE_ADDR']) || empty($_SERVER['REMOTE_ADDR']))) {
+        if (self::isPhpCgiType() && (!isset($_SERVER['REMOTE_ADDR']) || empty($_SERVER['REMOTE_ADDR']))) {
             return true;
         }
 

diff --git a/core/Config.php b/core/Config.php
@@ -319,7 +319,7 @@ public function deleteLocalConfig()
     {
         $configLocal = $this->getLocalPath();
 
-        if(file_exists($configLocal)) {
+        if (file_exists($configLocal)) {
             @unlink($configLocal);
         }
     }

diff --git a/core/Console.php b/core/Console.php
@@ -307,7 +307,7 @@ private function getCommandsFromPluginsMarkedInConfig()
         $plugins = explode(',', $plugins);
 
         $commands = array();
-        foreach($plugins as $plugin) {
+        foreach ($plugins as $plugin) {
             $instance = new Plugin($plugin);
             $commands = array_merge($commands, $instance->findMultipleComponents('Commands', 'Piwik\\Plugin\\ConsoleCommand'));
         }

diff --git a/core/CronArchive.php b/core/CronArchive.php
@@ -751,7 +751,7 @@ private function logNetworkError($url, $response)
         if (empty($response)) {
             $message .= "The response was empty. This usually means a server error. A solution to this error is generally to increase the value of 'memory_limit' in your php.ini file. ";
 
-            if($this->supportsAsync) {
+            if ($this->supportsAsync) {
                 $message .= " For more information and the error message please check in your PHP CLI error log file. As this core:archive command triggers PHP processes over the CLI, you can find where PHP CLI logs are stored by running this command: php -i | grep error_log";
             } else {
                 $message .= " For more information and the error message please check your web server's error Log file. As this core:archive command triggers PHP processes over HTTP, you can find the error message in your Matomo's web server error logs. ";

diff --git a/core/DataAccess/LogQueryBuilder/JoinGenerator.php b/core/DataAccess/LogQueryBuilder/JoinGenerator.php
@@ -267,7 +267,7 @@ public function findJoinCriteriasForTables(LogTable $logTable, $availableLogTabl
 
             $otherJoins = $logTable->getWaysToJoinToOtherLogTables();
             foreach ($otherJoins as $joinTable => $column) {
-                if($availableLogTable->getName() == $joinTable) {
+                if ($availableLogTable->getName() == $joinTable) {
                     $join = sprintf("`%s`.`%s` = `%s`.`%s`", $table, $column, $availableLogTable->getName(), $column);
                     break;
                 }

diff --git a/core/DataTable/Filter/ExcludeLowPopulation.php b/core/DataTable/Filter/ExcludeLowPopulation.php
@@ -89,7 +89,7 @@ public function __construct($table, $columnToFilter, $minimumValue, $minimumPerc
      */
     public function filter($table)
     {
-        if(empty($this->columnToFilter)) {
+        if (empty($this->columnToFilter)) {
             return;
         }
         $minimumValue = $this->minimumValue;

diff --git a/core/DataTable/Renderer/Csv.php b/core/DataTable/Renderer/Csv.php
@@ -282,7 +282,7 @@ protected function formatFormulas($value)
 
         $firstCharCellValue = $valueWithoutFirstPercentSign[0];
         $isFormula = in_array($firstCharCellValue, $formulaStartsWith);
-        if($isFormula) {
+        if ($isFormula) {
             return "'" . $value;
         }
 

diff --git a/core/DataTable/Renderer/Rss.php b/core/DataTable/Renderer/Rss.php
@@ -66,7 +66,7 @@ protected function renderTable($table)
             $pudDate = date('r', $timestamp);
 
             $dateInSiteTimezone = Date::factory($timestamp);
-            if($site) {
+            if ($site) {
                 $dateInSiteTimezone = $dateInSiteTimezone->setTimezone($site->getTimezone());
             }
             $dateInSiteTimezone = $dateInSiteTimezone->toString('Y-m-d');

diff --git a/core/Db.php b/core/Db.php
@@ -858,7 +858,7 @@ private static function logExtraInfoIfDeadlock($ex)
 
             // log using exception so backtrace appears in log output
             Log::debug(new Exception("Encountered deadlock: " . print_r($deadlockInfo, true)));
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             //  1227 Access denied; you need (at least one of) the PROCESS privilege(s) for this operation
         }
     }

diff --git a/core/Db/Adapter.php b/core/Db/Adapter.php
@@ -55,7 +55,7 @@ public static function factory($adapterName, &$dbInfos, $connect = true)
                 Zend_Db_Table::setDefaultAdapter($adapter);
                 // we don't want the connection information to appear in the logs
                 $adapter->resetConfig();
-            } catch(\Exception $e) {
+            } catch (\Exception $e) {
                 // we don't want certain exceptions to leak information
                 $msg = self::overriddenExceptionMessage($e->getMessage());
                 if ('' !== $msg) {

diff --git a/core/FileIntegrity.php b/core/FileIntegrity.php
@@ -178,7 +178,7 @@ protected static function getMessagesFilesFoundButNotExpected($messages)
     protected static function getDirectoriesFoundButNotExpected()
     {
         static $cache = null;
-        if(!is_null($cache)) {
+        if (!is_null($cache)) {
             return $cache;
         }
 
@@ -191,7 +191,7 @@ protected static function getDirectoriesFoundButNotExpected()
             $file = ltrim($file, "\\/");
             $directory = dirname($file);
 
-            if(in_array($directory, $directoriesInManifest)) {
+            if (in_array($directory, $directoriesInManifest)) {
                 continue;
             }
 
@@ -252,8 +252,8 @@ protected static function getFilesFoundButNotExpected()
     protected static function isFileFromDirectoryThatShouldBeDeleted($file)
     {
         $directoriesWillBeDeleted = self::getDirectoriesFoundButNotExpected();
-        foreach($directoriesWillBeDeleted as $directoryWillBeDeleted) {
-            if(strpos($file, $directoryWillBeDeleted) === 0) {
+        foreach ($directoriesWillBeDeleted as $directoryWillBeDeleted) {
+            if (strpos($file, $directoryWillBeDeleted) === 0) {
                 return true;
             }
         }
@@ -265,11 +265,11 @@ protected static function getDirectoriesFoundInManifest()
         $files = \Piwik\Manifest::$files;
 
         $directories = array();
-        foreach($files as $file => $manifestIntegrityInfo) {
+        foreach ($files as $file => $manifestIntegrityInfo) {
             $directory = $file;
 
             // add this directory and each parent directory
-            while(($directory = dirname($directory)) && $directory != '.' && $directory != '/') {
+            while (($directory = dirname($directory)) && $directory != '.' && $directory != '/') {
                 $directories[] = $directory;
             }
         }
@@ -282,8 +282,8 @@ protected static function getPluginsFoundInManifest()
         $files = \Piwik\Manifest::$files;
 
         $pluginsInManifest = array();
-        foreach($files as $file => $manifestIntegrityInfo) {
-            if(strpos($file, 'plugins/') === 0) {
+        foreach ($files as $file => $manifestIntegrityInfo) {
+            if (strpos($file, 'plugins/') === 0) {
                 $pluginName = self::getPluginNameFromFilepath($file);
                 $pluginsInManifest[] = $pluginName;
             }
@@ -311,7 +311,7 @@ protected static function isFileFromPluginNotInManifest($file, $pluginsInManifes
         }
 
         $pluginName = self::getPluginNameFromFilepath($file);
-        if(in_array($pluginName, $pluginsInManifest)) {
+        if (in_array($pluginName, $pluginsInManifest)) {
             return false;
         }
 
@@ -446,7 +446,7 @@ protected static function getParentDirectoriesFromListOfDirectories($directories
         $parentDirectoriesOnly = array();
         foreach ($directoriesFoundButNotExpected as $directory) {
             $directoryParent = self::getDirectoryParentFromList($directory, $directoriesFoundButNotExpected);
-            if($directoryParent) {
+            if ($directoryParent) {
                 $parentDirectoriesOnly[] = $directoryParent;
             }
         }
@@ -464,7 +464,7 @@ protected static function getParentDirectoriesFromListOfDirectories($directories
      */
     protected static function getDirectoryParentFromList($directory, $directories)
     {
-        foreach($directories as $directoryMaybeParent) {
+        foreach ($directories as $directoryMaybeParent) {
             if ($directory == $directoryMaybeParent) {
                 continue;
             }

diff --git a/core/FrontController.php b/core/FrontController.php
@@ -98,7 +98,7 @@ private static function generateSafeModeOutputFromError($lastError)
         try {
             $controller->init();
             $message = $controller->dispatch('CorePluginsAdmin', 'safemode', array($lastError));
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             // may fail in safe mode (eg. global.ini.php not found)
             $message = sprintf("Matomo encountered an error: %s (which lead to: %s)", $lastError['message'], $e->getMessage());
         }
@@ -189,10 +189,10 @@ public function dispatch($module = null, $action = null, $parameters = null)
                 echo $this->generateSafeModeOutputFromException($e);
                 exit;
             }
-        } catch(StylesheetLessCompileException $e) {
+        } catch (StylesheetLessCompileException $e) {
             echo $this->generateSafeModeOutputFromException($e);
             exit;
-        } catch(\Error $e) {
+        } catch (\Error $e) {
             echo $this->generateSafeModeOutputFromException($e);
             exit;
         }

diff --git a/core/Http.php b/core/Http.php
@@ -758,7 +758,7 @@ public static function sendHttpRequestBy(
                 while (substr($response, 0, 5) == "HTTP/") {
                     $split = explode("\r\n\r\n", $response, 2);
 
-                    if(count($split) == 2) {
+                    if (count($split) == 2) {
                         [$header, $response] = $split;
                     } else {
                         $response = '';

diff --git a/core/IP.php b/core/IP.php
@@ -138,7 +138,7 @@ private static function getIpsFromList(string $csv, ?array $excludedIps)
         $elements = explode(',', $csv);
         foreach ($elements as $ipString) {
             $element = trim(Common::sanitizeInputValue($ipString));
-            if(empty($element)) {
+            if (empty($element)) {
                 continue;
             }
             $ip = \Matomo\Network\IP::fromStringIP(IPUtils::sanitizeIp($element));

diff --git a/core/Intl/Locale.php b/core/Intl/Locale.php
@@ -15,16 +15,16 @@ class Locale
      */
     public static function setLocale($locale)
     {
-        if(!is_array($locale)) {
+        if (!is_array($locale)) {
             $locale = array($locale);
         }
 
         $newLocale = array();
-        foreach($locale as $localePart) {
+        foreach ($locale as $localePart) {
             $newLocale[] = $localePart;
 
             $localeVariant = str_replace('UTF-8', 'UTF8', $localePart);
-            if($localeVariant != $localePart) {
+            if ($localeVariant != $localePart) {
                 $newLocale[] = $localeVariant;
             }
         }

diff --git a/core/Plugin.php b/core/Plugin.php
@@ -469,7 +469,7 @@ public function getMissingDependenciesAsString($piwikVersion = null)
 
             $missingDependencies = $dependency->getMissingDependencies($this->pluginInformation['require']);
 
-            if(empty($missingDependencies)) {
+            if (empty($missingDependencies)) {
                 return '';
             }
 

diff --git a/core/Plugin/MetadataLoader.php b/core/Plugin/MetadataLoader.php
@@ -60,7 +60,7 @@ public function load()
 
         // look for a license file
         $licenseFile = $this->getPathToLicenseFile();
-        if(!empty($licenseFile)) {
+        if (!empty($licenseFile)) {
             $plugin['license_file'] = $licenseFile;
         }
 

diff --git a/core/Plugin/ViewDataTable.php b/core/Plugin/ViewDataTable.php
@@ -576,7 +576,7 @@ private function overrideViewPropertiesWithParams($overrideParams)
     public function throwWhenSettingNonOverridableParameter($overrideParams)
     {
         $nonOverridableParams = $this->getNonOverridableParams($overrideParams);
-        if(count($nonOverridableParams) > 0) {
+        if (count($nonOverridableParams) > 0) {
             throw new \Exception(sprintf(
                 "Setting parameters %s is not allowed. Please report this bug to the Matomo team.",
                 implode(" and ", $nonOverridableParams)

diff --git a/core/Scheduler/Scheduler.php b/core/Scheduler/Scheduler.php
@@ -171,7 +171,7 @@ public function run()
 
                     // Task has thrown an exception and should be scheduled for a retry
                     if ($this->scheduleRetry) {
-                        if($this->timetable->getRetryCount($taskName) == 3) {
+                        if ($this->timetable->getRetryCount($taskName) == 3) {
                             // Task has already been retried three times, give up
                             $this->timetable->clearRetryCount($taskName);
 

diff --git a/core/Segment.php b/core/Segment.php
@@ -588,7 +588,7 @@ public function getSelectQuery($select, $from, $where = false, $bind = array(),
         $segmentExpression = $this->segmentExpression;
 
         $limitAndOffset = null;
-        if($limit > 0) {
+        if ($limit > 0) {
             $limitAndOffset = (int) $offset . ', ' . (int) $limit;
         }
 

diff --git a/core/SettingsPiwik.php b/core/SettingsPiwik.php
@@ -272,7 +272,7 @@ public static function isInternetEnabled(): bool
     public static function isAutoUpdateEnabled(): bool
     {
         $enableAutoUpdate = (bool) Config::getInstance()->General['enable_auto_update'];
-        if(self::isInternetEnabled() === true && $enableAutoUpdate === true) {
+        if (self::isInternetEnabled() === true && $enableAutoUpdate === true) {
             return true;
         }