Update dependencies and remove unsed file. (#69)

Co-authored-by: Wilmer Arambula <terabytesoftw@users.noreply.github.com>
yiisoft · Feb 14, 2024 · d7fe4ee · d7fe4ee
1 parent 21f4072
commit d7fe4ee
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 72 deletions.
diff --git a/captainhook.json b/captainhook.json
diff --git a/composer-require-checker.json b/composer-require-checker.json
@@ -1,5 +1,15 @@
 {
  "symbol-whitelist": [
+ "Symfony\\Component\\Mailer\\Bridge\\Amazon\\Transport\\SesTransportFactory",
+ "Symfony\\Component\\Mailer\\Bridge\\Google\\Transport\\GmailTransportFactory",
+ "Symfony\\Component\\Mailer\\Bridge\\Infobip\\Transport\\InfobipTransportFactory",
+ "Symfony\\Component\\Mailer\\Bridge\\Mailchimp\\Transport\\MandrillTransportFactory",
+ "Symfony\\Component\\Mailer\\Bridge\\Mailgun\\Transport\\MailgunTransportFactory",
+ "Symfony\\Component\\Mailer\\Bridge\\Mailjet\\Transport\\MailjetTransportFactory",
+ "Symfony\\Component\\Mailer\\Bridge\\OhMySmtp\\Transport\\OhMySmtpTransportFactory",
+ "Symfony\\Component\\Mailer\\Bridge\\Postmark\\Transport\\PostmarkTransportFactory",
+ "Symfony\\Component\\Mailer\\Bridge\\Sendgrid\\Transport\\SendgridTransportFactory",
+ "Symfony\\Component\\Mailer\\Bridge\\Sendinblue\\Transport\\SendinblueTransportFactory",
  "yii\\psr\\DynamicLogger"
  ]
 }
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
  ],
  "require": {
  "php": ">=8.1",
- "psr/event-dispatcher": "1.0.0",
+ "psr/event-dispatcher": "^1.0",
  "symfony/mailer": "^6.4 || ^7.0",
  "symfony/mime": "^6.4 || ^7.0",
  "yiisoft/yii2": ">=2.0.4"
@@ -79,4 +79,4 @@
  "psalm": "psalm",
  "test": "phpunit"
  }
-}
+}
diff --git a/src/Mailer.php b/src/Mailer.php
@@ -84,6 +84,7 @@ private function getTransport(): TransportInterface
 
  /**
  * @psalm-suppress UndefinedClass
+ * @psalm-suppress RedundantConditionGivenDocblockType
  * @throws InvalidConfigException
  * @throws \yii\di\NotInstantiableException
  */
@@ -92,8 +93,9 @@ private function getTransportFactory(): Transport
  if (isset($this->transportFactory)) {
  return $this->transportFactory;
  }
+
  // Use the Yii DI container, if available.
- if (isset(\Yii::$container)) {
+ if (isset(Yii::$container)) {
  $factories = [];
  foreach ([
  NullTransportFactory::class,
@@ -114,13 +116,13 @@ private function getTransportFactory(): Transport
  if (!class_exists($factoryClass)) {
  continue;
  }
- $factories[] = \Yii::$container->get($factoryClass);
+ $factories[] = Yii::$container->get($factoryClass);
  }
  } else {
  $factories = Transport::getDefaultFactories();
  }
 
- /** @psalm-suppress InvalidArgument Symfony's type annotation is wrong */
+ /** @psalm-var array<array-key, \Symfony\Component\Mailer\Transport\TransportFactoryInterface> $factories */
  return new Transport($factories);
  }
 
@@ -154,7 +156,7 @@ private function createTransport(array $config = []): TransportInterface
  }
 
  /**
- * @param MessageWrapperInterface&MessageInterface $message
+ * @param MessageInterface|MessageWrapperInterface $message
  * @throws \Symfony\Component\Mailer\Exception\TransportExceptionInterface
  */
  protected function sendMessage($message): bool

diff --git a/tests/MailerTest.php b/tests/MailerTest.php
@@ -169,7 +169,7 @@ public function testSendMessageThrowsOnBadMessageType(): void
 
  public function testDiContainer(): void
  {
- \Yii::$container = new Container();
+ Yii::$container = new Container();
 
  $dispatcherMock = $this->getMockBuilder(EventDispatcherInterface::class)->getMock();
  $dispatcherCreator = $this
@@ -180,7 +180,7 @@ public function testDiContainer(): void
  $dispatcherCreator
  ->expects(self::atLeastOnce())
  ->method('__invoke')->willReturn($dispatcherMock);
- \Yii::$container->set(EventDispatcherInterface::class, $dispatcherCreator);
+ Yii::$container->set(EventDispatcherInterface::class, $dispatcherCreator);
 
 
  $mailer = new Mailer();