Merge branch 'feature/3' into develop

Close #3

Author: weierophinney

CHANGELOG.md

@@ -0,0 +1,22 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 3.0.0 - TBD
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#3](https://github.com/zendframework/zend-tag/pull/3) updates the component
+  to use zend-servicemanager v3.

composer.json

@@ -19,7 +19,7 @@
     },
     "require-dev": {
         "zendframework/zend-config": "~2.5",
-        "zendframework/zend-servicemanager": "~2.5",
+        "zendframework/zend-servicemanager": "dev-develop as 2.7.0",
         "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/PHPUnit": "~4.0"
     },
@@ -31,7 +31,7 @@
     "extra": {
         "branch-alias": {
             "dev-master": "2.5-dev",
-            "dev-develop": "2.6-dev"
+            "dev-develop": "3.0-dev"
         }
     },
     "autoload-dev": {

src/Cloud.php

@@ -10,7 +10,10 @@
 namespace Zend\Tag;
 
 use Traversable;
+use Zend\ServiceManager\ServiceManager;
 use Zend\Stdlib\ArrayUtils;
+use Zend\Tag\Cloud\Decorator\HtmlCloud;
+use Zend\Tag\Cloud\Decorator\HtmlTag;
 
 class Cloud
 {
@@ -208,7 +211,7 @@ public function setCloudDecorator($decorator)
     public function getCloudDecorator()
     {
         if (null === $this->cloudDecorator) {
-            $this->setCloudDecorator('htmlCloud');
+            $this->setCloudDecorator(HtmlCloud::class);
         }
         return $this->cloudDecorator;
     }
@@ -255,7 +258,7 @@ public function setTagDecorator($decorator)
     public function getTagDecorator()
     {
         if (null === $this->tagDecorator) {
-            $this->setTagDecorator('htmlTag');
+            $this->setTagDecorator(HtmlTag::class);
         }
         return $this->tagDecorator;
     }
@@ -280,7 +283,7 @@ public function setDecoratorPluginManager(Cloud\DecoratorPluginManager $decorato
     public function getDecoratorPluginManager()
     {
         if ($this->decorators === null) {
-            $this->decorators = new Cloud\DecoratorPluginManager();
+            $this->decorators = new Cloud\DecoratorPluginManager(new ServiceManager());
         }
 
         return $this->decorators;

src/Cloud/DecoratorPluginManager.php

@@ -10,7 +10,7 @@
 namespace Zend\Tag\Cloud;
 
 use Zend\ServiceManager\AbstractPluginManager;
-use Zend\Tag\Exception;
+use Zend\ServiceManager\Factory\InvokableFactory;
 
 /**
  * Plugin manager implementation for decorators.
@@ -21,38 +21,23 @@
  */
 class DecoratorPluginManager extends AbstractPluginManager
 {
-    /**
-     * Default set of decorators
-     *
-     * @var array
-     */
-    protected $invokableClasses = [
-        'htmlcloud' => 'Zend\Tag\Cloud\Decorator\HtmlCloud',
-        'htmltag'   => 'Zend\Tag\Cloud\Decorator\HtmlTag',
-        'tag'       => 'Zend\Tag\Cloud\Decorator\HtmlTag',
+    protected $aliases = [
+        'htmlcloud' => Decorator\HtmlCloud::class,
+        'htmlCloud' => Decorator\HtmlCloud::class,
+        'Htmlcloud' => Decorator\HtmlCloud::class,
+        'HtmlCloud' => Decorator\HtmlCloud::class,
+        'htmltag'   => Decorator\HtmlTag::class,
+        'htmlTag'   => Decorator\HtmlTag::class,
+        'Htmltag'   => Decorator\HtmlTag::class,
+        'HtmlTag'   => Decorator\HtmlTag::class,
+        'tag'       => Decorator\HtmlTag::class,
+        'Tag'       => Decorator\HtmlTag::class,
     ];
 
-    /**
-     * Validate the plugin
-     *
-     * Checks that the decorator loaded is an instance
-     * of Decorator\DecoratorInterface.
-     *
-     * @param  mixed $plugin
-     * @return void
-     * @throws Exception\InvalidArgumentException if invalid
-     */
-    public function validatePlugin($plugin)
-    {
-        if ($plugin instanceof Decorator\DecoratorInterface) {
-            // we're okay
-            return;
-        }
+    protected $factories = [
+        Decorator\HtmlCloud::class => InvokableFactory::class,
+        Decorator\HtmlTag::class   => InvokableFactory::class,
+    ];
 
-        throw new Exception\InvalidArgumentException(sprintf(
-            'Plugin of type %s is invalid; must implement %s\Decorator\DecoratorInterface',
-            (is_object($plugin) ? get_class($plugin) : gettype($plugin)),
-            __NAMESPACE__
-        ));
-    }
+    protected $instanceOf = Decorator\DecoratorInterface::class;
 }