@@ -126,12 +126,14 @@ public function getEvents(array $filter = []): array
126126 /**
127127 * Get subscribers list
128128 *
129- * @param array $filter
129+ * @param string|null $eventName
130+ * @param string|null $extensionName
131+ * @param integer|null $status
130132 * @return array
131133 */
132- public function getSubscribers (array $ filter = [] ): array
134+ public function getSubscribers (? string $ eventName = null , ? string $ extensionName , ? int $ status = null ): array
133135 {
134- return $ this ->subscriberRegistry ->getSubscribers ($ filter );
136+ return $ this ->subscriberRegistry ->getSubscribers ($ eventName , $ extensionName , $ status );
135137 }
136138
137139 /**
@@ -260,21 +262,10 @@ public function dispatch(string $eventName, $event = [], bool $callbackOnly = fa
260262 $ result = [];
261263
262264 if ($ callbackOnly != true ) {
263- // get all subscribers for event
264- if (empty ($ extension ) == false ) {
265- $ subscribers = $ this ->getSubscribers ([
266- 'extension_name ' => $ extension ,
267- 'status ' => 1 ,
268- 'name ' => $ eventName
269- ]);
270- } else {
271- $ subscribers = $ this ->getSubscribers ([
272- 'status ' => 1 ,
273- 'name ' => $ eventName
274- ]);
275- }
276-
277- $ this ->log ('Dispatch event ' . $ eventName ,$ event ->toArray ());
265+ // get all subscribers for event
266+ $ subscribers = $ this ->getSubscribers ($ eventName ,$ extension ,1 );
267+
268+ $ this ->log ('Dispatch event ' . $ eventName ,$ event ->toArray ());
278269 $ result = $ this ->executeEventHandlers ($ subscribers ,$ event );
279270 }
280271
@@ -321,7 +312,7 @@ private function executeEventHandlers(array $eventSubscribers, Event $event): ar
321312 $ subscriber = Factory::createInstance ($ item ['handler_class ' ]);
322313 $ handlerMethod = (empty ($ item ['handler_method ' ]) == true ) ? 'execute ' : $ item ['handler_method ' ];
323314
324- if (\is_object ( $ subscriber ) == true && $ subscriber instanceof EventSubscriberInterface) {
315+ if ($ subscriber instanceof EventSubscriberInterface) {
325316
326317 // check for subscriber log
327318 if ($ subscriber instanceof EventLogInterface) {
0 commit comments