Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fixed bug #81626

Author: nikic

NEWS

@@ -7,6 +7,8 @@ PHP                                                                        NEWS
     from a trait). (Nikita)
   . Fixed bug #81591 (Fatal Error not properly logged in particular cases).
     (Nikita)
+  . Fixed bug #81626 (Error on use static:: in __сallStatic() wrapped to
+    Closure::fromCallable()). (Nikita)
 
 - FPM:
   . Fixed bug #81513 (Future possibility for heap overflow in FPM zlog).

Zend/tests/bug81626.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Bug #81626: Error on use static:: in __сallStatic() wrapped to Closure::fromCallable()
+--FILE--
+<?php
+class TestClass {
+    public static bool $wasCalled = false;
+    public static function __callStatic(string $name, array $args): string
+    {
+        static::$wasCalled = true;
+        return 'ok';
+    }
+}
+$closure = Closure::fromCallable([TestClass::class, 'foo']);
+var_dump($closure());
+?>
+--EXPECT--
+string(2) "ok"

Zend/zend_closures.c

@@ -288,6 +288,7 @@ static ZEND_NAMED_FUNCTION(zend_closure_call_magic) /* {{{ */ {
 	}
 
 	fcc.object = fci.object = Z_OBJ_P(ZEND_THIS);
+	fcc.called_scope = zend_get_called_scope(EG(current_execute_data));
 
 	zend_call_function(&fci, &fcc);