TestMailer now stores messages in the connector. (#5185)

* TestMailer now stores messages in the connector.

* NitPick CI

Author: SamMousa

src/Codeception/Lib/Connector/Yii2.php

@@ -13,6 +13,7 @@
 use Yii;
 use yii\base\ExitException;
 use yii\base\Security;
+use yii\mail\MessageInterface;
 use yii\web\Application;
 use yii\web\ErrorHandler;
 use yii\web\HttpException;
@@ -79,6 +80,8 @@ class Yii2 extends Client
      */
     public $recreateApplication = false;
 
+
+    private $emails = [];
     /**
      * @return \yii\web\Application
      */
@@ -179,16 +182,7 @@ public function getInternalDomains()
      */
     public function getEmails()
     {
-        $app = $this->getApplication();
-        if ($app->has('mailer', true)) {
-            $mailer = $app->get('mailer');
-            if ($mailer instanceof TestMailer) {
-                return $app->get('mailer')->getSentMessages();
-            } else {
-                throw new ConfigurationException("Mailer module is not mocked, can't test emails");
-            }
-        }
-        return [];
+        return $this->emails;
     }
 
     public function getComponent($name)
@@ -257,7 +251,6 @@ public function startApp()
         $config = $this->mockMailer($config);
         /** @var \yii\web\Application $app */
         Yii::$app = Yii::createObject($config);
-
         Yii::setLogger(new Logger());
     }
 
@@ -417,7 +410,10 @@ protected function mockMailer(array $config)
         ];
 
         $mailerConfig = [
-            'class' => 'Codeception\Lib\Connector\Yii2\TestMailer',
+            'class' => TestMailer::class,
+            'callback' => function (MessageInterface $message) {
+                $this->emails[] = $message;
+            }
         ];
 
         if (isset($config['components']['mailer']) && is_array($config['components']['mailer'])) {

src/Codeception/Lib/Connector/Yii2/TestMailer.php

@@ -5,28 +5,22 @@
 
 class TestMailer extends BaseMailer
 {
-    public $messageClass = 'yii\swiftmailer\Message';
+    public $messageClass = \yii\swiftmailer\Message::class;
 
-    private $sentMessages = [];
+    /**
+     * @var \Closure
+     */
+    public $callback;
 
     protected function sendMessage($message)
     {
-        $this->sentMessages[] = $message;
+        call_user_func($this->callback, $message);
         return true;
     }
 
     protected function saveMessage($message)
     {
-        return $this->sendMessage($message);
-    }
-
-    public function getSentMessages()
-    {
-        return $this->sentMessages;
-    }
-
-    public function reset()
-    {
-        $this->sentMessages = [];
+        call_user_func($this->callback, $message);
+        return true;
     }
 }