MailExtension: added getConfigSchema()

Author: dg

composer.json

@@ -24,6 +24,9 @@
 "nette/tester": "^2.0",
 "tracy/tracy": "^2.4"
 },
+"conflict": {
+"nette/di": "<3.0"
+},
 "suggest": {
 "ext-fileinfo": "to detect type of attached files"
 },

src/Bridges/MailDI/MailExtension.php

@@ -10,39 +10,42 @@
 namespace Nette\Bridges\MailDI;
 
 use Nette;
+use Nette\Schema\Expect;
 
 
 /**
  * Mail extension for Nette DI.
  */
 class MailExtension extends Nette\DI\CompilerExtension
 {
-public $defaults = [
-'smtp' => false,
-'host' => null,
-'port' => null,
-'username' => null,
-'password' => null,
-'secure' => null,
-'timeout' => null,
-'context' => null,
-'clientHost' => null,
-'persistent' => false,
-];
+public function getConfigSchema(): Nette\Schema\Schema
+{
+return Expect::structure([
+'smtp' => Expect::bool(false),
+'host' => Expect::string()->dynamic(),
+'port' => Expect::int()->dynamic(),
+'username' => Expect::string()->dynamic(),
+'password' => Expect::string()->dynamic(),
+'secure' => Expect::enum(null, 'ssl', 'tls')->dynamic(),
+'timeout' => Expect::int()->dynamic(),
+'context' => Expect::arrayOf('array')->dynamic(),
+'clientHost' => Expect::string()->dynamic(),
+'persistent' => Expect::bool(false)->dynamic(),
+])->castTo('array');
+}
 
 
 public function loadConfiguration()
 {
 $builder = $this->getContainerBuilder();
-$config = $this->validateConfig($this->defaults);
 
 $mailer = $builder->addDefinition($this->prefix('mailer'))
 ->setType(Nette\Mail\IMailer::class);
 
-if (empty($config['smtp'])) {
-$mailer->setFactory(Nette\Mail\SendmailMailer::class);
+if ($this->config['smtp']) {
+$mailer->setFactory(Nette\Mail\SmtpMailer::class, [$this->config]);
 } else {
-$mailer->setFactory(Nette\Mail\SmtpMailer::class, [$config]);
+$mailer->setFactory(Nette\Mail\SendmailMailer::class);
 }
 
 if ($this->name === 'mail') {