Revert "Re-implement SmtpPluginManager as an AbstractPluginManager"

This reverts commit 67641e6.

Author: xgin

composer.json

@@ -28,12 +28,10 @@
         "phpunit/phpunit": "^5.7.25 || ^6.4.4 || ^7.1.4",
         "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-config": "^2.6",
-        "zendframework/zend-crypt": "^2.6 || ^3.0",
-        "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1"
+        "zendframework/zend-crypt": "^2.6 || ^3.0"
     },
     "suggest": {
-        "zendframework/zend-crypt": "Crammd5 support in SMTP Auth",
-        "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1 when using SMTP to deliver messages"
+        "zendframework/zend-crypt": "Crammd5 support in SMTP Auth"
     },
     "autoload": {
         "psr-4": {
@@ -52,10 +50,6 @@
         "branch-alias": {
             "dev-master": "2.10.x-dev",
             "dev-develop": "2.11.x-dev"
-        },
-        "zf": {
-            "component": "Zend\\Mail",
-            "config-provider": "Zend\\Mail\\ConfigProvider"
         }
     },
     "scripts": {

src/ConfigProvider.php

@@ -7,95 +7,48 @@
 
 namespace Zend\Mail\Protocol;
 
-use Zend\ServiceManager\AbstractPluginManager;
-use Zend\ServiceManager\Exception\InvalidServiceException;
-use Zend\ServiceManager\Factory\InvokableFactory;
+use Interop\Container\ContainerInterface;
 
 /**
  * Plugin manager implementation for SMTP extensions.
  *
  * Enforces that SMTP extensions retrieved are instances of Smtp. Additionally,
  * it registers a number of default extensions available.
  */
-class SmtpPluginManager extends AbstractPluginManager
+class SmtpPluginManager implements ContainerInterface
 {
     /**
-     * Service aliases
-     */
-    protected $aliases = [
-        'crammd5' => Smtp\Auth\Crammd5::class,
-        'cramMd5' => Smtp\Auth\Crammd5::class,
-        'CramMd5' => Smtp\Auth\Crammd5::class,
-        'cramMD5' => Smtp\Auth\Crammd5::class,
-        'CramMD5' => Smtp\Auth\Crammd5::class,
-        'login'   => Smtp\Auth\Login::class,
-        'Login'   => Smtp\Auth\Login::class,
-        'plain'   => Smtp\Auth\Plain::class,
-        'Plain'   => Smtp\Auth\Plain::class,
-        'smtp'    => Smtp::class,
-        'Smtp'    => Smtp::class,
-        'SMTP'    => Smtp::class,
-    ];
-
-    /**
-     * Service factories
+     * Default set of plugins
      *
      * @var array
      */
-    protected $factories = [
-        Smtp\Auth\Crammd5::class => InvokableFactory::class,
-        Smtp\Auth\Login::class   => InvokableFactory::class,
-        Smtp\Auth\Plain::class   => InvokableFactory::class,
-        Smtp::class              => InvokableFactory::class,
-
-        // v2 normalized service names
-
-        'zendmailprotocolsmtpauthcrammd5' => InvokableFactory::class,
-        'zendmailprotocolsmtpauthlogin'   => InvokableFactory::class,
-        'zendmailprotocolsmtpauthplain'   => InvokableFactory::class,
-        'zendmailprotocolsmtp'            => InvokableFactory::class,
+    protected $plugins = [
+        'crammd5' => 'Zend\Mail\Protocol\Smtp\Auth\Crammd5',
+        'login'   => 'Zend\Mail\Protocol\Smtp\Auth\Login',
+        'plain'   => 'Zend\Mail\Protocol\Smtp\Auth\Plain',
+        'smtp'    => 'Zend\Mail\Protocol\Smtp',
     ];
 
     /**
-     * Plugins must be an instance of the Smtp class
+     * Do we have the plugin?
      *
-     * @var string
+     * @param  string $id
+     * @return bool
      */
-    protected $instanceOf = Smtp::class;
-
-    /**
-     * Validate a retrieved plugin instance (v3).
-     *
-     * @param object $plugin
-     * @throws InvalidServiceException
-     */
-    public function validate($plugin)
+    public function has($id)
     {
-        if (! $plugin instanceof $this->instanceOf) {
-            throw new InvalidServiceException(sprintf(
-                'Plugin of type %s is invalid; must extend %s',
-                (is_object($plugin) ? get_class($plugin) : gettype($plugin)),
-                Smtp::class
-            ));
-        }
+        return array_key_exists($id, $this->plugins);
     }
-
     /**
-     * Validate a retrieved plugin instance (v2).
+     * Retrieve the smtp plugin
      *
-     * @param object $plugin
-     * @throws Exception\InvalidArgumentException
+     * @param  string $id
+     * @param  array $options
+     * @return AbstractProtocol
      */
-    public function validatePlugin($plugin)
+    public function get($id, array $options = null)
     {
-        try {
-            $this->validate($plugin);
-        } catch (InvalidServiceException $e) {
-            throw new Exception\InvalidArgumentException(
-                $e->getMessage(),
-                $e->getCode(),
-                $e
-            );
-        }
+        $class = $this->plugins[$id];
+        return new $class($options);
     }
 }

src/Module.php

@@ -12,7 +12,6 @@
 use Zend\Mail\Message;
 use Zend\Mail\Protocol;
 use Zend\Mail\Protocol\Exception as ProtocolException;
-use Zend\ServiceManager\ServiceManager;
 
 /**
  * SMTP connection object
@@ -129,7 +128,7 @@ public function setPluginManager(Protocol\SmtpPluginManager $plugins)
     public function getPluginManager()
     {
         if (null === $this->plugins) {
-            $this->setPluginManager(new Protocol\SmtpPluginManager(new ServiceManager()));
+            $this->setPluginManager(new Protocol\SmtpPluginManager());
         }
         return $this->plugins;
     }