minor #45 remove HubInterface::getName() (azjezz)

This PR was merged into the 0.5.x-dev branch.

Discussion
----------

remove HubInterface::getName()

not really needed.

Commits
-------

947baf5 remove HubInterface::getName()

Author: chalasr

src/Authorization.php

@@ -42,7 +42,7 @@ public function createCookie(Request $request, array $subscribe = [], array $pub
         $hubInstance = $this->registry->getHub($hub);
         $tokenFactory = $hubInstance->getFactory();
         if (null === $tokenFactory) {
-            throw new InvalidArgumentException(sprintf('The hub "%s" does not contain a token factory.', $hubInstance->getName()));
+            throw new InvalidArgumentException(sprintf('The %s hub does not contain a token factory.', $hub ? '"'.$hub.'"' : 'default'));
         }
 
         $token = $tokenFactory->create($subscribe, $publish, $additionalClaims);

src/Debug/TraceableHub.php

@@ -39,11 +39,6 @@ public function __construct(HubInterface $hub, Stopwatch $stopwatch)
         $this->stopwatch = $stopwatch;
     }
 
-    public function getName(): string
-    {
-        return $this->hub->getName();
-    }
-
     public function getUrl(): string
     {
         return $this->hub->getUrl();

src/Hub.php

@@ -26,37 +26,26 @@
  */
 final class Hub implements HubInterface
 {
-    private $name;
     private $url;
     private $jwtProvider;
     private $jwtFactory;
     private $publicUrl;
     private $httpClient;
 
     public function __construct(
-        string $name,
         string $url,
         TokenProviderInterface $jwtProvider,
         TokenFactoryInterface $jwtFactory = null,
         string $publicUrl = null,
         HttpClientInterface $httpClient = null
     ) {
-        $this->name = $name;
         $this->url = $url;
         $this->jwtProvider = $jwtProvider;
         $this->publicUrl = $publicUrl;
         $this->jwtFactory = $jwtFactory;
         $this->httpClient = $httpClient ?? HttpClient::create();
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
     /**
      * {@inheritDoc}
      */

src/HubInterface.php

@@ -23,11 +23,6 @@
  */
 interface HubInterface
 {
-    /**
-     * Return the name of this Hub.
-     */
-    public function getName(): string;
-
     /**
      * Returns the Hub internal URL.
      */

src/HubRegistry.php

@@ -13,7 +13,6 @@
 
 namespace Symfony\Component\Mercure;
 
-use Psr\Container\ContainerInterface;
 use Symfony\Component\Mercure\Exception\InvalidArgumentException;
 
 final class HubRegistry
@@ -24,15 +23,18 @@ final class HubRegistry
     /**
      * @param array<string, HubInterface> $hubs An array of hub instances, where the keys are the names
      */
-    public function __construct(string $defaultHub, array $hubs)
+    public function __construct(HubInterface $defaultHub, array $hubs)
     {
         $this->defaultHub = $defaultHub;
         $this->hubs = $hubs;
     }
 
     public function getHub(string $name = null): HubInterface
     {
-        $name = $name ?? $this->defaultHub;
+        if (null === $name) {
+            return $this->defaultHub;
+        }
+
         if (!isset($this->hubs[$name])) {
             throw new InvalidArgumentException('Invalid hub name provided.');
         }

src/Publisher.php

@@ -36,7 +36,7 @@ final class Publisher implements PublisherInterface
     private $httpClient;
 
     /**
-     * @param (callable(Update $update):string)|TokenProviderInterface $jwtProvider
+     * @param TokenProviderInterface|callable(Update $update):string $jwtProvider
      */
     public function __construct(string $hubUrl, $jwtProvider, HttpClientInterface $httpClient = null)
     {

tests/HubTest.php

@@ -45,7 +45,7 @@ public function testPublish()
         });
 
         $provider = new StaticTokenProvider(self::JWT);
-        $hub = new Hub('default', self::URL, $provider, null, null, $httpClient);
+        $hub = new Hub(self::URL, $provider, null, null, $httpClient);
         $id = $hub->publish(new Update(
             'https://demo.mercure.rocks/demo/books/1.jsonld',
             'Hi from Symfony!',
@@ -70,7 +70,7 @@ public function testNetworkIssue()
         });
 
         $provider = new StaticTokenProvider(self::JWT);
-        $hub = new Hub('default', self::URL, $provider, null, null, $httpClient);
+        $hub = new Hub(self::URL, $provider, null, null, $httpClient);
 
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('Failed to send an update.');
@@ -91,7 +91,7 @@ public function testInvalidJwt()
         $this->expectExceptionMessage('The provided JWT is not valid');
 
         $provider = new StaticTokenProvider("invalid\r\njwt");
-        $hub = new Hub('default', self::URL, $provider, null, null);
+        $hub = new Hub(self::URL, $provider, null, null);
 
         $hub->publish(new Update('https://demo.mercure.rocks/demo/books/1.jsonld', 'Hi from Symfony!'));
     }

tests/Messenger/UpdateHandlerTest.php

@@ -42,7 +42,7 @@ public function testInvoke()
         });
 
         $provider = new StaticTokenProvider(self::JWT);
-        $hub = new Hub('default', self::URL, $provider, null, null, $httpClient);
+        $hub = new Hub(self::URL, $provider, null, null, $httpClient);
         $handler = new UpdateHandler($hub);
 
         $handler(new Update(