archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.0' into PHP-8.1

Browse source 
* PHP-8.0:
  Fix param name order for Phar::copy()
This commit is contained in:
George Peter Banyard 2021-09-08 12:32:58 +01:00
commit be2500f229
No known key found for this signature in database
GPG key ID: D49A095D7329F6DC
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/phar/phar_object.stub.php
View file

@ -46,7 +46,7 @@ class Phar extends RecursiveDirectoryIterator implements Countable, ArrayAccess
public function convertToData(?int $format = null, ?int $compression = null, ?string $extension = null): ?PharData {} public function convertToData(?int $format = null, ?int $compression = null, ?string $extension = null): ?PharData {}
/** @return bool */ /** @return bool */
public function copy(string $to, string $from) {} // TODO make return type void public function copy(string $from, string $to) {} // TODO make return type void
/** @tentative-return-type */ /** @tentative-return-type */
public function count(int $mode = COUNT_NORMAL): int {} public function count(int $mode = COUNT_NORMAL): int {}
@ -261,7 +261,7 @@ class PharData extends RecursiveDirectoryIterator implements Countable, ArrayAcc
* @return bool * @return bool
* @implementation-alias Phar::copy * @implementation-alias Phar::copy
*/ */
public function copy(string $to, string $from) {} // TODO make return type void public function copy(string $from, string $to) {} // TODO make return type void
/** /**
* @tentative-return-type * @tentative-return-type

4
ext/phar/phar_object_arginfo.h
View file

@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead. /* This is a generated file, edit the .stub.php file instead.
* Stub hash: ddb04eb0a40f19ad06cb351e545895a8dd58fece */ * Stub hash: cce88c2e27bd0b0fc7f68defdb0556b053e7dc81 */
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Phar___construct, 0, 0, 1) ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Phar___construct, 0, 0, 1)
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) 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
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Phar_copy, 0, 0, 2) ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Phar_copy, 0, 0, 2)
ZEND_ARG_TYPE_INFO(0, to, IS_STRING, 0)
ZEND_ARG_TYPE_INFO(0, from, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, from, IS_STRING, 0)
ZEND_ARG_TYPE_INFO(0, to, IS_STRING, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Phar_count, 0, 0, IS_LONG, 0) ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Phar_count, 0, 0, IS_LONG, 0)