From c1bb695f4b4da2637f05f3b17b622fbc89848fb2 Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Thu, 9 Jul 2020 02:19:36 -0600 Subject: [PATCH] Fix "use statement with non-compound names has no effect" (#5206) Fixes #5205. --- modules/cms/classes/CodeParser.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/cms/classes/CodeParser.php b/modules/cms/classes/CodeParser.php index f2f5e0ad7..dd6687637 100644 --- a/modules/cms/classes/CodeParser.php +++ b/modules/cms/classes/CodeParser.php @@ -128,7 +128,7 @@ class CodeParser $body = $this->object->code; $body = preg_replace('/^\s*function/m', 'public function', $body); - $codeNamespaces = []; + $namespaces = []; $pattern = '/(use\s+[a-z0-9_\\\\]+(\s+as\s+[a-z0-9_]+)?;\n?)/mi'; preg_match_all($pattern, $body, $namespaces); $body = preg_replace($pattern, '', $body); @@ -141,7 +141,9 @@ class CodeParser $fileContents = '