[Coding Style] Enable rules Squiz.Functions.FunctionDeclarationArgume…

…ntSpacing.* (#21826) * Enable rules Squiz.Functions.FunctionDeclarationArgumentSpacing.* * Apply CS --------- Co-authored-by: Marc Neudert <[email protected]>
matomo-org · Jan 18, 2024 · 1d0691c · 1d0691c
1 parent d12b0a7
commit 1d0691c
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 35 deletions.
diff --git a/core/Db/Adapter.php b/core/Db/Adapter.php
@@ -23,7 +23,7 @@ class Adapter
      * @param bool $connect
      * @return AdapterInterface
      */
-    public static function factory($adapterName, & $dbInfos, $connect = true)
+    public static function factory($adapterName, &$dbInfos, $connect = true)
     {
         if ($connect) {
             if (isset($dbInfos['port']) && is_string($dbInfos['port']) && $dbInfos['port'][0] === '/') {

diff --git a/core/DeviceDetector/DeviceDetectorCache.php b/core/DeviceDetector/DeviceDetectorCache.php
@@ -61,7 +61,7 @@ public function fetch($id)
      * @throws \Exception
      * @return bool  True if the entry was successfully stored
      */
-    public function save($id, $content, $ttl=0): bool
+    public function save($id, $content, $ttl = 0): bool
     {
         if (empty($id)) {
             return false;

diff --git a/core/Exception/RedirectException.php b/core/Exception/RedirectException.php
@@ -23,7 +23,7 @@ class RedirectException extends \Piwik\Exception\Exception implements IRedirectE
      * @param string $redirectTo
      * @param int $countdown
      */
-    public function __construct($message, $redirectTo, $countdown=5)
+    public function __construct($message, $redirectTo, $countdown = 5)
     {
         $this->redirectTo = $redirectTo;
         $this->countdown = $countdown;

diff --git a/core/Intl/Data/Provider/DateTimeFormatProvider.php b/core/Intl/Data/Provider/DateTimeFormatProvider.php
@@ -82,7 +82,7 @@ public function uses12HourClock()
      *
      * @return string
      */
-    public function getRangeFormatPattern($short=false, $maxDifference='Y')
+    public function getRangeFormatPattern($short = false, $maxDifference = 'Y')
     {
         if ($short) {
             return 'MMM d, y – MMM d, y';

diff --git a/core/NumberFormatter.php b/core/NumberFormatter.php
@@ -65,7 +65,7 @@ protected function parsePattern($pattern)
      * @param int $minimumFractionDigits
      * @return mixed|string
      */
-    public function format($value, $maximumFractionDigits=0, $minimumFractionDigits=0)
+    public function format($value, $maximumFractionDigits = 0, $minimumFractionDigits = 0)
     {
         if (is_string($value)
             && trim($value, '%') != $value
@@ -86,7 +86,7 @@ public function format($value, $maximumFractionDigits=0, $minimumFractionDigits=
      * @param int $minimumFractionDigits
      * @return mixed|string
      */
-    public function formatNumber($value, $maximumFractionDigits=0, $minimumFractionDigits=0)
+    public function formatNumber($value, $maximumFractionDigits = 0, $minimumFractionDigits = 0)
     {
         $pattern = $this->getPattern($value, 'Intl_NumberFormatNumber');
 
@@ -100,7 +100,7 @@ public function formatNumber($value, $maximumFractionDigits=0, $minimumFractionD
      * @param int $minimumFractionDigits
      * @return mixed|string
      */
-    public function formatPercent($value, $maximumFractionDigits=0, $minimumFractionDigits=0)
+    public function formatPercent($value, $maximumFractionDigits = 0, $minimumFractionDigits = 0)
     {
         $newValue = trim($value, " \0\x0B%");
         if (!is_numeric($newValue)) {
@@ -140,7 +140,7 @@ public function formatPercentEvolution($value)
      * @param int $precision
      * @return mixed|string
      */
-    public function formatCurrency($value, $currency, $precision=2)
+    public function formatCurrency($value, $currency, $precision = 2)
     {
         $newValue = trim(strval($value), " \0\x0B$currency");
         if (!is_numeric($newValue)) {
@@ -190,7 +190,7 @@ protected function getPattern($value, $translationId)
      * @param int $minimumFractionDigits
      * @return mixed|string
      */
-    protected function formatNumberWithPattern($pattern, $value, $maximumFractionDigits=0, $minimumFractionDigits=0)
+    protected function formatNumberWithPattern($pattern, $value, $maximumFractionDigits = 0, $minimumFractionDigits = 0)
     {
         if (!is_numeric($value)) {
             return $value;

diff --git a/core/Tracker/Action.php b/core/Tracker/Action.php
@@ -127,7 +127,7 @@ public static function factory(Request $request)
      * @return bool
      * @throws Exception
      */
-    public static function isCustomActionRequest(Request  $request)
+    public static function isCustomActionRequest(Request $request)
     {
         return $request->hasParam('ca') && $request->getParam('ca');
     }

diff --git a/core/Tracker/Request.php b/core/Tracker/Request.php
@@ -96,7 +96,7 @@ public function __construct($params, $tokenAuth = false)
             $this->getIdSiteIfExists());
     }
 
-    protected function replaceUnsupportedUtf8Chars($value, $key=false)
+    protected function replaceUnsupportedUtf8Chars($value, $key = false)
     {
         $dbSettings   = new \Piwik\Db\Settings();
         $charset      = $dbSettings->getUsedCharset();

diff --git a/phpcs.xml b/phpcs.xml
@@ -55,14 +55,6 @@
         <exclude name="Squiz.ControlStructures.ForLoopDeclaration.NoSpaceAfterFirst" />
         <exclude name="Squiz.ControlStructures.ForLoopDeclaration.NoSpaceAfterSecond" />
         <exclude name="Squiz.Functions.FunctionDeclaration.Found" />
-        <exclude name="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpaceAfterEquals" />
-        <exclude name="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpaceBeforeComma" />
-        <exclude name="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpaceBeforeEquals" />
-        <exclude name="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterHint" />
-        <exclude name="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterReference" />
-        <exclude name="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingBeforeArg" />
-        <exclude name="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingBeforeHint" />
-        <exclude name="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingBetween" />
         <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.BraceOnSameLine" />
         <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.CloseBracketLine" />
         <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.FirstParamSpacing" />

diff --git a/plugins/Actions/ArchivingHelper.php b/plugins/Actions/ArchivingHelper.php
@@ -197,7 +197,7 @@ public static function updateActionsTableWithRowQuery($query, $fieldQueried, $ac
      * @return int  Number of rows processed
      * @throws \Exception
      */
-    public static function updateActionsTableWithGoals($resultSet,  bool $isPages): int
+    public static function updateActionsTableWithGoals($resultSet, bool $isPages): int
     {
         $rowsProcessed = 0;
 

diff --git a/plugins/Dashboard/API.php b/plugins/Dashboard/API.php
@@ -92,7 +92,7 @@ public function createNewDashboardForUser($login, $dashboardName = '', $addDefau
      * @param int $idDashboard id of the dashboard to be removed
      * @param string $login  Login of the dashboard user [defaults to current user]
      */
-    public function removeDashboard($idDashboard, $login='')
+    public function removeDashboard($idDashboard, $login = '')
     {
         $login = $login ? $login : Piwik::getCurrentUserLogin();
 
@@ -150,7 +150,7 @@ public function copyDashboardToUser($idDashboard, $copyToUser, $dashboardName =
      * @param string $login user the dashboard belongs
      *
      */
-    public function resetDashboardLayout($idDashboard, $login='')
+    public function resetDashboardLayout($idDashboard, $login = '')
     {
         $login = $login ?: Piwik::getCurrentUserLogin();
 

diff --git a/plugins/Ecommerce/Columns/Revenue.php b/plugins/Ecommerce/Columns/Revenue.php
@@ -53,7 +53,7 @@ public function configureSegments(SegmentsList $segmentsList, DimensionSegmentFa
         $segment->setName(Piwik::translate('Ecommerce_RevenueLeftInCart'));
         $segment->setSegment('revenueAbandonedCart');
         $segment->setSqlSegment('log_conversion.idvisit');
-        $segment->setSqlFilter(function ($valueToMatch, $sqlField , $matchType) {
+        $segment->setSqlFilter(function ($valueToMatch, $sqlField, $matchType) {
             return $this->getRevenueQuery($valueToMatch, $sqlField, $matchType, -1);
         });
         $segmentsList->addSegment($dimensionSegmentFactory->createSegment($segment));
@@ -67,7 +67,7 @@ public function configureSegments(SegmentsList $segmentsList, DimensionSegmentFa
      * @param false $cart
      * @return array
      */
-    private function getRevenueQuery($valueToMatch, $sqlField , $matchType, $idGoal)
+    private function getRevenueQuery($valueToMatch, $sqlField, $matchType, $idGoal)
     {
         //supported operator type
         $supportType = [

diff --git a/plugins/Feedback/API.php b/plugins/Feedback/API.php
@@ -87,7 +87,7 @@ public function sendFeedbackForFeature($featureName, $like = null, $choice = nul
      * @throws \Piwik\NoAccessException
      * @throws \Exception
      */
-    public function sendFeedbackForSurvey($question,  $message = false)
+    public function sendFeedbackForSurvey($question, $message = false)
     {
         Piwik::checkUserIsNotAnonymous();
         Piwik::checkUserHasSomeViewAccess();

diff --git a/plugins/Intl/Commands/GenerateIntl.php b/plugins/Intl/Commands/GenerateIntl.php
@@ -496,7 +496,7 @@ protected function fetchTimeZoneData($langCode, $requestLangCode, &$translations
         }
     }
 
-    protected function transformDateFormat($dateFormat, $changes=array())
+    protected function transformDateFormat($dateFormat, $changes = array())
     {
         if(!empty($changes)) {
             $dateFormat = str_replace(array_keys($changes), array_values($changes), $dateFormat);

diff --git a/plugins/Intl/DateTimeFormatProvider.php b/plugins/Intl/DateTimeFormatProvider.php
@@ -94,7 +94,7 @@ public function getFormatPattern($format)
      *
      * @return string
      */
-    public function getRangeFormatPattern($short=false, $maxDifference='Y')
+    public function getRangeFormatPattern($short = false, $maxDifference = 'Y')
     {
         return $this->translator->translate(
             sprintf(

diff --git a/plugins/LanguagesManager/API.php b/plugins/LanguagesManager/API.php
@@ -102,7 +102,7 @@ public function getAvailableLanguages($_ignoreConfig = false)
      *
      * @return array Array of arrays
      */
-    public function getAvailableLanguagesInfo($excludeNonCorePlugins=true, $_ignoreConfig = false)
+    public function getAvailableLanguagesInfo($excludeNonCorePlugins = true, $_ignoreConfig = false)
     {
         $data = file_get_contents(PIWIK_INCLUDE_PATH . '/lang/en.json');
         $englishTranslation = json_decode($data, true);

diff --git a/plugins/Live/API.php b/plugins/Live/API.php
@@ -380,7 +380,7 @@ private function loadLastVisitsDetailsFromDatabase($idSite, $period, $date, $seg
      * @return DataTable
      * @throws Exception
      */
-    private function makeVisitorTableFromArray($data, $hasMoreVisits=null)
+    private function makeVisitorTableFromArray($data, $hasMoreVisits = null)
     {
         $dataTable = new DataTable();
 

diff --git a/plugins/Live/tests/Integration/ModelTest.php b/plugins/Live/tests/Integration/ModelTest.php
@@ -504,7 +504,7 @@ public function test_splitDatesIntoMultipleQueries_noStartDate()
         $this->assertEquals(array('2012-02-19 04:01:00 2012-02-20 04:01:00', '2012-02-12 04:01:00 2012-02-19 04:00:59', '2012-01-13 04:01:00 2012-02-12 04:00:59', '2011-01-01 04:01:00 2012-01-13 04:00:59', ' 2011-01-01 04:00:59'), $dates);
     }
 
-    private function splitDatesIntoMultipleQueries($startDate, $endDate, $limit, $offset, $order='desc')
+    private function splitDatesIntoMultipleQueries($startDate, $endDate, $limit, $offset, $order = 'desc')
     {
         if ($startDate) {
             $startDate = Date::factory($startDate);

diff --git a/plugins/MobileMessaging/MobileMessaging.php b/plugins/MobileMessaging/MobileMessaging.php
@@ -224,7 +224,7 @@ public function getReportRecipients(&$recipients, $reportType, $report)
      * @param $force
      */
     public function sendReport($reportType, $report, $contents, $filename, $prettyDate, $reportSubject, $reportTitle,
-                               $additionalFiles,  $period, $force)
+                               $additionalFiles, $period, $force)
     {
         if (self::manageEvent($reportType)) {
             $parameters = $report['parameters'];

diff --git a/plugins/PagePerformance/Controller.php b/plugins/PagePerformance/Controller.php
@@ -75,7 +75,7 @@ protected function getEvolutionTable()
      * @return string|void
      * @throws \Exception
      */
-    public function getRowEvolutionGraph($dataTable=null)
+    public function getRowEvolutionGraph($dataTable = null)
     {
         $this->checkSitePermission();
 

diff --git a/plugins/UsersManager/tests/Integration/UsersManagerTest.php b/plugins/UsersManager/tests/Integration/UsersManagerTest.php
@@ -320,8 +320,7 @@ public function test_addUser_shouldNotAllowAdminUsersToCreateUsers_WithNoInitial
         $this->api->addUser('userLogin2', 'password', '[email protected]');
     }
 
-    public function test_addUser_shouldNotAllowAdminUsersToCreateUsersWithAccessToSite_ThatAdminUserDoesNotHaveAccessTo(
-    )
+    public function test_addUser_shouldNotAllowAdminUsersToCreateUsersWithAccessToSite_ThatAdminUserDoesNotHaveAccessTo()
     {
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('checkUserHasAdminAccess Fake exception');

diff --git a/tests/PHPUnit/Integration/HttpTest.php b/tests/PHPUnit/Integration/HttpTest.php
@@ -477,7 +477,7 @@ public function getProtocolUrls()
     /**
      * @dataProvider getBlockedHostUrls
      */
-    public function test_blocked_hosts($url, $isValid, $message='')
+    public function test_blocked_hosts($url, $isValid, $message = '')
     {
         EventDispatcher::getInstance()->addObserver('Http.sendHttpRequest', function($aUrl, $httpEventParams, &$response, &$status, &$headers) {
             $response = 'prevented request';