Skip to content

Commit dafc72c

Browse files
committed
for consistency use for all *Name methods
1 parent 4222ae1 commit dafc72c

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

ext/zip/php_zip.stub.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,13 @@ public function deleteIndex(int $index) {}
138138
public function deleteName(string $name) {}
139139

140140
/** @return array|false */
141-
public function statName(string $filename, int $flags = 0) {}
141+
public function statName(string $name, int $flags = 0) {}
142142

143143
/** @return array|false */
144144
public function statIndex(int $index, int $flags = 0) {}
145145

146146
/** @return int|false */
147-
public function locateName(string $filename, int $flags = 0) {}
147+
public function locateName(string $name, int $flags = 0) {}
148148

149149
/** @return string|false */
150150
public function getNameIndex(int $index, int $flags = 0) {}
@@ -165,13 +165,13 @@ public function unchangeName(string $name) {}
165165
public function extractTo(string $pathto, array|string|null $files = null) {}
166166

167167
/** @return string|false */
168-
public function getFromName(string $entryname, int $len = 0, int $flags = 0) {}
168+
public function getFromName(string $name, int $len = 0, int $flags = 0) {}
169169

170170
/** @return string|false */
171171
public function getFromIndex(int $index, int $len = 0, int $flags = 0) {}
172172

173173
/** @return resource|false */
174-
public function getStream(string $entryname) {}
174+
public function getStream(string $name) {}
175175

176176
#ifdef ZIP_OPSYS_DEFAULT
177177
/** @return bool */

ext/zip/php_zip_arginfo.h

Lines changed: 5 additions & 7 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: 58d4035ad8d21582e93091d5c14f78640c1a17c3 */
2+
* Stub hash: 4ca2b108e71924309abcdc1a0f86f5963a8516f3 */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_open, 0, 0, 1)
55
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
@@ -157,11 +157,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_deleteName, 0, 0, 1)
157157
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
158158
ZEND_END_ARG_INFO()
159159

160-
#define arginfo_class_ZipArchive_statName arginfo_class_ZipArchive_open
160+
#define arginfo_class_ZipArchive_statName arginfo_class_ZipArchive_getCommentName
161161

162162
#define arginfo_class_ZipArchive_statIndex arginfo_class_ZipArchive_getCommentIndex
163163

164-
#define arginfo_class_ZipArchive_locateName arginfo_class_ZipArchive_open
164+
#define arginfo_class_ZipArchive_locateName arginfo_class_ZipArchive_getCommentName
165165

166166
#define arginfo_class_ZipArchive_getNameIndex arginfo_class_ZipArchive_getCommentIndex
167167

@@ -179,7 +179,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_extractTo, 0, 0, 1)
179179
ZEND_END_ARG_INFO()
180180

181181
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_getFromName, 0, 0, 1)
182-
ZEND_ARG_TYPE_INFO(0, entryname, IS_STRING, 0)
182+
ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
183183
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, len, IS_LONG, 0, "0")
184184
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
185185
ZEND_END_ARG_INFO()
@@ -190,9 +190,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_getFromIndex, 0, 0, 1)
190190
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0")
191191
ZEND_END_ARG_INFO()
192192

193-
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_getStream, 0, 0, 1)
194-
ZEND_ARG_TYPE_INFO(0, entryname, IS_STRING, 0)
195-
ZEND_END_ARG_INFO()
193+
#define arginfo_class_ZipArchive_getStream arginfo_class_ZipArchive_deleteName
196194

197195
#if defined(ZIP_OPSYS_DEFAULT)
198196
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZipArchive_setExternalAttributesName, 0, 0, 3)

0 commit comments

Comments
 (0)