Merge pull request #9139 from jack-worman/Fix_dom_import_simplexml

vimeo · Jan 19, 2023 · 5d6dff9 · 5d6dff9
2 parents 396e7fc + 787b9ae
commit 5d6dff9
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 5 deletions.
diff --git a/stubs/extensions/dom.phpstub b/stubs/extensions/dom.phpstub
@@ -50,10 +50,6 @@ const DOM_NAMESPACE_ERR = 14;
 const DOM_INVALID_ACCESS_ERR = 15;
 const DOM_VALIDATION_ERR = 16;
 
-function dom_import_simplexml(object $node): ?DOMElement {}
-/** @php-from 8.0 */
-function dom_import_simplexml(object $node): DOMElement {}
-
 final class DOMException extends Exception
 {
     public int $code;

diff --git a/tests/ExtLibxmlStubTest.php b/tests/ExtLibxmlStubTest.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Psalm\Tests;
+
+use Psalm\Tests\Traits\InvalidCodeAnalysisTestTrait;
+use Psalm\Tests\Traits\ValidCodeAnalysisTestTrait;
+
+class ExtLibxmlStubTest extends TestCase
+{
+    use ValidCodeAnalysisTestTrait;
+    use InvalidCodeAnalysisTestTrait;
+
+    public function providerValidCodeParse(): iterable
+    {
+        return [
+            'dom_import_simplexml, php >=8.0' => [
+                'code' => <<<'PHP'
+                    <?php
+                    $x = dom_import_simplexml(new SimpleXMLElement(''));
+                    PHP,
+                'assertions' => ['$x===' => 'DOMElement'],
+                'ignored_issues' => [],
+                'php_version' => '8.0',
+            ],
+            'dom_import_simplexml, php <8.0' => [
+                'code' => <<<'PHP'
+                    <?php
+                    $x = dom_import_simplexml(new SimpleXMLElement(''));
+                    PHP,
+                'assertions' => ['$x===' => 'DOMElement|null'],
+                'ignored_issues' => [],
+                'php_version' => '7.4',
+            ],
+        ];
+    }
+
+    public function providerInvalidCodeParse(): iterable
+    {
+        return [
+            'dom_import_simplexml, $node arg' => [
+                'code' => <<<'PHP'
+                    <?php
+                    $x = dom_import_simplexml(new \stdClass());
+                    PHP,
+                'error_message' => 'InvalidArgument',
+            ],
+        ];
+    }
+}
diff --git a/tests/Traits/InvalidCodeAnalysisTestTrait.php b/tests/Traits/InvalidCodeAnalysisTestTrait.php
@@ -19,7 +19,15 @@
 trait InvalidCodeAnalysisTestTrait
 {
     /**
-     * @return iterable<string,array{code:string,error_message:string,ignored_issues?:list<string>,php_version?:string}>
+     * @return iterable<
+     *     string,
+     *     array{
+     *         code: string,
+     *         error_message: string,
+     *         ignored_issues?: list<string>,
+     *         php_version?: string,
+     *     }
+     * >
      */
     abstract public function providerInvalidCodeParse(): iterable;