Merge branch 'feature/15' into develop

Close #15
Close #17

.travis.yml

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

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
+
+- [#15](https://github.com/zendframework/zend-filter/pull/15) updates the
+  component to use the v3 versions of zend-servicemanager and zend-crypt.

composer.json

@@ -18,10 +18,10 @@
     },
     "require-dev": {
         "zendframework/zend-config": "~2.5",
-        "zendframework/zend-crypt": "~2.5",
+        "zendframework/zend-crypt": "dev-develop as 2.7",
         "zendframework/zend-i18n": "~2.5",
         "zendframework/zend-loader": "~2.5",
-        "zendframework/zend-servicemanager": "~2.5",
+        "zendframework/zend-servicemanager": "dev-develop as 2.7",
         "zendframework/zend-uri": "~2.5",
         "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/PHPUnit": "~4.0"

src/FilterChain.php

@@ -11,6 +11,7 @@
 
 use Countable;
 use Traversable;
+use Zend\ServiceManager\ServiceManager;
 use Zend\Stdlib\PriorityQueue;
 
 class FilterChain extends AbstractFilter implements Countable
@@ -108,7 +109,7 @@ public function count()
     public function getPluginManager()
     {
         if (!$this->plugins) {
-            $this->setPluginManager(new FilterPluginManager());
+            $this->setPluginManager(new FilterPluginManager(new ServiceManager()));
         }
         return $this->plugins;
     }

src/Inflector.php

@@ -10,6 +10,7 @@
 namespace Zend\Filter;
 
 use Traversable;
+use Zend\ServiceManager\ServiceManager;
 use Zend\Stdlib\ArrayUtils;
 
 /**
@@ -86,7 +87,7 @@ public function __construct($options = null)
     public function getPluginManager()
     {
         if (!$this->pluginManager instanceof FilterPluginManager) {
-            $this->setPluginManager(new FilterPluginManager());
+            $this->setPluginManager(new FilterPluginManager(new ServiceManager()));
         }
 
         return $this->pluginManager;

src/StaticFilter.php

@@ -9,6 +9,8 @@
 
 namespace Zend\Filter;
 
+use Zend\ServiceManager\ServiceManager;
+
 class StaticFilter
 {
     /**
@@ -24,10 +26,6 @@ class StaticFilter
      */
     public static function setPluginManager(FilterPluginManager $manager = null)
     {
-        // Don't share by default to allow different arguments on subsequent calls
-        if ($manager instanceof FilterPluginManager) {
-            $manager->setShareByDefault(false);
-        }
         static::$plugins = $manager;
     }
 
@@ -39,8 +37,9 @@ public static function setPluginManager(FilterPluginManager $manager = null)
     public static function getPluginManager()
     {
         if (null === static::$plugins) {
-            static::setPluginManager(new FilterPluginManager());
+            static::setPluginManager(new FilterPluginManager(new ServiceManager()));
         }
+
         return static::$plugins;
     }
 

src/Word/Service/SeparatorToSeparatorFactory.php

@@ -2,52 +2,20 @@
 
 namespace Zend\Filter\Word\Service;
 
+use Interop\Container\ContainerInterface;
 use Zend\Filter\Word\SeparatorToSeparator;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\MutableCreationOptionsInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Zend\ServiceManager\Factory\FactoryInterface;
 
-class SeparatorToSeparatorFactory implements
-    FactoryInterface,
-    MutableCreationOptionsInterface
+class SeparatorToSeparatorFactory implements FactoryInterface
 {
-    /**
-     * @var array
-     */
-    protected $creationOptions = [];
-
-    /**
-     * 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;
-    }
-
     /**
      * {@inheritDoc}
-     *
-     * @return SeparatorToSeparator
-     * @throws ServiceNotCreatedException if Controllermanager service is not found in application service locator
      */
-    public function createService(ServiceLocatorInterface $plugins)
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
         return new SeparatorToSeparator(
-            isset($this->creationOptions['search_separator']) ? $this->creationOptions['search_separator'] : ' ',
-            isset($this->creationOptions['replacement_separator']) ? $this->creationOptions['replacement_separator'] : '-'
+            isset($options['search_separator']) ? $options['search_separator'] : ' ',
+            isset($options['replacement_separator']) ? $options['replacement_separator'] : '-'
         );
     }
 }

test/BlacklistTest.php

@@ -11,6 +11,7 @@
 
 use Zend\Filter\FilterPluginManager;
 use Zend\Filter\Blacklist as BlacklistFilter;
+use Zend\ServiceManager\ServiceManager;
 use Zend\Stdlib\ArrayObject;
 
 /**
@@ -39,7 +40,7 @@ public function testConstructorDefaults()
 
     public function testWithPluginManager()
     {
-        $pluginManager = new FilterPluginManager();
+        $pluginManager = new FilterPluginManager(new ServiceManager());
         $filter = $pluginManager->get('blacklist');
 
         $this->assertInstanceOf('Zend\Filter\Blacklist', $filter);

test/Compress/Bz2Test.php

@@ -16,17 +16,21 @@
  */
 class Bz2Test extends \PHPUnit_Framework_TestCase
 {
+    public $target;
+
     public function setUp()
     {
         if (!extension_loaded('bz2')) {
             $this->markTestSkipped('This adapter needs the bz2 extension');
         }
+
+        $this->target = sprintf('%s/%s.bz2', sys_get_temp_dir(), uniqid('zfilter'));
     }
 
     public function tearDown()
     {
-        if (file_exists(__DIR__ . '/../_files/compressed.bz2')) {
-            unlink(__DIR__ . '/../_files/compressed.bz2');
+        if (file_exists($this->target)) {
+            unlink($this->target);
         }
     }
 
@@ -119,7 +123,7 @@ public function testBz2GetSetArchive()
     public function testBz2CompressToFile()
     {
         $filter   = new Bz2Compression();
-        $archive = __DIR__ . '/../_files/compressed.bz2';
+        $archive = $this->target;
         $filter->setArchive($archive);
 
         $content = $filter->compress('compress me');
@@ -154,7 +158,7 @@ public function testBz2ToString()
     public function testBz2DecompressArchive()
     {
         $filter   = new Bz2Compression();
-        $archive = __DIR__ . '/../_files/compressed.bz2';
+        $archive = $this->target;
         $filter->setArchive($archive);
 
         $content = $filter->compress('compress me');

test/Compress/GzTest.php

@@ -16,17 +16,21 @@
  */
 class GzTest extends \PHPUnit_Framework_TestCase
 {
+    public $target;
+
     public function setUp()
     {
         if (!extension_loaded('zlib')) {
             $this->markTestSkipped('This adapter needs the zlib extension');
         }
+
+        $this->target = sprintf('%s/%s.gz', sys_get_temp_dir(), uniqid('zfilter'));
     }
 
     public function tearDown()
     {
-        if (file_exists(__DIR__ . '/../_files/compressed.gz')) {
-            unlink(__DIR__ . '/../_files/compressed.gz');
+        if (file_exists($this->target)) {
+            unlink($this->target);
         }
     }
 
@@ -137,7 +141,7 @@ public function testGzGetSetArchive()
     public function testGzCompressToFile()
     {
         $filter   = new GzCompression();
-        $archive = __DIR__ . '/../_files/compressed.gz';
+        $archive = $this->target;
         $filter->setArchive($archive);
 
         $content = $filter->compress('compress me');