Skip to content

Commit 8a6bc67

Browse files
beberleiThomasWeinert
beberlei
and
ThomasWeinert
committed
Consolidate Parameter Names For ext/dom
Co-authored-by: Thomas Weinert <thomas@weinert.info>
1 parent ee00f51 commit 8a6bc67

File tree

2 files changed

+97
-99
lines changed

2 files changed

+97
-99
lines changed

‎ext/dom/php_dom.stub.php

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ class DOMDocumentType
88

99
class DOMCdataSection
1010
{
11-
public function __construct(string $value) {}
11+
public function __construct(string $data) {}
1212
}
1313

1414
class DOMComment
1515
{
16-
public function __construct(string $value = "") {}
16+
public function __construct(string $data = "") {}
1717
}
1818

1919
interface DOMParentNode
@@ -42,16 +42,16 @@ public function replaceWith(...$nodes): void;
4242
class DOMNode
4343
{
4444
/** @return DOMNode|false */
45-
public function appendChild(DOMNode $newChild) {}
45+
public function appendChild(DOMNode $node) {}
4646

4747
/** @return string|false */
48-
public function C14N(bool $exclusive = false, bool $with_comments = false, ?array $xpath = null, ?array $ns_prefixes = null) {}
48+
public function C14N(bool $exclusive = false, bool $withComments = false, ?array $xpath = null, ?array $nsPrefixes = null) {}
4949

5050
/** @return int|false */
51-
public function C14NFile(string $uri, bool $exclusive = false, bool $with_comments = false, ?array $xpath = null, ?array $ns_prefixes = null) {}
51+
public function C14NFile(string $uri, bool $exclusive = false, bool $withComments = false, ?array $xpath = null, ?array $nsPrefixes = null) {}
5252

5353
/** @return DOMNode|false */
54-
public function cloneNode(bool $recursive = false) {}
54+
public function cloneNode(bool $deep = false) {}
5555

5656
/** @return int */
5757
public function getLineNo() {}
@@ -67,13 +67,13 @@ public function hasAttributes() {}
6767
public function hasChildNodes() {}
6868

6969
/** @return DOMNode|false */
70-
public function insertBefore(DOMNode $newChild, ?DOMNode $refChild = null) {}
70+
public function insertBefore(DOMNode $node, ?DOMNode $child = null) {}
7171

7272
/** @return bool */
73-
public function isDefaultNamespace(string $namespaceURI) {}
73+
public function isDefaultNamespace(string $namespace) {}
7474

7575
/** @return bool */
76-
public function isSameNode(DOMNode $other) {}
76+
public function isSameNode(DOMNode $otherNode) {}
7777

7878
/** @return bool */
7979
public function isSupported(string $feature, string $version) {}
@@ -82,16 +82,16 @@ public function isSupported(string $feature, string $version) {}
8282
public function lookupNamespaceURI(?string $prefix) {}
8383

8484
/** @return string|null */
85-
public function lookupPrefix(string $namespaceURI) {}
85+
public function lookupPrefix(string $namespace) {}
8686

8787
/** @return void */
8888
public function normalize() {}
8989

9090
/** @return DOMNode|false */
91-
public function removeChild(DOMNode $oldChild) {}
91+
public function removeChild(DOMNode $child) {}
9292

9393
/** @return DOMNode|false */
94-
public function replaceChild(DOMNode $newChild, DOMNode $oldChild) {}
94+
public function replaceChild(DOMNode $node, DOMNode $child) {}
9595
}
9696

9797
class DOMImplementation
@@ -106,7 +106,7 @@ public function hasFeature(string $feature, string $version) {}
106106
public function createDocumentType(string $qualifiedName, string $publicId = "", string $systemId = "") {}
107107

108108
/** @return DOMDocument|false */
109-
public function createDocument(string $namespaceURI = "", string $qualifiedName = "", ?DOMDocumentType $doctype = null) {}
109+
public function createDocument(string $namespace = "", string $qualifiedName = "", ?DOMDocumentType $doctype = null) {}
110110
}
111111

112112
class DOMDocumentFragment implements DOMParentNode
@@ -173,46 +173,46 @@ public function isId() {}
173173

174174
class DOMElement implements DOMParentNode, DOMChildNode
175175
{
176-
public function __construct(string $name, ?string $value = null, string $uri = "") {}
176+
public function __construct(string $qualifiedName, ?string $value = null, string $namespace = "") {}
177177

178178
/** @return string */
179-
public function getAttribute(string $name) {}
179+
public function getAttribute(string $qualifiedName) {}
180180

181181
/** @return string */
182-
public function getAttributeNS(?string $namespaceURI, string $localName) {}
182+
public function getAttributeNS(?string $namespace, string $localName) {}
183183

184184
/** @return DOMAttr|DOMNamespaceNode|false */
185-
public function getAttributeNode(string $name) {}
185+
public function getAttributeNode(string $qualifiedName) {}
186186

187187
/** @return DOMAttr|DOMNamespaceNode|null */
188-
public function getAttributeNodeNS(?string $namespaceURI, string $localName) {}
188+
public function getAttributeNodeNS(?string $namespace, string $localName) {}
189189

190190
/** @return DOMNodeList */
191-
public function getElementsByTagName(string $name) {}
191+
public function getElementsByTagName(string $qualifiedName) {}
192192

193193
/** @return DOMNodeList */
194-
public function getElementsByTagNameNS(string $namespaceURI, string $localName) {}
194+
public function getElementsByTagNameNS(string $namespace, string $localName) {}
195195

196196
/** @return bool */
197-
public function hasAttribute(string $name) {}
197+
public function hasAttribute(string $qualifiedName) {}
198198

199199
/** @return bool */
200-
public function hasAttributeNS(?string $namespaceURI, string $localName) {}
200+
public function hasAttributeNS(?string $namespace, string $localName) {}
201201

202202
/** @return bool */
203-
public function removeAttribute(string $name) {}
203+
public function removeAttribute(string $qualifiedName) {}
204204

205205
/** @return DOMAttr|false */
206-
public function removeAttributeNS(?string $namespaceURI, string $localName) {}
206+
public function removeAttributeNS(?string $namespace, string $localName) {}
207207

208208
/** @return DOMAttr|false */
209-
public function removeAttributeNode(string $name) {}
209+
public function removeAttributeNode(string $qualifiedName) {}
210210

211211
/** @return DOMAttr|bool */
212-
public function setAttribute(string $name, string $value) {}
212+
public function setAttribute(string $qualifiedName, string $value) {}
213213

214214
/** @return null|false */
215-
public function setAttributeNS(?string $namespaceURI, string $localName, string $value) {}
215+
public function setAttributeNS(?string $namespace, string $qualifiedName, string $value) {}
216216

217217
/** @return DOMAttr|null|false */
218218
public function setAttributeNode(DOMAttr $attr) {}
@@ -221,10 +221,10 @@ public function setAttributeNode(DOMAttr $attr) {}
221221
public function setAttributeNodeNS(DOMAttr $attr) {}
222222

223223
/** @return void */
224-
public function setIdAttribute(string $name, bool $isId) {}
224+
public function setIdAttribute(string $qualifiedName, bool $isId) {}
225225

226226
/** @return void */
227-
public function setIdAttributeNS(string $namespaceURI, string $localName, bool $isId) {}
227+
public function setIdAttributeNS(string $namespace, string $qualifiedName, bool $isId) {}
228228

229229
/** @return void */
230230
public function setIdAttributeNode(DOMAttr $attr, bool $isId) {}
@@ -252,10 +252,10 @@ class DOMDocument implements DOMParentNode
252252
public function __construct(string $version = "1.0", string $encoding = "") {}
253253

254254
/** @return DOMAttr|false */
255-
public function createAttribute(string $name) {}
255+
public function createAttribute(string $localName) {}
256256

257257
/** @return DOMAttr|false */
258-
public function createAttributeNS(?string $namespaceURI, string $qualifiedName) {}
258+
public function createAttributeNS(?string $namespace, string $qualifiedName) {}
259259

260260
/** @return DOMCdataSection|false */
261261
public function createCDATASection(string $data) {}
@@ -267,10 +267,10 @@ public function createComment(string $data) {}
267267
public function createDocumentFragment() {}
268268

269269
/** @return DOMElement|false */
270-
public function createElement(string $tagName, string $value = "") {}
270+
public function createElement(string $localName, string $value = "") {}
271271

272272
/** @return DOMElement|false */
273-
public function createElementNS(?string $namespaceURI, string $qualifiedName, string $value = "") {}
273+
public function createElementNS(?string $namespace, string $qualifiedName, string $value = "") {}
274274

275275
/** @return DOMEntityReference|false */
276276
public function createEntityReference(string $name) {}
@@ -285,13 +285,13 @@ public function createTextNode(string $data) {}
285285
public function getElementById(string $elementId) {}
286286

287287
/** @return DOMNodeList */
288-
public function getElementsByTagName(string $tagName) {}
288+
public function getElementsByTagName(string $qualifiedName) {}
289289

290290
/** @return DOMNodeList */
291-
public function getElementsByTagNameNS(string $namespaceURI, string $localName) {}
291+
public function getElementsByTagNameNS(string $namespace, string $localName) {}
292292

293293
/** @return DOMNode|false */
294-
public function importNode(DOMNode $importedNode, bool $deep = false) {}
294+
public function importNode(DOMNode $node, bool $deep = false) {}
295295

296296
/** @return DOMDocument|bool */
297297
public function load(string $filename, int $options = 0) {}
@@ -303,7 +303,7 @@ public function loadXML(string $source, int $options = 0) {}
303303
public function normalizeDocument() {}
304304

305305
/** @return bool */
306-
public function registerNodeClass(string $baseclass, ?string $extendedclass) {}
306+
public function registerNodeClass(string $baseClass, ?string $extendedClass) {}
307307

308308
/** @return int|false */
309309
public function save(string $filename, int $options = 0) {}
@@ -346,7 +346,7 @@ public function validate() {}
346346
public function xinclude(int $options = 0) {}
347347

348348
/** @return DOMNode|false */
349-
public function adoptNode(DOMNode $source) {}
349+
public function adoptNode(DOMNode $node) {}
350350

351351
/** @var ...DOMNode|string $nodes */
352352
public function append(...$nodes): void {}
@@ -361,7 +361,7 @@ final class DOMException extends Exception
361361

362362
class DOMText
363363
{
364-
public function __construct(string $value = "") {}
364+
public function __construct(string $data = "") {}
365365

366366
/** @return bool */
367367
public function isWhitespaceInElementContent() {}
@@ -379,10 +379,10 @@ public function splitText(int $offset) {}
379379
class DOMNamedNodeMap implements IteratorAggregate, Countable
380380
{
381381
/** @return DOMNode|null */
382-
public function getNamedItem(string $name) {}
382+
public function getNamedItem(string $qualifiedName) {}
383383

384384
/** @return DOMNode|null */
385-
public function getNamedItemNS(?string $namespaceURI, string $localName) {}
385+
public function getNamedItemNS(?string $namespace, string $localName) {}
386386

387387
/** @return DOMNode|null */
388388
public function item(int $index) {}
@@ -414,16 +414,16 @@ public function __construct(string $name, string $value = "") {}
414414
#ifdef LIBXML_XPATH_ENABLED
415415
class DOMXPath
416416
{
417-
public function __construct(DOMDocument $doc, bool $registerNodeNS = true) {}
417+
public function __construct(DOMDocument $document, bool $registerNodeNS = true) {}
418418

419419
/** @return mixed */
420-
public function evaluate(string $expr, ?DOMNode $context = null, bool $registerNodeNS = true) {}
420+
public function evaluate(string $expression, ?DOMNode $contextNode = null, bool $registerNodeNS = true) {}
421421

422422
/** @return mixed */
423-
public function query(string $expr, ?DOMNode $context = null, bool $registerNodeNS = true) {}
423+
public function query(string $expression, ?DOMNode $contextNode = null, bool $registerNodeNS = true) {}
424424

425425
/** @return bool */
426-
public function registerNamespace(string $prefix, string $namespaceURI) {}
426+
public function registerNamespace(string $prefix, string $namespace) {}
427427

428428
/** @return void */
429429
public function registerPhpFunctions(string|array|null $restrict = null) {}

0 commit comments

Comments
 (0)