Merging develop to master in preparation for 2.6.0

Author: weierophinney

.travis.yml

@@ -23,7 +23,6 @@ matrix:
     - php: 7
     - php: hhvm 
   allow_failures:
-    - php: 7
     - php: hhvm
 
 notifications:

CHANGELOG.md

@@ -2,6 +2,31 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.6.0 - 2016-02-18
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#47](https://github.com/zendframework/zend-mail/pull/47) updates the
+  component to remove the (soft) dependency on zend-servicemanager, by
+  altering the `SmtpPluginManager` to implement container-interop's
+  `ContainerInterface` instead of extending from `AbstractPluginManager`.
+  Usage remains the same, though developers who were adding services
+  to the plugin manager will need to instead extend it now.
+- [#70](https://github.com/zendframework/zend-mail/pull/70) updates dependencies
+  to stable, forwards-compatible versions, and removes unused dependencies.
+
 ## 2.5.3 - TBD
 
 ### Added

composer.json

@@ -13,22 +13,18 @@
         }
     },
     "require": {
-        "php": ">=5.5",
-        "zendframework/zend-crypt": "~2.5",
-        "zendframework/zend-loader": "~2.5",
-        "zendframework/zend-mime": "~2.5",
-        "zendframework/zend-stdlib": "~2.5",
-        "zendframework/zend-validator": "~2.5"
+        "php": "^5.5 || ^7.0",
+        "zendframework/zend-crypt": "^2.6",
+        "zendframework/zend-loader": "^2.5",
+        "zendframework/zend-mime": "^2.5",
+        "zendframework/zend-stdlib": "^2.7 || ^3.0",
+        "zendframework/zend-validator": "^2.6"
     },
     "require-dev": {
-        "zendframework/zend-config": "~2.5",
-        "zendframework/zend-servicemanager": "~2.5",
+        "zendframework/zend-config": "^2.6",
         "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/PHPUnit": "~4.0"
     },
-    "suggest": {
-        "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
-    },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "extra": {

src/Protocol/SmtpPluginManager.php

@@ -9,48 +9,48 @@
 
 namespace Zend\Mail\Protocol;
 
-use Zend\ServiceManager\AbstractPluginManager;
+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
 {
     /**
-     * Default set of extensions
+     * Default set of plugins
      *
      * @var array
      */
-    protected $invokableClasses = [
+    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',
     ];
 
     /**
-     * Validate the plugin
+     * Do we have the plugin?
      *
-     * Checks that the extension loaded is an instance of Smtp.
+     * @param  string $id
+     * @return bool
+     */
+    public function has($id)
+    {
+        return array_key_exists($id, $this->plugins);
+    }
+    /**
+     * Retrieve the smtp plugin
      *
-     * @param  mixed $plugin
-     * @return void
-     * @throws Exception\InvalidArgumentException if invalid
+     * @param  string $id
+     * @param  array $options
+     * @return AbstractProtocol
      */
-    public function validatePlugin($plugin)
+    public function get($id, array $options = null)
     {
-        if ($plugin instanceof Smtp) {
-            // we're okay
-            return;
-        }
-
-        throw new Exception\InvalidArgumentException(sprintf(
-            'Plugin of type %s is invalid; must extend %s\Smtp',
-            (is_object($plugin) ? get_class($plugin) : gettype($plugin)),
-            __NAMESPACE__
-        ));
+        $class = $this->plugins[$id];
+        return new $class($options);
     }
 }