Merge branch 'develop' into 1214-fix-nested-run-commands

noplanman · web-flow · commit 5bf9688b7911 · 2021-06-08T20:07:33.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
 ### Deprecated
 ### Removed
 ### Fixed
+- Regex for namespace extraction from custom command classes.
 - Nested and user-triggered `Telegram::runCommands`.
 ### Security
 
diff --git a/src/Telegram.php b/src/Telegram.php
@@ -393,7 +393,7 @@ public function getCommandObject(string $command, string $filepath = ''): ?Comma
     protected function getFileNamespace(string $src): ?string
     {
         $content = file_get_contents($src);
-        if (preg_match('#^\s+namespace\s+(.+?);#m', $content, $m)) {
+        if (preg_match('#^\s*namespace\s+(.+?);#m', $content, $m)) {
             return $m[1];
         }
 

Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ public function getCommandObject(string $command, string $filepath = ''): ?Comma`
`393`	`393`	`protected function getFileNamespace(string $src): ?string`
`394`	`394`	`{`
`395`	`395`	`$content = file_get_contents($src);`
`396`		`- if (preg_match('#^\s+namespace\s+(.+?);#m', $content, $m)) {`
	`396`	`+ if (preg_match('#^\s*namespace\s+(.+?);#m', $content, $m)) {`
`397`	`397`	`return $m[1];`
`398`	`398`	`}`
`399`	`399`