Commit e2d191f710 for wordpress.org

commit e2d191f7105be2c9f06c80579e17be7e1a043d0c
Author: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date:   Sat Oct 17 16:36:07 2020 +0000

    Revisions: Explicitly declare the `Text_Diff::_getTempDir()` method as `static`.

    This fixes a "Non-static method cannot be called statically" fatal error on PHP 8.

    Props jrf.
    Fixes #51559.
    Built from https://develop.svn.wordpress.org/trunk@49185


    git-svn-id: http://core.svn.wordpress.org/trunk@48947 1a063a9b-81f0-0310-95a4-ce76da25c4cd

diff --git a/wp-includes/Text/Diff.php b/wp-includes/Text/Diff.php
index f9452f2600..ab1c9a26dd 100644
--- a/wp-includes/Text/Diff.php
+++ b/wp-includes/Text/Diff.php
@@ -220,14 +220,12 @@ class Text_Diff {
     /**
      * Determines the location of the system temporary directory.
      *
-     * @static
-     *
      * @access protected
      *
      * @return string  A directory name which can be used for temp files.
      *                 Returns false if one could not be found.
      */
-    function _getTempDir()
+    static function _getTempDir()
     {
         $tmp_locations = array('/tmp', '/var/tmp', 'c:\WUTemp', 'c:\temp',
                                'c:\windows\temp', 'c:\winnt\temp');
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 81000a43a0..772b5bb9fa 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.6-alpha-49184';
+$wp_version = '5.6-alpha-49185';

 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.