Changeset 48788 for trunk

Timestamp:

08/12/2020 03:03:50 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Remove final keyword from private methods.

Declaring a private method as final is an oxymoron, as private methods cannot be overloaded anyway.

Using final private function... will generate a warning in PHP 8.

Props jrf.
Fixes #50897.

Location:

trunk

Files:

• src/wp-includes/class-wp-session-tokens.php (modified) (1 diff)
• tests/phpunit/tests/user/capabilities.php (modified) (4 diffs)

trunk/src/wp-includes/class-wp-session-tokens.php

@@ -67 +67 @@
      * @return string A hash of the session token (a verifier).
      */
-    final private function hash_token( $token ) {
+    private function hash_token( $token ) {
         // If ext/hash is not present, use sha1() instead.
         if ( function_exists( 'hash' ) ) {

trunk/tests/phpunit/tests/user/capabilities.php

@@ -74 +74 @@
     }
 
-    final private function _getSingleSitePrimitiveCaps() {
+    private function _getSingleSitePrimitiveCaps() {
         return array(
 
@@ -156 +156 @@
     }
 
-    final private function _getMultiSitePrimitiveCaps() {
+    private function _getMultiSitePrimitiveCaps() {
         return array(
 
@@ -239 +239 @@
     }
 
-    final private function _getSingleSiteMetaCaps() {
+    private function _getSingleSiteMetaCaps() {
         return array(
             'create_sites'                => array(),
@@ -277 +277 @@
     }
 
-    final private function _getMultiSiteMetaCaps() {
+    private function _getMultiSiteMetaCaps() {
         return array(
             'create_sites'                => array(),