Merge branch 'master' of git://github.com/zendframework/zf2

zendframework · Jul 5, 2012 · 17ad876 · 17ad876
commit 17ad876
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 109 deletions.
diff --git a/.travis/run-tests.sh b/.travis/run-tests.sh
diff --git a/.travis/skipped-components b/.travis/skipped-components
diff --git a/.travis/tested-components b/.travis/tested-components
diff --git a/src/BaseInputFilter.php b/src/BaseInputFilter.php
@@ -71,7 +71,7 @@ public function add($input, $name = null)
             ));
         }
 
-        if (empty($name)) {
+        if (is_null($name) || $name === '') {
             $name = $input->getName();
         }
         $this->inputs[$name] = $input;
@@ -167,8 +167,7 @@ public function isValid()
                 // make sure we have a value (empty) for validation
                 $this->data[$name] = '';
             }
-
-            $value = $this->data[$name];
+
             if ($input instanceof InputFilterInterface) {
                 if (!$input->isValid()) {
                     $this->invalidInputs[$name] = $input;

diff --git a/test/BaseInputFilterTest.php b/test/BaseInputFilterTest.php
@@ -186,7 +186,7 @@ public function testCanRetrieveInvalidInputsOnFailedValidation()
         $this->assertArrayNotHasKey('foo', $invalidInputs);
         $this->assertArrayHasKey('bar', $invalidInputs);
         $this->assertInstanceOf('Zend\InputFilter\Input', $invalidInputs['bar']);
-        $this->assertArrayHasKey('nest', $invalidInputs, var_export($invalidInputs, 1));
+        $this->assertArrayHasKey('nest', $invalidInputs/*, var_export($invalidInputs, 1)*/);
         $this->assertInstanceOf('Zend\InputFilter\InputFilterInterface', $invalidInputs['nest']);
         $nestInvalids = $invalidInputs['nest']->getInvalidInput();
         $this->assertArrayHasKey('foo', $nestInvalids);

diff --git a/test/FactoryTest.php b/test/FactoryTest.php
@@ -26,7 +26,6 @@
 use Zend\InputFilter\Factory;
 use Zend\InputFilter\Input;
 use Zend\InputFilter\InputFilter;
-use Zend\Loader\PluginBroker;
 use Zend\Validator;
 
 class FactoryTest extends TestCase
@@ -61,44 +60,45 @@ public function testFactoryAllowsInjectingValidatorChain()
 
     public function testFactoryUsesComposedFilterChainWhenCreatingNewInputObjects()
     {
-        $factory     = new Factory();
-        $filterChain = new Filter\FilterChain();
-        $broker      = new PluginBroker;
-        $filterChain->setBroker($broker);
+        $factory       = new Factory();
+        $filterChain   = new Filter\FilterChain();
+        $pluginManager = new Filter\FilterPluginManager();
+        $filterChain->setPluginManager($pluginManager);
         $factory->setDefaultFilterChain($filterChain);
         $input = $factory->createInput(array(
             'name' => 'foo',
         ));
         $this->assertInstanceOf('Zend\InputFilter\InputInterface', $input);
         $inputFilterChain = $input->getFilterChain();
         $this->assertNotSame($filterChain, $inputFilterChain);
-        $this->assertSame($broker, $inputFilterChain->getBroker());
+        $this->assertSame($pluginManager, $inputFilterChain->getPluginManager());
     }
 
     public function testFactoryUsesComposedValidatorChainWhenCreatingNewInputObjects()
     {
-        $factory        = new Factory();
-        $validatorChain = new Validator\ValidatorChain();
-        $broker         = new PluginBroker;
-        $validatorChain->setBroker($broker);
+        $factory          = new Factory();
+        $validatorChain   = new Validator\ValidatorChain();
+        $validatorPlugins = new Validator\ValidatorPluginManager();
+        $validatorChain->setPluginManager($validatorPlugins);
         $factory->setDefaultValidatorChain($validatorChain);
         $input = $factory->createInput(array(
             'name' => 'foo',
         ));
         $this->assertInstanceOf('Zend\InputFilter\InputInterface', $input);
         $inputValidatorChain = $input->getValidatorChain();
         $this->assertNotSame($validatorChain, $inputValidatorChain);
-        $this->assertSame($broker, $inputValidatorChain->getBroker());
+        $this->assertSame($validatorPlugins, $inputValidatorChain->getPluginManager());
     }
 
     public function testFactoryInjectsComposedFilterAndValidatorChainsIntoInputObjectsWhenCreatingNewInputFilterObjects()
     {
-        $factory        = new Factory();
-        $broker         = new PluginBroker;
-        $filterChain = new Filter\FilterChain();
-        $validatorChain = new Validator\ValidatorChain();
-        $filterChain->setBroker($broker);
-        $validatorChain->setBroker($broker);
+        $factory          = new Factory();
+        $filterPlugins    = new Filter\FilterPluginManager();
+        $validatorPlugins = new Validator\ValidatorPluginManager();
+        $filterChain      = new Filter\FilterChain();
+        $validatorChain   = new Validator\ValidatorChain();
+        $filterChain->setPluginManager($filterPlugins);
+        $validatorChain->setPluginManager($validatorPlugins);
         $factory->setDefaultFilterChain($filterChain);
         $factory->setDefaultValidatorChain($validatorChain);
 
@@ -113,8 +113,8 @@ public function testFactoryInjectsComposedFilterAndValidatorChainsIntoInputObjec
         $this->assertInstanceOf('Zend\InputFilter\InputInterface', $input);
         $inputFilterChain    = $input->getFilterChain();
         $inputValidatorChain = $input->getValidatorChain();
-        $this->assertSame($broker, $inputFilterChain->getBroker());
-        $this->assertSame($broker, $inputValidatorChain->getBroker());
+        $this->assertSame($filterPlugins, $inputFilterChain->getPluginManager());
+        $this->assertSame($validatorPlugins, $inputValidatorChain->getPluginManager());
     }
 
     public function testFactoryWillCreateInputWithSuggestedFilters()

diff --git a/test/InputTest.php b/test/InputTest.php
@@ -135,19 +135,19 @@ public function testIsValidReturnsFalseIfValidationChainFails()
     public function testIsValidReturnsTrueIfValidationChainSucceeds()
     {
         $input  = new Input('foo');
-        $input->setValue('bar');
-        $validator = new Validator\Alpha();
+        $input->setValue('123');
+        $validator = new Validator\Digits();
         $input->getValidatorChain()->addValidator($validator);
         $this->assertTrue($input->isValid());
     }
 
     public function testValidationOperatesOnFilteredValue()
     {
         $input  = new Input('foo');
-        $input->setValue(' bar ');
+        $input->setValue(' 123 ');
         $filter = new Filter\StringTrim();
         $input->getFilterChain()->attach($filter);
-        $validator = new Validator\Alpha();
+        $validator = new Validator\Digits();
         $input->getValidatorChain()->addValidator($validator);
         $this->assertTrue($input->isValid());
     }