Skip to content

Commit be2500f

Browse files
committed
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0: Fix param name order for Phar::copy()
2 parents 8d069d2 + 0d0c9ac commit be2500f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ext/phar/phar_object.stub.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function convertToExecutable(?int $format = null, ?int $compression = nul
4646
public function convertToData(?int $format = null, ?int $compression = null, ?string $extension = null): ?PharData {}
4747

4848
/** @return bool */
49-
public function copy(string $to, string $from) {} // TODO make return type void
49+
public function copy(string $from, string $to) {} // TODO make return type void
5050

5151
/** @tentative-return-type */
5252
public function count(int $mode = COUNT_NORMAL): int {}
@@ -261,7 +261,7 @@ public function convertToData(?int $format = null, ?int $compression = null, ?st
261261
* @return bool
262262
* @implementation-alias Phar::copy
263263
*/
264-
public function copy(string $to, string $from) {} // TODO make return type void
264+
public function copy(string $from, string $to) {} // TODO make return type void
265265

266266
/**
267267
* @tentative-return-type

ext/phar/phar_object_arginfo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: ddb04eb0a40f19ad06cb351e545895a8dd58fece */
2+
* Stub hash: cce88c2e27bd0b0fc7f68defdb0556b053e7dc81 */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Phar___construct, 0, 0, 1)
55
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
@@ -62,8 +62,8 @@ ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_Phar_convertToDat
6262
ZEND_END_ARG_INFO()
6363

6464
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Phar_copy, 0, 0, 2)
65-
ZEND_ARG_TYPE_INFO(0, to, IS_STRING, 0)
6665
ZEND_ARG_TYPE_INFO(0, from, IS_STRING, 0)
66+
ZEND_ARG_TYPE_INFO(0, to, IS_STRING, 0)
6767
ZEND_END_ARG_INFO()
6868

6969
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Phar_count, 0, 0, IS_LONG, 0)

0 commit comments

Comments
 (0)