Skip to content

Commit d0c6551

Browse files
EdmondDantesEdmondDantes
authored
Merge branch 'php:master' into true-async-api
2 parents 48f9e03 + 04eadc8 commit d0c6551

36 files changed

+792
-45
lines changed

‎NEWS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? ????, PHP 8.5.0alpha3
44

5+
- Core:
6+
. Add clone-with support to the clone() function. (timwolla, edorian)
7+
8+
- Curl:
9+
. Add support for CURLINFO_CONN_ID in curl_getinfo() (thecaliskan)
10+
. Add support for CURLINFO_QUEUE_TIME_T in curl_getinfo() (thecaliskan)
11+
512
- Sockets:
613
. socket_set_option for multicast context throws a ValueError
714
when the socket family is not of AF_INET/AF_INET6 family. (David Carlier)

‎UPGRADING

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,11 @@ PHP 8.5 UPGRADE NOTES
193193
used by a cURL transfer. It is primarily useful when connection reuse or
194194
connection pooling logic is needed in PHP-level applications. When
195195
curl_getinfo() returns an array, this value is available as the "conn_id" key.
196+
. Added support for CURLINFO_QUEUE_TIME_T (libcurl >= 8.6.0) to the curl_getinfo()
197+
function. This constant allows retrieving the time (in microseconds) that the
198+
request spent in libcurl’s connection queue before it was sent.
199+
This value can also be retrieved by passing CURLINFO_QUEUE_TIME_T to the
200+
curl_getinfo() $option parameter.
196201

197202
- DOM:
198203
. Added Dom\Element::$outerHTML.
@@ -403,7 +408,8 @@ PHP 8.5 UPGRADE NOTES
403408
. get_exception_handler() allows retrieving the current user-defined exception
404409
handler function.
405410
RFC: https://wiki.php.net/rfc/get-error-exception-handler
406-
. The clone language construct is now a function.
411+
. The clone language construct is now a function and supports reassigning
412+
(readonly) properties during cloning via the new $withProperties parameter.
407413
RFC: https://wiki.php.net/rfc/clone_with_v2
408414

409415
- Curl:
@@ -526,6 +532,7 @@ PHP 8.5 UPGRADE NOTES
526532
. CURLINFO_HTTPAUTH_USED.
527533
. CURLINFO_PROXYAUTH_USED.
528534
. CURLINFO_CONN_ID.
535+
. CURLINFO_QUEUE_TIME_T.
529536
. CURLOPT_INFILESIZE_LARGE.
530537
. CURLFOLLOW_ALL.
531538
. CURLFOLLOW_OBEYCODE.

‎Zend/tests/clone/clone_with_001.phpt

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
--TEST--
2+
Clone with basic
3+
--FILE--
4+
<?php
5+
6+
class Dummy { }
7+
8+
$x = new stdClass();
9+
10+
$foo = 'FOO';
11+
$bar = new Dummy();
12+
$array = [
13+
'baz' => 'BAZ',
14+
'array' => [1, 2, 3],
15+
];
16+
17+
var_dump(clone $x);
18+
var_dump(clone($x));
19+
var_dump(clone($x, [ 'foo' => $foo, 'bar' => $bar ]));
20+
var_dump(clone($x, $array));
21+
var_dump(clone($x, [ 'obj' => $x ]));
22+
23+
var_dump(clone($x, [
24+
'abc',
25+
'def',
26+
new Dummy(),
27+
'named' => 'value',
28+
]));
29+
30+
?>
31+
--EXPECTF--
32+
object(stdClass)#%d (0) {
33+
}
34+
object(stdClass)#%d (0) {
35+
}
36+
object(stdClass)#%d (2) {
37+
["foo"]=>
38+
string(3) "FOO"
39+
["bar"]=>
40+
object(Dummy)#%d (0) {
41+
}
42+
}
43+
object(stdClass)#%d (2) {
44+
["baz"]=>
45+
string(3) "BAZ"
46+
["array"]=>
47+
array(3) {
48+
[0]=>
49+
int(1)
50+
[1]=>
51+
int(2)
52+
[2]=>
53+
int(3)
54+
}
55+
}
56+
object(stdClass)#%d (1) {
57+
["obj"]=>
58+
object(stdClass)#%d (0) {
59+
}
60+
}
61+
object(stdClass)#%d (4) {
62+
["0"]=>
63+
string(3) "abc"
64+
["1"]=>
65+
string(3) "def"
66+
["2"]=>
67+
object(Dummy)#%d (0) {
68+
}
69+
["named"]=>
70+
string(5) "value"
71+
}

‎Zend/tests/clone/clone_with_002.phpt

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
--TEST--
2+
Clone with respects visiblity
3+
--FILE--
4+
<?php
5+
6+
class P {
7+
public $a = 'default';
8+
protected $b = 'default';
9+
private $c = 'default';
10+
public private(set) string $d = 'default';
11+
12+
public function m1() {
13+
return clone($this, [ 'a' => 'updated A', 'b' => 'updated B', 'c' => 'updated C', 'd' => 'updated D' ]);
14+
}
15+
}
16+
17+
class C extends P {
18+
public function m2() {
19+
return clone($this, [ 'a' => 'updated A', 'b' => 'updated B', 'c' => 'dynamic C' ]);
20+
}
21+
22+
public function m3() {
23+
return clone($this, [ 'd' => 'inaccessible' ]);
24+
}
25+
}
26+
27+
class Unrelated {
28+
public function m3(P $p) {
29+
return clone($p, [ 'b' => 'inaccessible' ]);
30+
}
31+
}
32+
33+
$p = new P();
34+
35+
var_dump(clone($p, [ 'a' => 'updated A' ]));
36+
var_dump($p->m1());
37+
38+
$c = new C();
39+
var_dump($c->m1());
40+
var_dump($c->m2());
41+
try {
42+
var_dump($c->m3());
43+
} catch (Error $e) {
44+
echo $e::class, ": ", $e->getMessage(), PHP_EOL;
45+
}
46+
47+
try {
48+
var_dump(clone($p, [ 'b' => 'inaccessible' ]));
49+
} catch (Error $e) {
50+
echo $e::class, ": ", $e->getMessage(), PHP_EOL;
51+
}
52+
53+
try {
54+
var_dump(clone($p, [ 'd' => 'inaccessible' ]));
55+
} catch (Error $e) {
56+
echo $e::class, ": ", $e->getMessage(), PHP_EOL;
57+
}
58+
59+
try {
60+
var_dump((new Unrelated())->m3($p));
61+
} catch (Error $e) {
62+
echo $e::class, ": ", $e->getMessage(), PHP_EOL;
63+
}
64+
65+
?>
66+
--EXPECTF--
67+
object(P)#%d (4) {
68+
["a"]=>
69+
string(9) "updated A"
70+
["b":protected]=>
71+
string(7) "default"
72+
["c":"P":private]=>
73+
string(7) "default"
74+
["d"]=>
75+
string(7) "default"
76+
}
77+
object(P)#%d (4) {
78+
["a"]=>
79+
string(9) "updated A"
80+
["b":protected]=>
81+
string(9) "updated B"
82+
["c":"P":private]=>
83+
string(9) "updated C"
84+
["d"]=>
85+
string(9) "updated D"
86+
}
87+
object(C)#%d (4) {
88+
["a"]=>
89+
string(9) "updated A"
90+
["b":protected]=>
91+
string(9) "updated B"
92+
["c":"P":private]=>
93+
string(9) "updated C"
94+
["d"]=>
95+
string(9) "updated D"
96+
}
97+
98+
Deprecated: Creation of dynamic property C::$c is deprecated in %s on line %d
99+
object(C)#%d (5) {
100+
["a"]=>
101+
string(9) "updated A"
102+
["b":protected]=>
103+
string(9) "updated B"
104+
["c":"P":private]=>
105+
string(7) "default"
106+
["d"]=>
107+
string(7) "default"
108+
["c"]=>
109+
string(9) "dynamic C"
110+
}
111+
Error: Cannot modify private(set) property P::$d from scope C
112+
Error: Cannot access protected property P::$b
113+
Error: Cannot modify private(set) property P::$d from global scope
114+
Error: Cannot access protected property P::$b

‎Zend/tests/clone/clone_with_003.phpt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
--TEST--
2+
Clone with supports property hooks
3+
--FILE--
4+
<?php
5+
6+
class Clazz {
7+
public string $hooked = 'default' {
8+
set {
9+
$this->hooked = strtoupper($value);
10+
}
11+
}
12+
}
13+
14+
$c = new Clazz();
15+
16+
var_dump(clone($c, [ 'hooked' => 'updated' ]));
17+
18+
?>
19+
--EXPECTF--
20+
object(Clazz)#%d (1) {
21+
["hooked"]=>
22+
string(7) "UPDATED"
23+
}

‎Zend/tests/clone/clone_with_004.phpt

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
--TEST--
2+
Clone with evaluation order
3+
--FILE--
4+
<?php
5+
6+
class Clazz {
7+
public string $hooked = 'default' {
8+
set {
9+
echo __FUNCTION__, PHP_EOL;
10+
11+
$this->hooked = strtoupper($value);
12+
}
13+
}
14+
15+
public string $maxLength {
16+
set {
17+
echo __FUNCTION__, PHP_EOL;
18+
19+
if (strlen($value) > 5) {
20+
throw new \Exception('Length exceeded');
21+
}
22+
23+
$this->maxLength = $value;
24+
}
25+
}
26+
27+
public string $minLength {
28+
set {
29+
echo __FUNCTION__, PHP_EOL;
30+
31+
if (strlen($value) < 5) {
32+
throw new \Exception('Length unsufficient');
33+
}
34+
35+
$this->minLength = $value;
36+
}
37+
}
38+
}
39+
40+
$c = new Clazz();
41+
42+
var_dump(clone($c, [ 'hooked' => 'updated' ]));
43+
echo PHP_EOL;
44+
var_dump(clone($c, [ 'hooked' => 'updated', 'maxLength' => 'abc', 'minLength' => 'abcdef' ]));
45+
echo PHP_EOL;
46+
var_dump(clone($c, [ 'minLength' => 'abcdef', 'hooked' => 'updated', 'maxLength' => 'abc' ]));
47+
48+
?>
49+
--EXPECTF--
50+
$hooked::set
51+
object(Clazz)#%d (1) {
52+
["hooked"]=>
53+
string(7) "UPDATED"
54+
["maxLength"]=>
55+
uninitialized(string)
56+
["minLength"]=>
57+
uninitialized(string)
58+
}
59+
60+
$hooked::set
61+
$maxLength::set
62+
$minLength::set
63+
object(Clazz)#%d (3) {
64+
["hooked"]=>
65+
string(7) "UPDATED"
66+
["maxLength"]=>
67+
string(3) "abc"
68+
["minLength"]=>
69+
string(6) "abcdef"
70+
}
71+
72+
$minLength::set
73+
$hooked::set
74+
$maxLength::set
75+
object(Clazz)#%d (3) {
76+
["hooked"]=>
77+
string(7) "UPDATED"
78+
["maxLength"]=>
79+
string(3) "abc"
80+
["minLength"]=>
81+
string(6) "abcdef"
82+
}

0 commit comments

Comments
 (0)