diff --git a/src/DependencyInjection/CompilerPass/MercureTopicsProviderPass.php b/src/DependencyInjection/CompilerPass/MercureTopicsProviderPass.php index 2320a0d94..d4803fe2e 100644 --- a/src/DependencyInjection/CompilerPass/MercureTopicsProviderPass.php +++ b/src/DependencyInjection/CompilerPass/MercureTopicsProviderPass.php @@ -17,8 +17,8 @@ namespace Pimcore\Bundle\StudioBackendBundle\DependencyInjection\CompilerPass; use Pimcore\Bundle\StudioBackendBundle\Exception\MustImplementInterfaceException; -use Pimcore\Bundle\StudioBackendBundle\Mercure\Provider\ServerTopicProviderInterface; use Pimcore\Bundle\StudioBackendBundle\Mercure\Provider\ClientTopicProviderInterface; +use Pimcore\Bundle\StudioBackendBundle\Mercure\Provider\ServerTopicProviderInterface; use Pimcore\Bundle\StudioBackendBundle\Mercure\Service\Loader\TaggedIteratorAdapter; use Pimcore\Bundle\StudioBackendBundle\Util\Traits\MustImplementInterfaceTrait; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; diff --git a/src/Mercure/Controller/JwtController.php b/src/Mercure/Controller/JwtController.php index bd30434c1..ac283f27f 100644 --- a/src/Mercure/Controller/JwtController.php +++ b/src/Mercure/Controller/JwtController.php @@ -54,6 +54,7 @@ public function auth(): Response $res->headers->setCookie( $this->createCookie(0) ); + return $res; } diff --git a/src/Mercure/Model/TopicCollection.php b/src/Mercure/Model/TopicCollection.php index b7ad5a673..40b96df87 100644 --- a/src/Mercure/Model/TopicCollection.php +++ b/src/Mercure/Model/TopicCollection.php @@ -1,6 +1,19 @@ $topics + * * @return void */ public function addServerPublishableTopic(string|array $topics): void { if (is_array($topics)) { $this->serverPublishableTopics = array_merge($this->serverPublishableTopics, $topics); + return; } @@ -32,12 +47,14 @@ public function addServerPublishableTopic(string|array $topics): void /** * @param string|array $topics + * * @return void */ public function addServerSubscribableTopic(string|array $topics): void { if (is_array($topics)) { $this->serverSubscribableTopics = array_merge($this->serverSubscribableTopics, $topics); + return; } @@ -46,12 +63,14 @@ public function addServerSubscribableTopic(string|array $topics): void /** * @param string|array $topics + * * @return void */ public function addClientPublishableTopic(string|array $topics): void { if (is_array($topics)) { $this->clientPublishableTopics = array_merge($this->clientPublishableTopics, $topics); + return; } @@ -60,12 +79,14 @@ public function addClientPublishableTopic(string|array $topics): void /** * @param string|array $topics + * * @return void */ public function addClientSubscribableTopic(string|array $topics): void { if (is_array($topics)) { $this->clientSubscribableTopics = array_merge($this->clientSubscribableTopics, $topics); + return; } @@ -103,4 +124,4 @@ public function getClientSubscribableTopics(): array { return array_unique($this->clientSubscribableTopics); } -} \ No newline at end of file +} diff --git a/src/Mercure/Provider/ClientTopicProviderInterface.php b/src/Mercure/Provider/ClientTopicProviderInterface.php index f2dbdb874..cc08cb4d7 100644 --- a/src/Mercure/Provider/ClientTopicProviderInterface.php +++ b/src/Mercure/Provider/ClientTopicProviderInterface.php @@ -1,6 +1,19 @@ addClientSubscribableTopic($topicProvider->getClientSubscribableTopic()); } } + return $collection; } } diff --git a/src/Mercure/Service/Loader/TopicLoaderInterface.php b/src/Mercure/Service/Loader/TopicLoaderInterface.php index f777106b4..126fff6d8 100644 --- a/src/Mercure/Service/Loader/TopicLoaderInterface.php +++ b/src/Mercure/Service/Loader/TopicLoaderInterface.php @@ -1,6 +1,19 @@ $topics + * * @throws JsonEncodingException */ public function publish( diff --git a/src/Mercure/Service/PublishServiceInterface.php b/src/Mercure/Service/PublishServiceInterface.php index 52ee18251..4421608b2 100644 --- a/src/Mercure/Service/PublishServiceInterface.php +++ b/src/Mercure/Service/PublishServiceInterface.php @@ -1,6 +1,19 @@ $topics + * * @throws JsonEncodingException */ public function publish( diff --git a/src/Mercure/Service/ServerTokenService.php b/src/Mercure/Service/ServerTokenService.php index 0d435274e..bbef7fed5 100644 --- a/src/Mercure/Service/ServerTokenService.php +++ b/src/Mercure/Service/ServerTokenService.php @@ -1,6 +1,19 @@