[Coding Style] Enable rule PSR2.Methods.MethodDeclaration.Underscore (#…

…22128) * [Coding Style] Enable rule PSR2.Methods.MethodDeclaration.Underscore * Apply CS
matomo-org · Apr 16, 2024 · f6d02d9 · f6d02d9
1 parent 2a63278
commit f6d02d9
Show file tree

Hide file tree

Showing 18 changed files with 328 additions and 329 deletions.
diff --git a/core/Db/Adapter/Mysqli.php b/core/Db/Adapter/Mysqli.php
@@ -76,7 +76,7 @@ public static function getDefaultPort()
         return 3306;
     }
 
-    protected function _connect()
+    protected function _connect() // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
     {
         if ($this->_connection) {
             return;

diff --git a/core/Db/Adapter/Pdo/Mysql.php b/core/Db/Adapter/Pdo/Mysql.php
@@ -99,7 +99,7 @@ public function getConnection()
         return $this->_connection;
     }
 
-    protected function _connect()
+    protected function _connect() // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
     {
         if ($this->_connection) {
             return;
@@ -341,7 +341,7 @@ public function query($sql, $bind = array())
      * if unix_socket is set since setting both causes unexpected behaviour
      * @see http://php.net/manual/en/ref.pdo-mysql.connection.php
      */
-    protected function _dsn()
+    protected function _dsn() // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
     {
         if (!empty($this->_config['unix_socket'])) {
             unset($this->_config['host']);

diff --git a/phpcs.xml b/phpcs.xml
@@ -32,7 +32,6 @@
         <exclude name="PSR12.Files.FileHeader" />
         <exclude name="PSR12.Properties.ConstantVisibility" />
         <exclude name="PSR2.Classes.PropertyDeclaration.Underscore" />
-        <exclude name="PSR2.Methods.MethodDeclaration.Underscore" />
     </rule>
 
     <rule ref="Squiz.Classes.ValidClassName.NotCamelCaps">

diff --git a/plugins/Dashboard/Controller.php b/plugins/Dashboard/Controller.php
@@ -32,7 +32,7 @@ protected function init()
         $this->dashboard = new Dashboard();
     }
 
-    protected function _getDashboardView($template)
+    protected function getDashboardView($template)
     {
         $view = new View($template);
         $this->setGeneralVariablesView($view);
@@ -48,14 +48,14 @@ protected function _getDashboardView($template)
     // this
     public function embeddedIndex()
     {
-        $view = $this->_getDashboardView('@Dashboard/embeddedIndex');
+        $view = $this->getDashboardView('@Dashboard/embeddedIndex');
         return $view->render();
     }
 
     // this is the exported widget
     public function index()
     {
-        $view = $this->_getDashboardView('@Dashboard/index');
+        $view = $this->getDashboardView('@Dashboard/index');
         $view->hasSomeAdminAccess = Piwik::isUserHasSomeAdminAccess();
         $view->dashboards = array();
         if (!Piwik::isUserIsAnonymous()) {

diff --git a/plugins/LanguagesManager/TranslationWriter/Filter/ByParameterCount.php b/plugins/LanguagesManager/TranslationWriter/Filter/ByParameterCount.php
@@ -44,8 +44,8 @@ public function filter($translations)
                 }
 
                 // ensure that translated strings have the same number of %s as the english source strings
-                $baseCount = $this->_getParametersCountToReplace($baseTranslation);
-                $translationCount = $this->_getParametersCountToReplace($translation);
+                $baseCount = $this->getParametersCountToReplace($baseTranslation);
+                $translationCount = $this->getParametersCountToReplace($translation);
 
                 if ($baseCount != $translationCount) {
                     $this->filteredData[$pluginName][$key] = $translation;
@@ -65,7 +65,7 @@ public function filter($translations)
      * @param string $string
      * @return array
      */
-    protected function _getParametersCountToReplace($string)
+    protected function getParametersCountToReplace($string)
     {
         $sprintfParameters = array('%s', '%1$s', '%2$s', '%3$s', '%4$s', '%5$s', '%6$s', '%7$s', '%8$s', '%9$s');
         $count = array();

diff --git a/plugins/Login/tests/Integration/LoginTest.php b/plugins/Login/tests/Integration/LoginTest.php
@@ -141,7 +141,7 @@ public function test_authenticate_successAnonymous()
 
     public function test_authenticate_failureUserEmptyTokenAuth()
     {
-        $user = $this->_setUpUser();
+        $user = $this->setUpUser();
 
         // empty token auth
         $rc = $this->authenticate($login = $user['login'], $authToken = '');
@@ -150,7 +150,7 @@ public function test_authenticate_failureUserEmptyTokenAuth()
 
     public function test_authenticate_failureUserInvalidTokenAuth()
     {
-        $user = $this->_setUpUser();
+        $user = $this->setUpUser();
 
         // not a token auth
         $rc = $this->authenticate($login = $user['login'], $authToken = $user['password']);
@@ -159,7 +159,7 @@ public function test_authenticate_failureUserInvalidTokenAuth()
 
     public function test_authenticate_failureUserInvalidTokenAuth2()
     {
-        $user = $this->_setUpUser();
+        $user = $this->setUpUser();
 
         // not a token auth
         $rc = $this->authenticate($login = $user['login'], $authToken = md5($user['password']));
@@ -168,7 +168,7 @@ public function test_authenticate_failureUserInvalidTokenAuth2()
 
     public function test_authenticate_failureUserEmptyLogin()
     {
-        $user = $this->_setUpUser();
+        $user = $this->setUpUser();
 
         // empty login
         $rc = $this->authenticate($login = '', $user['tokenAuth']);
@@ -177,8 +177,8 @@ public function test_authenticate_failureUserEmptyLogin()
 
     public function test_authenticate_failureUserWithSuperUserAccessEmptyLogin()
     {
-        $user = $this->_setUpUser();
-        $this->_setUpSuperUserAccessViaDb();
+        $user = $this->setUpUser();
+        $this->setUpSuperUserAccessViaDb();
 
         // empty login
         $rc = $this->authenticate($login = '', $user['tokenAuth']);
@@ -187,7 +187,7 @@ public function test_authenticate_failureUserWithSuperUserAccessEmptyLogin()
 
     public function test_authenticate_failureUserLoginTokenAuthMissmatch()
     {
-        $this->_setUpUser();
+        $this->setUpUser();
 
         // not equal
         $rc = $this->authenticate($login = 0, $authToken = 0);
@@ -196,7 +196,7 @@ public function test_authenticate_failureUserLoginTokenAuthMissmatch()
 
     public function test_authenticate_failureUserLoginTokenAuthMissmatch2()
     {
-        $user = $this->_setUpUser();
+        $user = $this->setUpUser();
 
         // not equal
         $rc = $this->authenticate($login = 0, $user['tokenAuth']);
@@ -205,7 +205,7 @@ public function test_authenticate_failureUserLoginTokenAuthMissmatch2()
 
     public function test_authenticate_failureUserLoginTokenAuthMissmatch3()
     {
-        $user = $this->_setUpUser();
+        $user = $this->setUpUser();
 
         // not equal
         $rc = $this->authenticate($user['login'], $authToken = 0);
@@ -214,8 +214,8 @@ public function test_authenticate_failureUserLoginTokenAuthMissmatch3()
 
     public function test_authenticate_failureUserWithSuperUserAccessLoginTokenAuthMissmatch()
     {
-        $user = $this->_setUpUser();
-        $this->_setUpSuperUserAccessViaDb();
+        $user = $this->setUpUser();
+        $this->setUpSuperUserAccessViaDb();
 
         // not equal
         $rc = $this->authenticate($login = null, $authToken = $user['password']);
@@ -224,7 +224,7 @@ public function test_authenticate_failureUserWithSuperUserAccessLoginTokenAuthMi
 
     public function test_authenticate_successUserTokenAuth()
     {
-        $user = $this->_setUpUser();
+        $user = $this->setUpUser();
 
         // API authentication
         $rc = $this->authenticate($login = null, $user['tokenAuth']);
@@ -233,8 +233,8 @@ public function test_authenticate_successUserTokenAuth()
 
     public function test_authenticate_successUserWithSuperUserAccessByTokenAuth()
     {
-        $user = $this->_setUpUser();
-        $this->_setUpSuperUserAccessViaDb();
+        $user = $this->setUpUser();
+        $this->setUpSuperUserAccessViaDb();
 
         // API authentication
         $rc = $this->authenticate($login = null, $user['tokenAuth']);
@@ -245,7 +245,7 @@ public function test_authenticate_successUserLoginAndTokenAuthWithAnonymous()
     {
         DbHelper::createAnonymousUser();
 
-        $user = $this->_setUpUser();
+        $user = $this->setUpUser();
 
         // valid login & token auth
         $rc = $this->authenticate('anonymous', 'anonymous');
@@ -254,7 +254,7 @@ public function test_authenticate_successUserLoginAndTokenAuthWithAnonymous()
 
     public function test_authenticate_successUserLoginAndTokenAuth()
     {
-        $user = $this->_setUpUser();
+        $user = $this->setUpUser();
 
         // valid login & token auth
         $rc = $this->authenticate($user['login'], $user['tokenAuth']);
@@ -263,8 +263,8 @@ public function test_authenticate_successUserLoginAndTokenAuth()
 
     public function test_authenticate_successUserWithSuperUserAccessLoginAndTokenAuth()
     {
-        $user = $this->_setUpUser();
-        $this->_setUpSuperUserAccessViaDb();
+        $user = $this->setUpUser();
+        $this->setUpSuperUserAccessViaDb();
 
         // valid login & token auth
         $rc = $this->authenticate($user['login'], $user['tokenAuth']);
@@ -273,7 +273,7 @@ public function test_authenticate_successUserWithSuperUserAccessLoginAndTokenAut
 
     public function test_authenticate_successWithValidPassword()
     {
-        $user = $this->_setUpUser();
+        $user = $this->setUpUser();
         $this->auth->setLogin($user['login']);
         $this->auth->setPassword($user['password']);
 
@@ -286,8 +286,8 @@ public function test_authenticate_successWithValidPassword()
 
     public function test_authenticate_successWithSuperUserPassword()
     {
-        $user = $this->_setUpUser();
-        $this->_setUpSuperUserAccessViaDb();
+        $user = $this->setUpUser();
+        $this->setUpSuperUserAccessViaDb();
 
         $this->auth->setLogin($user['login']);
         $this->auth->setPassword($user['password']);
@@ -298,7 +298,7 @@ public function test_authenticate_successWithSuperUserPassword()
 
     public function test_authenticate_failsWithInvalidPassword()
     {
-        $user = $this->_setUpUser();
+        $user = $this->setUpUser();
         $this->auth->setLogin($user['login']);
         $this->auth->setPassword('foo bar');
 
@@ -308,7 +308,7 @@ public function test_authenticate_failsWithInvalidPassword()
 
     public function test_authenticate_prioritizesPasswordAuthentication()
     {
-        $user = $this->_setUpUser();
+        $user = $this->setUpUser();
         $this->auth->setLogin($user['login']);
         $this->auth->setPassword($user['password']); // correct password
         $this->auth->setTokenAuth('foo bar'); // invalid token
@@ -327,7 +327,7 @@ public function test_authenticate_prioritizesPasswordAuthentication()
      */
     public function test_authenticate_withPasswordIsCaseInsensitiveForLogin()
     {
-        $user = $this->_setUpUser();
+        $user = $this->setUpUser();
         $this->auth->setLogin('uSeR');
         $this->auth->setPassword($user['password']);
 
@@ -339,7 +339,7 @@ public function test_authenticate_withPasswordIsCaseInsensitiveForLogin()
         $this->assertTrue(ctype_xdigit($rc->getTokenAuth()));
     }
 
-    protected function _setUpUser()
+    protected function setUpUser()
     {
         $user = array(
           'login'            => 'user',
@@ -359,7 +359,7 @@ protected function _setUpUser()
         return $user;
     }
 
-    private function _setUpSuperUserAccessViaDb()
+    private function setUpSuperUserAccessViaDb()
     {
         $userUpdater = new UserUpdater();
         $userUpdater->setSuperUserAccessWithoutCurrentPassword('user', true);