zf3 updates: duplicate trait and interface

src/Factory/PurifierFilterFactory.php

@@ -5,18 +5,18 @@
 
 namespace Soflomo\Purifier\Factory;
 
+use Soflomo\Purifier\MutableCreationOptionsInterface;
+use Soflomo\Purifier\MutableCreationOptionsTrait;
 use Soflomo\Purifier\PurifierFilter;
-use Zend\Filter\FilterPluginManager;
-use Zend\ServiceManager\MutableCreationOptionsInterface;
-use Zend\ServiceManager\MutableCreationOptionsTrait;
+use Zend\ServiceManager\ServiceManager;
 
 class PurifierFilterFactory implements MutableCreationOptionsInterface
 {
     use MutableCreationOptionsTrait;
 
-    public function __invoke(FilterPluginManager $filterPluginManager)
+    public function __invoke(ServiceManager $serviceManager)
     {
-        $htmlPurifier = $filterPluginManager->getServiceLocator()->get('HTMLPurifier');
+        $htmlPurifier = $serviceManager->get('HTMLPurifier');
 
         return new PurifierFilter($htmlPurifier, $this->getCreationOptions());
     }

src/MutableCreationOptionsInterface.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Soflomo\Purifier;
+
+interface MutableCreationOptionsInterface
+{
+    /**
+     * Set creation options
+     *
+     * @param  array $options
+     * @return void
+     */
+    public function setCreationOptions(array $options);
+}

src/MutableCreationOptionsTrait.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Soflomo\Purifier;
+
+/**
+ * Trait for MutableCreationOptions Factories
+ */
+trait MutableCreationOptionsTrait
+{
+    /**
+     * @var array
+     */
+    protected $creationOptions = array();
+
+    /**
+     * Set creation options
+     *
+     * @param array $creationOptions
+     * @return void
+     */
+    public function setCreationOptions(array $creationOptions)
+    {
+        $this->creationOptions = $creationOptions;
+    }
+
+    /**
+     * Get creation options
+     *
+     * @return array
+     */
+    public function getCreationOptions()
+    {
+        return $this->creationOptions;
+    }
+}