minor #51376 [Notifier] rename GoIP notifier bridge to GoIp (xabbuh)

fabpot · fabpot · commit 16a4681b5b7a · 2023-08-14T09:49:57.000+02:00
This PR was merged into the 6.4 branch. Discussion ---------- [Notifier] rename GoIP notifier bridge to GoIp | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | Let's be consistent in naming our bridges. Commits ------- c2feb5e rename GoIP notifier bridge to GopIp
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2799,7 +2799,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             NotifierBridge\FreeMobile\FreeMobileTransportFactory::class => 'notifier.transport_factory.free-mobile',
             NotifierBridge\GatewayApi\GatewayApiTransportFactory::class => 'notifier.transport_factory.gateway-api',
             NotifierBridge\Gitter\GitterTransportFactory::class => 'notifier.transport_factory.gitter',
-            NotifierBridge\GoIP\GoIPTransportFactory::class => 'notifier.transport_factory.goip',
+            NotifierBridge\GoIp\GoIpTransportFactory::class => 'notifier.transport_factory.goip',
             NotifierBridge\GoogleChat\GoogleChatTransportFactory::class => 'notifier.transport_factory.google-chat',
             NotifierBridge\Infobip\InfobipTransportFactory::class => 'notifier.transport_factory.infobip',
             NotifierBridge\Iqsms\IqsmsTransportFactory::class => 'notifier.transport_factory.iqsms',
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
@@ -303,7 +303,7 @@
         ->set('notifier.transport_factory.redlink', Bridge\Redlink\RedlinkTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
-        ->set('notifier.transport_factory.goip', Bridge\GoIP\GoIPTransportFactory::class)
+        ->set('notifier.transport_factory.goip', Bridge\GoIp\GoIpTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
     ;
diff --git a/src/Symfony/Component/Notifier/Bridge/GoIP/GoIpOptions.php b/src/Symfony/Component/Notifier/Bridge/GoIP/GoIpOptions.php
@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Notifier\Bridge\GoIP;
+namespace Symfony\Component\Notifier\Bridge\GoIp;
 
 use Symfony\Component\Notifier\Message\MessageOptionsInterface;
 
 /**
  * @author Ahmed Ghanem <ahmedghanem7361@gmail.com>
  */
-final class GoIPOptions implements MessageOptionsInterface
+final class GoIpOptions implements MessageOptionsInterface
 {
     private array $options = [];
 
diff --git a/src/Symfony/Component/Notifier/Bridge/GoIP/GoIpTransport.php b/src/Symfony/Component/Notifier/Bridge/GoIP/GoIpTransport.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Notifier\Bridge\GoIP;
+namespace Symfony\Component\Notifier\Bridge\GoIp;
 
 use Symfony\Component\Notifier\Exception\LogicException;
 use Symfony\Component\Notifier\Exception\TransportException;
@@ -28,7 +28,7 @@
 /**
  * @author Ahmed Ghanem <ahmedghanem7361@gmail.com>
  */
-final class GoIPTransport extends AbstractTransport
+final class GoIpTransport extends AbstractTransport
 {
     public function __construct(
         private readonly string $username,
@@ -48,7 +48,7 @@ public function __toString(): string
 
     public function supports(MessageInterface $message): bool
     {
-        return $message instanceof SmsMessage && (null === $message->getOptions() || $message->getOptions() instanceof GoIPOptions);
+        return $message instanceof SmsMessage && (null === $message->getOptions() || $message->getOptions() instanceof GoIpOptions);
     }
 
     /**
@@ -63,8 +63,8 @@ protected function doSend(MessageInterface $message): SentMessage
             throw new UnsupportedMessageTypeException(__CLASS__, SmsMessage::class, $message);
         }
 
-        if (($options = $message->getOptions()) && !$options instanceof GoIPOptions) {
-            throw new LogicException(sprintf('The "%s" transport only supports an instance of the "%s" as an option class.', __CLASS__, GoIPOptions::class));
+        if (($options = $message->getOptions()) && !$options instanceof GoIpOptions) {
+            throw new LogicException(sprintf('The "%s" transport only supports an instance of the "%s" as an option class.', __CLASS__, GoIpOptions::class));
         }
 
         if ('' !== $message->getFrom()) {
diff --git a/src/Symfony/Component/Notifier/Bridge/GoIP/GoIpTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/GoIP/GoIpTransportFactory.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Notifier\Bridge\GoIP;
+namespace Symfony\Component\Notifier\Bridge\GoIp;
 
 use Symfony\Component\Notifier\Exception\InvalidArgumentException;
 use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
@@ -19,11 +19,11 @@
 /**
  * @author Ahmed Ghanem <ahmedghanem7361@gmail.com>
  */
-final class GoIPTransportFactory extends AbstractTransportFactory
+final class GoIpTransportFactory extends AbstractTransportFactory
 {
     private const SCHEME_NAME = 'goip';
 
-    public function create(Dsn $dsn): GoIPTransport
+    public function create(Dsn $dsn): GoIpTransport
     {
         if (self::SCHEME_NAME !== $dsn->getScheme()) {
             throw new UnsupportedSchemeException($dsn, self::SCHEME_NAME, $this->getSupportedSchemes());
@@ -36,7 +36,7 @@ public function create(Dsn $dsn): GoIPTransport
             throw new InvalidArgumentException(sprintf('The provided SIM-Slot: "%s" is not valid.', $simSlot));
         }
 
-        return (new GoIPTransport($username, $password, $simSlot, $this->client, $this->dispatcher))
+        return (new GoIpTransport($username, $password, $simSlot, $this->client, $this->dispatcher))
             ->setHost($dsn->getHost())
             ->setPort($dsn->getPort());
     }
diff --git a/src/Symfony/Component/Notifier/Bridge/GoIP/Tests/GoIpTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/GoIP/Tests/GoIpTransportFactoryTest.php
@@ -9,15 +9,15 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Notifier\Bridge\GoIP\Tests;
+namespace Symfony\Component\Notifier\Bridge\GoIp\Tests;
 
-use Symfony\Component\Notifier\Bridge\GoIP\GoIPTransportFactory;
+use Symfony\Component\Notifier\Bridge\GoIp\GoIpTransportFactory;
 use Symfony\Component\Notifier\Test\TransportFactoryTestCase;
 
 /**
  * @author Ahmed Ghanem <ahmedghanem7361@gmail.com>
  */
-final class GoIPTransportFactoryTest extends TransportFactoryTestCase
+final class GoIpTransportFactoryTest extends TransportFactoryTestCase
 {
     public static function createProvider(): iterable
     {
@@ -48,8 +48,8 @@ public static function missingRequiredOptionProvider(): iterable
         yield 'missing required option: sim_slot' => ['goip://user:pass@host.test'];
     }
 
-    public function createFactory(): GoIPTransportFactory
+    public function createFactory(): GoIpTransportFactory
     {
-        return new GoIPTransportFactory();
+        return new GoIpTransportFactory();
     }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/GoIP/Tests/GoIpTransportTest.php b/src/Symfony/Component/Notifier/Bridge/GoIP/Tests/GoIpTransportTest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Notifier\Bridge\GoIP\Tests;
+namespace Symfony\Component\Notifier\Bridge\GoIp\Tests;
 
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\Response\MockResponse;
-use Symfony\Component\Notifier\Bridge\GoIP\GoIPOptions;
-use Symfony\Component\Notifier\Bridge\GoIP\GoIPTransport;
+use Symfony\Component\Notifier\Bridge\GoIp\GoIpOptions;
+use Symfony\Component\Notifier\Bridge\GoIp\GoIpTransport;
 use Symfony\Component\Notifier\Exception\TransportException;
 use Symfony\Component\Notifier\Exception\TransportExceptionInterface;
 use Symfony\Component\Notifier\Message\ChatMessage;
@@ -26,24 +26,24 @@
 /**
  * @author Ahmed Ghanem <ahmedghanem7361@gmail.com>
  */
-final class GoIPTransportTest extends TransportTestCase
+final class GoIpTransportTest extends TransportTestCase
 {
     public static function toStringProvider(): iterable
     {
         yield ['goip://host.test:4000?sim_slot=4', self::createTransport()];
     }
 
-    public static function createTransport(HttpClientInterface $client = null): GoIPTransport
+    public static function createTransport(HttpClientInterface $client = null): GoIpTransport
     {
-        return (new GoIPTransport('user', 'pass', 4, $client ?? new MockHttpClient()))
+        return (new GoIpTransport('user', 'pass', 4, $client ?? new MockHttpClient()))
             ->setHost('host.test')
             ->setPort(4000);
     }
 
     public static function supportedMessagesProvider(): iterable
     {
         $message = new SmsMessage('0611223344', 'Hello!');
-        $message->options((new GoIPOptions())->setSimSlot(3));
+        $message->options((new GoIpOptions())->setSimSlot(3));
 
         yield [$message];
     }
diff --git a/src/Symfony/Component/Notifier/Bridge/GoIP/composer.json b/src/Symfony/Component/Notifier/Bridge/GoIP/composer.json
@@ -22,7 +22,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Symfony\\Component\\Notifier\\Bridge\\GoIP\\": ""
+            "Symfony\\Component\\Notifier\\Bridge\\GoIp\\": ""
         },
 
         "exclude-from-classmap": [
diff --git a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php
@@ -93,7 +93,7 @@ class UnsupportedSchemeException extends LogicException
             'package' => 'symfony/gitter-notifier',
         ],
         'goip' => [
-            'class' => Bridge\GoIP\GoIPTransportFactory::class,
+            'class' => Bridge\GoIp\GoIpTransportFactory::class,
             'package' => 'symfony/goip-notifier',
         ],
         'googlechat' => [
diff --git a/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php b/src/Symfony/Component/Notifier/Tests/Exception/UnsupportedSchemeExceptionTest.php
@@ -45,7 +45,7 @@ public static function setUpBeforeClass(): void
             Bridge\FreeMobile\FreeMobileTransportFactory::class => false,
             Bridge\GatewayApi\GatewayApiTransportFactory::class => false,
             Bridge\Gitter\GitterTransportFactory::class => false,
-            Bridge\GoIP\GoIPTransportFactory::class => false,
+            Bridge\GoIp\GoIpTransportFactory::class => false,
             Bridge\GoogleChat\GoogleChatTransportFactory::class => false,
             Bridge\Infobip\InfobipTransportFactory::class => false,
             Bridge\Iqsms\IqsmsTransportFactory::class => false,
diff --git a/src/Symfony/Component/Notifier/Transport.php b/src/Symfony/Component/Notifier/Transport.php
@@ -47,7 +47,7 @@ final class Transport
         Bridge\FreeMobile\FreeMobileTransportFactory::class,
         Bridge\GatewayApi\GatewayApiTransportFactory::class,
         Bridge\Gitter\GitterTransportFactory::class,
-        Bridge\GoIP\GoIPTransportFactory::class,
+        Bridge\GoIp\GoIpTransportFactory::class,
         Bridge\GoogleChat\GoogleChatTransportFactory::class,
         Bridge\Infobip\InfobipTransportFactory::class,
         Bridge\Iqsms\IqsmsTransportFactory::class,

Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@`
`303`	`303`	`->set('notifier.transport_factory.redlink', Bridge\Redlink\RedlinkTransportFactory::class)`
`304`	`304`	`->parent('notifier.transport_factory.abstract')`
`305`	`305`	`->tag('texter.transport_factory')`
`306`		`- ->set('notifier.transport_factory.goip', Bridge\GoIP\GoIPTransportFactory::class)`
	`306`	`+ ->set('notifier.transport_factory.goip', Bridge\GoIp\GoIpTransportFactory::class)`
`307`	`307`	`->parent('notifier.transport_factory.abstract')`
`308`	`308`	`->tag('texter.transport_factory')`
`309`	`309`	`;`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* file that was distributed with this source code.`
`10`	`10`	`*/`
`11`	`11`
`12`		`-namespace Symfony\Component\Notifier\Bridge\GoIP;`
	`12`	`+namespace Symfony\Component\Notifier\Bridge\GoIp;`
`13`	`13`
`14`	`14`	`use Symfony\Component\Notifier\Exception\LogicException;`
`15`	`15`	`use Symfony\Component\Notifier\Exception\TransportException;`
`@@ -28,7 +28,7 @@`
`28`	`28`	`/**`
`29`	`29`	`* @author Ahmed Ghanem <ahmedghanem7361@gmail.com>`
`30`	`30`	`*/`
`31`		`-final class GoIPTransport extends AbstractTransport`
	`31`	`+final class GoIpTransport extends AbstractTransport`
`32`	`32`	`{`
`33`	`33`	`public function __construct(`
`34`	`34`	`private readonly string $username,`
`@@ -48,7 +48,7 @@ public function __toString(): string`
`48`	`48`
`49`	`49`	`public function supports(MessageInterface $message): bool`
`50`	`50`	`{`
`51`		`- return $message instanceof SmsMessage && (null === $message->getOptions() \|\| $message->getOptions() instanceof GoIPOptions);`
	`51`	`+ return $message instanceof SmsMessage && (null === $message->getOptions() \|\| $message->getOptions() instanceof GoIpOptions);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/**`
`@@ -63,8 +63,8 @@ protected function doSend(MessageInterface $message): SentMessage`
`63`	`63`	`throw new UnsupportedMessageTypeException(__CLASS__, SmsMessage::class, $message);`
`64`	`64`	`}`
`65`	`65`
`66`		`- if (($options = $message->getOptions()) && !$options instanceof GoIPOptions) {`
`67`		`- throw new LogicException(sprintf('The "%s" transport only supports an instance of the "%s" as an option class.', __CLASS__, GoIPOptions::class));`
	`66`	`+ if (($options = $message->getOptions()) && !$options instanceof GoIpOptions) {`
	`67`	`+ throw new LogicException(sprintf('The "%s" transport only supports an instance of the "%s" as an option class.', __CLASS__, GoIpOptions::class));`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`if ('' !== $message->getFrom()) {`
Original file line number	Diff line number	Diff line change
`@@ -9,15 +9,15 @@`
`9`	`9`	`* file that was distributed with this source code.`
`10`	`10`	`*/`
`11`	`11`
`12`		`-namespace Symfony\Component\Notifier\Bridge\GoIP\Tests;`
	`12`	`+namespace Symfony\Component\Notifier\Bridge\GoIp\Tests;`
`13`	`13`
`14`		`-use Symfony\Component\Notifier\Bridge\GoIP\GoIPTransportFactory;`
	`14`	`+use Symfony\Component\Notifier\Bridge\GoIp\GoIpTransportFactory;`
`15`	`15`	`use Symfony\Component\Notifier\Test\TransportFactoryTestCase;`
`16`	`16`
`17`	`17`	`/**`
`18`	`18`	`* @author Ahmed Ghanem <ahmedghanem7361@gmail.com>`
`19`	`19`	`*/`
`20`		`-final class GoIPTransportFactoryTest extends TransportFactoryTestCase`
	`20`	`+final class GoIpTransportFactoryTest extends TransportFactoryTestCase`
`21`	`21`	`{`
`22`	`22`	`public static function createProvider(): iterable`
`23`	`23`	`{`
`@@ -48,8 +48,8 @@ public static function missingRequiredOptionProvider(): iterable`
`48`	`48`	`yield 'missing required option: sim_slot' => ['goip://user:pass@host.test'];`
`49`	`49`	`}`
`50`	`50`
`51`		`- public function createFactory(): GoIPTransportFactory`
	`51`	`+ public function createFactory(): GoIpTransportFactory`
`52`	`52`	`{`
`53`		`- return new GoIPTransportFactory();`
	`53`	`+ return new GoIpTransportFactory();`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,12 @@`
`9`	`9`	`* file that was distributed with this source code.`
`10`	`10`	`*/`
`11`	`11`
`12`		`-namespace Symfony\Component\Notifier\Bridge\GoIP\Tests;`
	`12`	`+namespace Symfony\Component\Notifier\Bridge\GoIp\Tests;`
`13`	`13`
`14`	`14`	`use Symfony\Component\HttpClient\MockHttpClient;`
`15`	`15`	`use Symfony\Component\HttpClient\Response\MockResponse;`
`16`		`-use Symfony\Component\Notifier\Bridge\GoIP\GoIPOptions;`
`17`		`-use Symfony\Component\Notifier\Bridge\GoIP\GoIPTransport;`
	`16`	`+use Symfony\Component\Notifier\Bridge\GoIp\GoIpOptions;`
	`17`	`+use Symfony\Component\Notifier\Bridge\GoIp\GoIpTransport;`
`18`	`18`	`use Symfony\Component\Notifier\Exception\TransportException;`
`19`	`19`	`use Symfony\Component\Notifier\Exception\TransportExceptionInterface;`
`20`	`20`	`use Symfony\Component\Notifier\Message\ChatMessage;`
`@@ -26,24 +26,24 @@`
`26`	`26`	`/**`
`27`	`27`	`* @author Ahmed Ghanem <ahmedghanem7361@gmail.com>`
`28`	`28`	`*/`
`29`		`-final class GoIPTransportTest extends TransportTestCase`
	`29`	`+final class GoIpTransportTest extends TransportTestCase`
`30`	`30`	`{`
`31`	`31`	`public static function toStringProvider(): iterable`
`32`	`32`	`{`
`33`	`33`	`yield ['goip://host.test:4000?sim_slot=4', self::createTransport()];`
`34`	`34`	`}`
`35`	`35`
`36`		`- public static function createTransport(HttpClientInterface $client = null): GoIPTransport`
	`36`	`+ public static function createTransport(HttpClientInterface $client = null): GoIpTransport`
`37`	`37`	`{`
`38`		`- return (new GoIPTransport('user', 'pass', 4, $client ?? new MockHttpClient()))`
	`38`	`+ return (new GoIpTransport('user', 'pass', 4, $client ?? new MockHttpClient()))`
`39`	`39`	`->setHost('host.test')`
`40`	`40`	`->setPort(4000);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public static function supportedMessagesProvider(): iterable`
`44`	`44`	`{`
`45`	`45`	`$message = new SmsMessage('0611223344', 'Hello!');`
`46`		`- $message->options((new GoIPOptions())->setSimSlot(3));`
	`46`	`+ $message->options((new GoIpOptions())->setSimSlot(3));`
`47`	`47`
`48`	`48`	`yield [$message];`
`49`	`49`	`}`