Code refactor with the new servicemanager

zendframework · Jan 7, 2016 · a98d7f6 · a98d7f6
1 parent 261bab4
commit a98d7f6
Show file tree

Hide file tree

Showing 7 changed files with 325 additions and 156 deletions.
diff --git a/composer.json b/composer.json
@@ -14,18 +14,19 @@
     },
     "require": {
         "php": ">=5.5",
-        "zendframework/zend-stdlib": "~2.5"
+        "zendframework/zend-stdlib": "dev-develop as 2.8.0",
+        "container-interop/container-interop": "^1.1"
     },
     "require-dev": {
-        "zendframework/zend-cache": "~2.5",
-        "zendframework/zend-config": "~2.5",
-        "zendframework/zend-db": "~2.5",
-        "zendframework/zend-filter": "~2.5",
+        "zendframework/zend-cache": "dev-develop as 2.6.0",
+        "zendframework/zend-config": "dev-develop as 2.6.0",
+        "zendframework/zend-db": "dev-develop as 2.7.0",
+        "zendframework/zend-filter": "dev-develop as 2.6.0",
         "zendframework/zend-http": "~2.5",
-        "zendframework/zend-i18n": "~2.5",
-        "zendframework/zend-math": "~2.5",
-        "zendframework/zend-servicemanager": "~2.5",
-        "zendframework/zend-session": "~2.5",
+        "zendframework/zend-i18n": "dev-develop as 2.6.0",
+        "zendframework/zend-math": "dev-develop as 2.6.0",
+        "zendframework/zend-servicemanager": "dev-develop as 2.7.0",
+        "zendframework/zend-session": "dev-develop as 2.6.0",
         "zendframework/zend-uri": "~2.5",
         "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/PHPUnit": "~4.0"

diff --git a/src/Explode.php b/src/Explode.php
@@ -11,6 +11,7 @@
 
 use Traversable;
 use Zend\Stdlib\ArrayUtils;
+use Zend\ServiceManager\ServiceManager;
 
 class Explode extends AbstractValidator implements ValidatorPluginManagerAwareInterface
 {
@@ -85,7 +86,7 @@ public function setValidatorPluginManager(ValidatorPluginManager $pluginManager)
     public function getValidatorPluginManager()
     {
         if (!$this->pluginManager) {
-            $this->setValidatorPluginManager(new ValidatorPluginManager());
+            $this->setValidatorPluginManager(new ValidatorPluginManager(new ServiceManager));
         }
 
         return $this->pluginManager;

diff --git a/src/StaticValidator.php b/src/StaticValidator.php
@@ -9,6 +9,8 @@
 
 namespace Zend\Validator;
 
+use Zend\ServiceManager\ServiceManager;
+
 class StaticValidator
 {
     /**
@@ -26,7 +28,7 @@ public static function setPluginManager(ValidatorPluginManager $plugins = null)
     {
         // Don't share by default to allow different arguments on subsequent calls
         if ($plugins instanceof ValidatorPluginManager) {
-            $plugins->setShareByDefault(false);
+            $plugins->configure(['shared_by_default' => false]);
         }
         static::$plugins = $plugins;
     }
@@ -39,7 +41,7 @@ public static function setPluginManager(ValidatorPluginManager $plugins = null)
     public static function getPluginManager()
     {
         if (null === static::$plugins) {
-            static::setPluginManager(new ValidatorPluginManager());
+            static::setPluginManager(new ValidatorPluginManager(new ServiceManager));
         }
         return static::$plugins;
     }

diff --git a/src/ValidatorChain.php b/src/ValidatorChain.php
@@ -11,6 +11,7 @@
 
 use Countable;
 use Zend\Stdlib\PriorityQueue;
+use Zend\ServiceManager\ServiceManager;
 
 class ValidatorChain implements
     Countable,
@@ -66,7 +67,7 @@ public function count()
     public function getPluginManager()
     {
         if (!$this->plugins) {
-            $this->setPluginManager(new ValidatorPluginManager());
+            $this->setPluginManager(new ValidatorPluginManager(new ServiceManager));
         }
         return $this->plugins;
     }

diff --git a/src/ValidatorPluginManager.php b/src/ValidatorPluginManager.php
diff --git a/test/StaticValidatorTest.php b/test/StaticValidatorTest.php
@@ -116,14 +116,14 @@ public function testLazyLoadsValidatorPluginManagerByDefault()
 
     public function testCanSetCustomPluginManager()
     {
-        $plugins = new ValidatorPluginManager();
+        $plugins = new ValidatorPluginManager($this->getMockBuilder('Zend\ServiceManager\ServiceManager')->getMock());
         StaticValidator::setPluginManager($plugins);
         $this->assertSame($plugins, StaticValidator::getPluginManager());
     }
 
     public function testPassingNullWhenSettingPluginManagerResetsPluginManager()
     {
-        $plugins = new ValidatorPluginManager();
+        $plugins = new ValidatorPluginManager($this->getMockBuilder('Zend\ServiceManager\ServiceManager')->getMock());
         StaticValidator::setPluginManager($plugins);
         $this->assertSame($plugins, StaticValidator::getPluginManager());
         StaticValidator::setPluginManager(null);
@@ -133,10 +133,10 @@ public function testPassingNullWhenSettingPluginManagerResetsPluginManager()
     public function parameterizedData()
     {
         return [
-            'valid-positive-range'   => [5, 'Between', ['min' => 1, 'max' => 10], true],
-            'valid-negative-range'   => [-5, 'Between', ['min' => -10, 'max' => -1], true],
-            'invalid-positive-range' => [-5, 'Between', ['min' => 1, 'max' => 10], false],
-            'invalid-negative-range' => [5, 'Between', ['min' => -10, 'max' => -1], false],
+            'valid-positive-range'   => [5, 'between', ['min' => 1, 'max' => 10], true],
+            'valid-negative-range'   => [-5, 'between', ['min' => -10, 'max' => -1], true],
+            'invalid-positive-range' => [-5, 'between', ['min' => 1, 'max' => 10], false],
+            'invalid-negative-range' => [5, 'between', ['min' => -10, 'max' => -1], false],
         ];
     }
 
@@ -151,8 +151,8 @@ public function testExecuteValidWithParameters($value, $validator, $options, $ex
     public function invalidParameterizedData()
     {
         return [
-            'positive-range' => [5, 'Between', [1, 10]],
-            'negative-range' => [-5, 'Between', [-10, -1]],
+            'positive-range' => [5, 'between', [1, 10]],
+            'negative-range' => [-5, 'between', [-10, -1]],
         ];
     }
 

diff --git a/test/ValidatorPluginManagerTest.php b/test/ValidatorPluginManagerTest.php
@@ -10,6 +10,7 @@
 namespace ZendTest\Validator;
 
 use Zend\Validator\ValidatorPluginManager;
+use Zend\ServiceManager\ServiceManager;
 
 /**
  * @group      Zend_Validator
@@ -18,7 +19,7 @@ class ValidatorPluginManagerTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        $this->validators = new ValidatorPluginManager();
+        $this->validators = new ValidatorPluginManager(new ServiceManager);
     }
 
     public function testAllowsInjectingTranslator()
@@ -35,11 +36,10 @@ public function testAllowsInjectingTranslator()
             ->with($this->equalTo('MvcTranslator'))
             ->will($this->returnValue(true));
 
-        $this->validators->setServiceLocator($serviceLocator);
-        $this->assertSame($serviceLocator, $this->validators->getServiceLocator());
+        $validators = new ValidatorPluginManager($serviceLocator);
 
-        $validator = $this->validators->get('notempty');
-        $this->assertSame($translator, $validator->getTranslator());
+        $validator = $validators->get('notempty');
+        $this->assertEquals($translator, $validator->getTranslator());
     }
 
     public function testNoTranslatorInjectedWhenTranslatorIsNotPresent()
@@ -50,23 +50,23 @@ public function testNoTranslatorInjectedWhenTranslatorIsNotPresent()
             ->with($this->equalTo('MvcTranslator'))
             ->will($this->returnValue(false));
 
-        $this->validators->setServiceLocator($serviceLocator);
-        $this->assertSame($serviceLocator, $this->validators->getServiceLocator());
+        $validators = new ValidatorPluginManager($serviceLocator);
 
-        $validator = $this->validators->get('notempty');
+        $validator = $validators->get('notempty');
         $this->assertNull($validator->getTranslator());
     }
 
     public function testRegisteringInvalidValidatorRaisesException()
     {
-        $this->setExpectedException('Zend\Validator\Exception\RuntimeException');
+        $this->setExpectedException('Zend\ServiceManager\Exception\InvalidServiceException');
         $this->validators->setService('test', $this);
+        $this->validators->get('test');
     }
 
     public function testLoadingInvalidValidatorRaisesException()
     {
         $this->validators->setInvokableClass('test', get_class($this));
-        $this->setExpectedException('Zend\Validator\Exception\RuntimeException');
+        $this->setExpectedException('Zend\ServiceManager\Exception\InvalidServiceException');
         $this->validators->get('test');
     }