Fix observers

Author: mudrd8mz

classes/local/util/manager.php

@@ -1522,11 +1522,13 @@ protected function prepare_observers() {
                     list($observername, $callback) = explode('::', $observer['callback']);
                 }
 
-                if (strpos($observername, $this->recipe['component']) !== false) {
-                    $observername = substr($observername, strlen($this->recipe['component'].'_'));
+                if ($isinsidenamespace !== false && (strpos($observername, $this->recipe['component']) !== false)) {
+                    $observerfilename = substr($observername, strlen($this->recipe['component'].'_'));
+                } else {
+                    $observerfilename = $observername;
                 }
 
-                $observerfile = 'classes/'.$observername.'.php';
+                $observerfile = 'classes/'.$observerfilename.'.php';
 
                 if (empty($this->files[$observerfile])) {
                     $this->prepare_file_skeleton($observerfile, 'observer_file', 'classes_observer', $observerrecipe);

tests/examples/auth.yaml

@@ -94,17 +94,17 @@ cli_scripts:
 
 observers:
   - eventname: \core\event\something_happened
-    callback: \local_test\another\observer_one::something_happened
+    callback: \auth_skeltest\another\observer_one::something_happened
     includefile: "/path/to/file/relative/to/moodle/dir/root"
     priority: 200
     internal: true
 
   - eventname: \core\event\something_else_happened
-    callback: local_test_locallib_function
+    callback: auth_skeltest_locallib_function
     internal: false
 
   - eventname: \core\event\something_else_happened
-    callback: local_test_observer_two::do_something
+    callback: auth_skeltest_observer_two::do_something
 
 events:
   - eventname: first_event

tests/examples/format.yaml

@@ -88,17 +88,17 @@ cli_scripts:
 
 observers:
   - eventname: \core\event\something_happened
-    callback: \local_test\another\observer_one::something_happened
+    callback: \format_skeltest\another\observer_one::something_happened
     includefile: "/path/to/file/relative/to/moodle/dir/root"
     priority: 200
     internal: true
 
   - eventname: \core\event\something_else_happened
-    callback: local_test_locallib_function
+    callback: format_skeltest_locallib_function
     internal: false
 
   - eventname: \core\event\something_else_happened
-    callback: local_test_observer_two::do_something
+    callback: format_skeltest_observer_two::do_something
 
 events:
   - eventname: first_event

tests/examples/mod.yaml

@@ -97,17 +97,17 @@ cli_scripts:
 
 observers:
   - eventname: \core\event\something_happened
-    callback: \local_test\another\observer_one::something_happened
+    callback: \mod_skeltest\another\observer_one::something_happened
     includefile: "/path/to/file/relative/to/moodle/dir/root"
     priority: 200
     internal: true
 
   - eventname: \core\event\something_else_happened
-    callback: local_test_locallib_function
+    callback: skeltest_locallib_function
     internal: false
 
   - eventname: \core\event\something_else_happened
-    callback: local_test_observer_two::do_something
+    callback: skeltest_observer_two::do_something
 
 events:
   - eventname: course_module_viewed