Skip to content

Commit a57fdb9

Browse files
OcramiusOcramius
authored
Merge pull request #62 from gsteel/2.18.1-fix-createTextNode
Fix strict_types errors in DOMDocument::createTextNode()
2 parents f2b852e + 7855d20 commit a57fdb9

File tree

19 files changed

+98
-170
lines changed

19 files changed

+98
-170
lines changed

‎psalm-baseline.xml‎

Lines changed: 24 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -2239,9 +2239,8 @@
22392239
</MixedMethodCall>
22402240
</file>
22412241
<file src="src/Writer/Extension/DublinCore/Renderer/Entry.php">
2242-
<MixedArgument occurrences="2">
2242+
<MixedArgument occurrences="1">
22432243
<code>$data</code>
2244-
<code>$data['name']</code>
22452244
</MixedArgument>
22462245
<MixedAssignment occurrences="2">
22472246
<code>$authors</code>
@@ -2255,9 +2254,8 @@
22552254
</TypeDoesNotContainType>
22562255
</file>
22572256
<file src="src/Writer/Extension/DublinCore/Renderer/Feed.php">
2258-
<MixedArgument occurrences="2">
2257+
<MixedArgument occurrences="1">
22592258
<code>$data</code>
2260-
<code>$data['name']</code>
22612259
</MixedArgument>
22622260
<MixedAssignment occurrences="2">
22632261
<code>$authors</code>
@@ -2309,11 +2307,6 @@
23092307
</RedundantConditionGivenDocblockType>
23102308
</file>
23112309
<file src="src/Writer/Extension/GooglePlayPodcast/Renderer/Entry.php">
2312-
<MixedArgument occurrences="3">
2313-
<code>$block</code>
2314-
<code>$description</code>
2315-
<code>$explicit</code>
2316-
</MixedArgument>
23172310
<MixedAssignment occurrences="3">
23182311
<code>$block</code>
23192312
<code>$description</code>
@@ -2326,12 +2319,8 @@
23262319
</MixedMethodCall>
23272320
</file>
23282321
<file src="src/Writer/Extension/GooglePlayPodcast/Renderer/Feed.php">
2329-
<MixedArgument occurrences="8">
2330-
<code>$author</code>
2331-
<code>$block</code>
2322+
<MixedArgument occurrences="4">
23322323
<code>$cat</code>
2333-
<code>$description</code>
2334-
<code>$explicit</code>
23352324
<code>$image</code>
23362325
<code>$key</code>
23372326
<code>$subcat</code>
@@ -2442,19 +2431,9 @@
24422431
</TypeDoesNotContainType>
24432432
</file>
24442433
<file src="src/Writer/Extension/ITunes/Renderer/Entry.php">
2445-
<MixedArgument occurrences="12">
2446-
<code>$author</code>
2447-
<code>$block</code>
2448-
<code>$duration</code>
2449-
<code>$episode</code>
2450-
<code>$explicit</code>
2434+
<MixedArgument occurrences="2">
24512435
<code>$image</code>
24522436
<code>$keywords</code>
2453-
<code>$season</code>
2454-
<code>$subtitle</code>
2455-
<code>$summary</code>
2456-
<code>$title</code>
2457-
<code>$type</code>
24582437
</MixedArgument>
24592438
<MixedAssignment occurrences="14">
24602439
<code>$author</code>
@@ -2493,22 +2472,12 @@
24932472
</TypeDoesNotContainType>
24942473
</file>
24952474
<file src="src/Writer/Extension/ITunes/Renderer/Feed.php">
2496-
<MixedArgument occurrences="15">
2497-
<code>$author</code>
2498-
<code>$block</code>
2475+
<MixedArgument occurrences="5">
24992476
<code>$cat</code>
2500-
<code>$duration</code>
2501-
<code>$explicit</code>
25022477
<code>$image</code>
25032478
<code>$key</code>
25042479
<code>$keywords</code>
2505-
<code>$owner['email']</code>
2506-
<code>$owner['name']</code>
25072480
<code>$subcat</code>
2508-
<code>$subtitle</code>
2509-
<code>$summary</code>
2510-
<code>$type</code>
2511-
<code>$url</code>
25122481
</MixedArgument>
25132482
<MixedArrayAccess occurrences="2">
25142483
<code>$owner['email']</code>
@@ -2576,12 +2545,19 @@
25762545
<code>getPodcastIndexSoundbites</code>
25772546
<code>getPodcastIndexTranscript</code>
25782547
</MixedMethodCall>
2548+
<RedundantCastGivenDocblockType occurrences="1">
2549+
<code>(string) $soundbite['title']</code>
2550+
</RedundantCastGivenDocblockType>
25792551
</file>
25802552
<file src="src/Writer/Extension/PodcastIndex/Renderer/Feed.php">
25812553
<MixedMethodCall occurrences="2">
25822554
<code>getPodcastIndexFunding</code>
25832555
<code>getPodcastIndexLocked</code>
25842556
</MixedMethodCall>
2557+
<RedundantCastGivenDocblockType occurrences="2">
2558+
<code>(string) $funding['title']</code>
2559+
<code>(string) $locked['value']</code>
2560+
</RedundantCastGivenDocblockType>
25852561
</file>
25862562
<file src="src/Writer/Extension/Slash/Renderer/Entry.php">
25872563
<MixedAssignment occurrences="1">
@@ -2624,9 +2600,6 @@
26242600
</TypeDoesNotContainType>
26252601
</file>
26262602
<file src="src/Writer/Extension/WellFormedWeb/Renderer/Entry.php">
2627-
<MixedArgument occurrences="1">
2628-
<code>$link['uri']</code>
2629-
</MixedArgument>
26302603
<MixedArrayAccess occurrences="2">
26312604
<code>$link['type']</code>
26322605
<code>$link['uri']</code>
@@ -2770,19 +2743,16 @@
27702743
<code>format</code>
27712744
<code>format</code>
27722745
</InvalidMethodCall>
2773-
<MixedArgument occurrences="15">
2746+
<MixedArgument occurrences="12">
27742747
<code>$cat['label']</code>
27752748
<code>$cat['scheme']</code>
27762749
<code>$cat['term']</code>
27772750
<code>$cat['term']</code>
27782751
<code>$content</code>
27792752
<code>$data</code>
2780-
<code>$data['email']</code>
27812753
<code>$data['length']</code>
2782-
<code>$data['name']</code>
27832754
<code>$data['type']</code>
27842755
<code>$data['uri']</code>
2785-
<code>$data['uri']</code>
27862756
<code>$source</code>
27872757
<code>$this-&gt;getDataContainer()-&gt;getDateCreated()-&gt;format(DateTime::ATOM)</code>
27882758
<code>$this-&gt;getDataContainer()-&gt;getDateModified()-&gt;format(DateTime::ATOM)</code>
@@ -2817,13 +2787,12 @@
28172787
<ParadoxicalCondition occurrences="1">
28182788
<code>! $authors || empty($authors)</code>
28192789
</ParadoxicalCondition>
2820-
<PossiblyNullArgument occurrences="9">
2790+
<PossiblyNullArgument occurrences="8">
28212791
<code>$this-&gt;container-&gt;getEncoding()</code>
28222792
<code>$this-&gt;getDataContainer()-&gt;getDescription()</code>
28232793
<code>$this-&gt;getDataContainer()-&gt;getId()</code>
28242794
<code>$this-&gt;getDataContainer()-&gt;getId()</code>
28252795
<code>$this-&gt;getDataContainer()-&gt;getId()</code>
2826-
<code>$this-&gt;getDataContainer()-&gt;getId()</code>
28272796
<code>$this-&gt;getDataContainer()-&gt;getLink()</code>
28282797
<code>$this-&gt;getDataContainer()-&gt;getLink()</code>
28292798
<code>$this-&gt;getDataContainer()-&gt;getTitle()</code>
@@ -2847,11 +2816,8 @@
28472816
<InvalidArgument occurrences="1">
28482817
<code>$container</code>
28492818
</InvalidArgument>
2850-
<MixedArgument occurrences="7">
2819+
<MixedArgument occurrences="4">
28512820
<code>$data</code>
2852-
<code>$data['email']</code>
2853-
<code>$data['name']</code>
2854-
<code>$data['uri']</code>
28552821
<code>$this-&gt;container-&gt;getReference()</code>
28562822
<code>$this-&gt;container-&gt;getWhen()-&gt;format(DateTime::ATOM)</code>
28572823
<code>$this-&gt;getDataContainer()-&gt;getComment()</code>
@@ -2883,11 +2849,8 @@
28832849
<InvalidArgument occurrences="1">
28842850
<code>$container</code>
28852851
</InvalidArgument>
2886-
<MixedArgument occurrences="7">
2852+
<MixedArgument occurrences="4">
28872853
<code>$data</code>
2888-
<code>$data['email']</code>
2889-
<code>$data['name']</code>
2890-
<code>$data['uri']</code>
28912854
<code>$this-&gt;container-&gt;getReference()</code>
28922855
<code>$this-&gt;container-&gt;getWhen()-&gt;format(DateTime::ATOM)</code>
28932856
<code>$this-&gt;getDataContainer()-&gt;getComment()</code>
@@ -2925,14 +2888,12 @@
29252888
<InvalidMethodCall occurrences="1">
29262889
<code>format</code>
29272890
</InvalidMethodCall>
2928-
<MixedArgument occurrences="8">
2891+
<MixedArgument occurrences="6">
29292892
<code>$cat['scheme']</code>
29302893
<code>$cat['term']</code>
29312894
<code>$data</code>
29322895
<code>$data['type']</code>
29332896
<code>$data['uri']</code>
2934-
<code>$link</code>
2935-
<code>$name</code>
29362897
<code>$this-&gt;getDataContainer()-&gt;getDateModified()-&gt;format(DateTime::RSS)</code>
29372898
</MixedArgument>
29382899
<MixedArrayAccess occurrences="8">
@@ -2966,14 +2927,11 @@
29662927
<ParadoxicalCondition occurrences="1">
29672928
<code>! $authors || empty($authors)</code>
29682929
</ParadoxicalCondition>
2969-
<PossiblyNullArgument occurrences="7">
2930+
<PossiblyNullArgument occurrences="4">
29702931
<code>$this-&gt;container-&gt;getEncoding()</code>
29712932
<code>$this-&gt;getDataContainer()-&gt;getDescription()</code>
29722933
<code>$this-&gt;getDataContainer()-&gt;getId()</code>
2973-
<code>$this-&gt;getDataContainer()-&gt;getId()</code>
29742934
<code>$this-&gt;getDataContainer()-&gt;getLink()</code>
2975-
<code>$this-&gt;getDataContainer()-&gt;getLink()</code>
2976-
<code>$this-&gt;getDataContainer()-&gt;getTitle()</code>
29772935
</PossiblyNullArgument>
29782936
<PossiblyNullReference occurrences="1">
29792937
<code>format</code>
@@ -3000,19 +2958,14 @@
30002958
<InvalidMethodCall occurrences="1">
30012959
<code>format</code>
30022960
</InvalidMethodCall>
3003-
<MixedArgument occurrences="14">
2961+
<MixedArgument occurrences="9">
30042962
<code>$cat['label']</code>
30052963
<code>$cat['scheme']</code>
30062964
<code>$cat['term']</code>
30072965
<code>$cat['term']</code>
30082966
<code>$data</code>
3009-
<code>$data['email']</code>
3010-
<code>$data['name']</code>
3011-
<code>$data['uri']</code>
3012-
<code>$gdata['name']</code>
30132967
<code>$href</code>
30142968
<code>$hubUrl</code>
3015-
<code>$image['uri']</code>
30162969
<code>$this-&gt;getDataContainer()-&gt;getDateModified()-&gt;format(DateTime::ATOM)</code>
30172970
<code>$type</code>
30182971
</MixedArgument>
@@ -3033,15 +2986,12 @@
30332986
<ParadoxicalCondition occurrences="1">
30342987
<code>! $authors || empty($authors)</code>
30352988
</ParadoxicalCondition>
3036-
<PossiblyNullArgument occurrences="8">
2989+
<PossiblyNullArgument occurrences="5">
30372990
<code>$gdata['uri']</code>
30382991
<code>$gdata['version']</code>
3039-
<code>$this-&gt;getDataContainer()-&gt;getDescription()</code>
3040-
<code>$this-&gt;getDataContainer()-&gt;getId()</code>
30412992
<code>$this-&gt;getDataContainer()-&gt;getLanguage()</code>
30422993
<code>$this-&gt;getDataContainer()-&gt;getLink()</code>
30432994
<code>$this-&gt;getDataContainer()-&gt;getLink()</code>
3044-
<code>$this-&gt;getDataContainer()-&gt;getTitle()</code>
30452995
</PossiblyNullArgument>
30462996
<PossiblyNullArrayAccess occurrences="1">
30472997
<code>$gdata['name']</code>
@@ -3100,19 +3050,14 @@
31003050
<InvalidMethodCall occurrences="1">
31013051
<code>format</code>
31023052
</InvalidMethodCall>
3103-
<MixedArgument occurrences="14">
3053+
<MixedArgument occurrences="9">
31043054
<code>$cat['label']</code>
31053055
<code>$cat['scheme']</code>
31063056
<code>$cat['term']</code>
31073057
<code>$cat['term']</code>
31083058
<code>$data</code>
3109-
<code>$data['email']</code>
3110-
<code>$data['name']</code>
3111-
<code>$data['uri']</code>
3112-
<code>$gdata['name']</code>
31133059
<code>$href</code>
31143060
<code>$hubUrl</code>
3115-
<code>$image['uri']</code>
31163061
<code>$this-&gt;getDataContainer()-&gt;getDateModified()-&gt;format(DateTime::ATOM)</code>
31173062
<code>$type</code>
31183063
</MixedArgument>
@@ -3133,15 +3078,12 @@
31333078
<ParadoxicalCondition occurrences="1">
31343079
<code>! $authors || empty($authors)</code>
31353080
</ParadoxicalCondition>
3136-
<PossiblyNullArgument occurrences="8">
3081+
<PossiblyNullArgument occurrences="5">
31373082
<code>$gdata['uri']</code>
31383083
<code>$gdata['version']</code>
3139-
<code>$this-&gt;getDataContainer()-&gt;getDescription()</code>
3140-
<code>$this-&gt;getDataContainer()-&gt;getId()</code>
31413084
<code>$this-&gt;getDataContainer()-&gt;getLanguage()</code>
31423085
<code>$this-&gt;getDataContainer()-&gt;getLink()</code>
31433086
<code>$this-&gt;getDataContainer()-&gt;getLink()</code>
3144-
<code>$this-&gt;getDataContainer()-&gt;getTitle()</code>
31453087
</PossiblyNullArgument>
31463088
<PossiblyNullArrayAccess occurrences="1">
31473089
<code>$gdata['name']</code>
@@ -3166,9 +3108,6 @@
31663108
<InvalidArrayOffset occurrences="1">
31673109
<code>$gdata['name']</code>
31683110
</InvalidArrayOffset>
3169-
<MixedArgument occurrences="1">
3170-
<code>$gdata['name']</code>
3171-
</MixedArgument>
31723111
<MixedAssignment occurrences="1">
31733112
<code>$ext</code>
31743113
</MixedAssignment>
@@ -3202,9 +3141,6 @@
32023141
<InvalidArrayOffset occurrences="1">
32033142
<code>$gdata['name']</code>
32043143
</InvalidArrayOffset>
3205-
<MixedArgument occurrences="1">
3206-
<code>$gdata['name']</code>
3207-
</MixedArgument>
32083144
<MixedAssignment occurrences="1">
32093145
<code>$ext</code>
32103146
</MixedAssignment>
@@ -3245,15 +3181,9 @@
32453181
<code>format</code>
32463182
<code>format</code>
32473183
</InvalidMethodCall>
3248-
<MixedArgument occurrences="10">
3184+
<MixedArgument occurrences="4">
32493185
<code>$cat['scheme']</code>
3250-
<code>$cat['term']</code>
32513186
<code>$data</code>
3252-
<code>$image['height']</code>
3253-
<code>$image['uri']</code>
3254-
<code>$image['width']</code>
3255-
<code>$name</code>
3256-
<code>$name</code>
32573187
<code>$this-&gt;getDataContainer()-&gt;getDateModified()-&gt;format(DateTime::RSS)</code>
32583188
<code>$this-&gt;getDataContainer()-&gt;getLastBuildDate()-&gt;format(DateTime::RSS)</code>
32593189
</MixedArgument>
@@ -3286,10 +3216,8 @@
32863216
<ParadoxicalCondition occurrences="1">
32873217
<code>! $authors || empty($authors)</code>
32883218
</ParadoxicalCondition>
3289-
<PossiblyNullArgument occurrences="3">
3219+
<PossiblyNullArgument occurrences="1">
32903220
<code>$this-&gt;container-&gt;getEncoding()</code>
3291-
<code>$this-&gt;getDataContainer()-&gt;getDescription()</code>
3292-
<code>$this-&gt;getDataContainer()-&gt;getTitle()</code>
32933221
</PossiblyNullArgument>
32943222
<PossiblyNullArrayAccess occurrences="1">
32953223
<code>$gdata['name']</code>

‎src/Writer/Extension/DublinCore/Renderer/Entry.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ protected function _setAuthors(DOMDocument $dom, DOMElement $root)
6767
foreach ($authors as $data) {
6868
$author = $this->dom->createElement('dc:creator');
6969
if (array_key_exists('name', $data)) {
70-
$text = $dom->createTextNode($data['name']);
70+
$text = $dom->createTextNode((string) $data['name']);
7171
$author->appendChild($text);
7272
$root->appendChild($author);
7373
}

‎src/Writer/Extension/DublinCore/Renderer/Feed.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ protected function _setAuthors(DOMDocument $dom, DOMElement $root)
6767
foreach ($authors as $data) {
6868
$author = $this->dom->createElement('dc:creator');
6969
if (array_key_exists('name', $data)) {
70-
$text = $dom->createTextNode($data['name']);
70+
$text = $dom->createTextNode((string) $data['name']);
7171
$author->appendChild($text);
7272
$root->appendChild($author);
7373
}

‎src/Writer/Extension/GooglePlayPodcast/Renderer/Entry.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ protected function _setBlock(DOMDocument $dom, DOMElement $root)
6161
return;
6262
}
6363
$el = $dom->createElement('googleplay:block');
64-
$text = $dom->createTextNode($block);
64+
$text = $dom->createTextNode((string) $block);
6565
$el->appendChild($text);
6666
$root->appendChild($el);
6767
$this->called = true;
@@ -79,7 +79,7 @@ protected function _setExplicit(DOMDocument $dom, DOMElement $root)
7979
return;
8080
}
8181
$el = $dom->createElement('googleplay:explicit');
82-
$text = $dom->createTextNode($explicit);
82+
$text = $dom->createTextNode((string) $explicit);
8383
$el->appendChild($text);
8484
$root->appendChild($el);
8585
$this->called = true;
@@ -97,7 +97,7 @@ protected function _setDescription(DOMDocument $dom, DOMElement $root)
9797
return;
9898
}
9999
$el = $dom->createElement('googleplay:description');
100-
$text = $dom->createTextNode($description);
100+
$text = $dom->createTextNode((string) $description);
101101
$el->appendChild($text);
102102
$root->appendChild($el);
103103
$this->called = true;

0 commit comments

Comments
 (0)