Use better return type for SimpleXMLElement::offsetGet

vimeo · Feb 18, 2020 · 6e80887 · 6e80887
1 parent 38cccb8
commit 6e80887
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/Psalm/Config.php b/src/Psalm/Config.php
@@ -962,7 +962,7 @@ private static function fromXmlAndPaths(string $base_dir, string $file_contents,
                         $plugin_config = $plugin->children();
                     }
 
-                    $config->addPluginClass($plugin_class_name, $plugin_config);
+                    $config->addPluginClass((string) $plugin_class_name, $plugin_config);
                 }
             }
         }

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/ArrayFetchAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/ArrayFetchAnalyzer.php
@@ -1111,7 +1111,7 @@ public static function getArrayAccessTypeGivenOffset(
 
             if ($type instanceof TNamedObject) {
                 if (strtolower($type->value) === 'simplexmlelement') {
-                    $array_access_type = Type::getMixed();
+                    $array_access_type = new Type\Union([new TNamedObject('SimpleXMLElement')]);
                 } elseif (strtolower($type->value) === 'domnodelist' && $stmt->dim) {
                     $old_data_provider = $statements_analyzer->node_data;
 

diff --git a/tests/ArrayAccessTest.php b/tests/ArrayAccessTest.php
@@ -895,6 +895,12 @@ public function pop(): void {
                         }
                     }'
             ],
+            'simpleXmlArrayFetch' => [
+                '<?php
+                    function foo(SimpleXMLElement $s) : SimpleXMLElement {
+                        return $s["a"];
+                    }',
+            ],
         ];
     }