Changeset 1021

Timestamp:

11/09/07 22:41:01 (1 year ago)

Author:

mikey

Message:

added new hasValueErrorWithId() method, implements enhancement #95

Files:

• trunk/src/main/php/net/stubbles/ipo/request/stubAbstractRequest.php (modified) (10 diffs)
• trunk/src/main/php/net/stubbles/ipo/request/stubRequest.php (modified) (2 diffs)
• trunk/src/main/php/net/stubbles/ipo/request/stubRequestPrefixDecorator.php (modified) (1 diff)
• trunk/src/test/php/net/stubbles/ipo/request/stubAbstractRequestTestCase.php (modified) (8 diffs)
• trunk/src/test/php/net/stubbles/ipo/request/stubRequestPrefixDecoratorTestCase.php (modified) (3 diffs)

trunk/src/main/php/net/stubbles/ipo/request/stubAbstractRequest.php

@@ -108 +108 @@
-    {
-        $error =& $this->getErrors($source);
-
-
+=
+->getId() => $valueError
-        } else {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-     *
-     * @param   string  $valueName  name of request value
@@ -133 +126 @@
-        $error = $this->getErrors($source);
-        return isset($error[$valueName]);
+    }
+
+    /**
+     * checks whether a request value has a specific error after a filter was applied
+     *
+     * @param   string  $valueName  name of request value
+     * @param   string  $errorId    id of error to check for
+     * @param   int     $source     optional  source type: cookie, header, param
+     * @return  bool
+     */
+    public function hasValueErrorWithId($valueName, $errorId, $source = stubRequest::SOURCE_PARAM)
+    {
+        $error = $this->getErrors($source);
+        return (isset($error[$valueName]) && isset($error[$valueName][$errorId]));
-    }
-
@@ -145 +152 @@
-    {
-        $error = $this->getErrors($source);
-
+=
-            return $error[$valueName];
-        }
@@ -206 +213 @@
-    public function cancel(stubEventDispatcher $dispatcher = null)
-    {
-
+=
-            return;
-        }
@@ -212 +219 @@
-        $this->isCancelled = true;
-        
-
+=
-            $dispatcher = stubEventDispatcher::getInstance();
-        }
@@ -252 +259 @@
-    {
-        $rawData = $this->getRawData();
-
+=
-            return $this->getRawData();
-        }
@@ -269 +276 @@
-    {
-        $rawData = $this->getRawData();
-
-
+ // implicit test for empty string included
+=
-                return $filter->getDefaultValue();
-            }
@@ -298 +305 @@
-    {
-        $data = $this->getValues($source);
-
+=
-            return $validator->validate($data[$valueName]);
-        }
@@ -318 +325 @@
-    {
-        $data = $this->getValues($source);
- true && $validator->validate($data[$valueName]) 
+= true && $validator->validate($data[$valueName]) =
-            return $data[$valueName];
-        }
@@ -337 +344 @@
-    {
-        $data = $this->getValues($source);
-
-
+=
+=
-                return $filter->getDefaultValue();
-            }

trunk/src/main/php/net/stubbles/ipo/request/stubRequest.php

@@ -61 +61 @@
-
-    /**
-
+y
-     *
-     * @param   string  $valueName  name of request value
@@ -68 +68 @@
-     */
-    public function hasValueError($valueName, $source = self::SOURCE_PARAM);
+
+    /**
+     * checks whether a request value has a specific error after a filter was applied
+     *
+     * @param   string  $valueName  name of request value
+     * @param   string  $errorId    id of error to check for
+     * @param   int     $source     optional  source type: cookie, header, param
+     * @return  bool
+     */
+    public function hasValueErrorWithId($valueName, $errorId, $source = stubRequest::SOURCE_PARAM);
-
-    /**

trunk/src/main/php/net/stubbles/ipo/request/stubRequestPrefixDecorator.php

@@ -118 +118 @@
-
-    /**
+     * checks whether a request value has a specific error after a filter was applied
+     *
+     * @param   string  $valueName  name of request value
+     * @param   string  $errorId    id of error to check for
+     * @param   int     $source     optional  source type: cookie, header, param
+     * @return  bool
+     */
+    public function hasValueErrorWithId($valueName, $errorId, $source = stubRequest::SOURCE_PARAM)
+    {
+        if ($this->applyPrefix($source) == true) {
+            $valueName = $this->prefix . '_' . $valueName;
+        }
+        
+        return $this->request->hasValueErrorWithId($valueName, $errorId, $source);
+    }
+
+    /**
-     * returns a list of errors for given request value
-     *

trunk/src/test/php/net/stubbles/ipo/request/stubAbstractRequestTestCase.php

@@ -240 +240 @@
-    {
-        $this->assertFalse($this->request->hasValueError('foo'));
+        $this->assertFalse($this->request->hasValueErrorWithId('foo', 'bar'));
-        $this->assertEqual($this->request->getValueError('foo'), array());
-        $this->assertFalse($this->request->hasValueErrors());
@@ -245 +246 @@
-        
-        $this->assertFalse($this->request->hasValueError('foo', stubRequest::SOURCE_PARAM));
+        $this->assertFalse($this->request->hasValueErrorWithId('foo', 'bar', stubRequest::SOURCE_PARAM));
-        $this->assertEqual($this->request->getValueError('foo', stubRequest::SOURCE_PARAM), array());
-        $this->assertEqual($this->request->getValueErrors('foo', stubRequest::SOURCE_PARAM), array());
@@ -255 +257 @@
-        $this->request->addValueError($errorValue, 'foo');
-        $this->assertTrue($this->request->hasValueError('foo'));
-
+
+
-        $this->assertTrue($this->request->hasValueErrors());
-
+'bar' => 
-        
-        $this->assertTrue($this->request->hasValueError('foo', stubRequest::SOURCE_PARAM));
-
+
+
-        $this->assertTrue($this->request->hasValueErrors(stubRequest::SOURCE_PARAM));
-
+'bar' => 
-        
-        $this->assertTrue($this->request->hasValueError('foo', 'dummy'));
-
+
+
-        $this->assertTrue($this->request->hasValueErrors('dummy'));
-
+'bar' => 
-    }
-
@@ -276 +281 @@
-    {
-        $this->assertFalse($this->request->hasValueError('foo', stubRequest::SOURCE_HEADER));
+        $this->assertFalse($this->request->hasValueErrorWithId('foo', 'bar', stubRequest::SOURCE_HEADER));
-        $this->assertEqual($this->request->getValueError('foo', stubRequest::SOURCE_HEADER), array());
-        $this->assertFalse($this->request->hasValueErrors(stubRequest::SOURCE_HEADER));
@@ -282 +288 @@
-        $errorValue = new stubRequestValueError('bar', array());
-        $this->request->addValueError($errorValue, 'foo', stubRequest::SOURCE_HEADER);
+        $this->assertTrue($this->request->hasValueErrorWithId('foo', 'bar', stubRequest::SOURCE_HEADER));
-        $this->assertTrue($this->request->hasValueError('foo', stubRequest::SOURCE_HEADER));
-
+'bar' => 
-        $this->assertTrue($this->request->hasValueErrors(stubRequest::SOURCE_HEADER));
-
+'bar' => 
-    }
-
@@ -294 +301 @@
-    {
-        $this->assertFalse($this->request->hasValueError('foo', stubRequest::SOURCE_COOKIE));
+        $this->assertFalse($this->request->hasValueErrorWithId('foo', 'bar', stubRequest::SOURCE_COOKIE));
-        $this->assertEqual($this->request->getValueError('baz', stubRequest::SOURCE_COOKIE), array());
-        $this->assertFalse($this->request->hasValueErrors(stubRequest::SOURCE_COOKIE));
@@ -301 +309 @@
-        $this->request->addValueError($errorValue, 'foo', stubRequest::SOURCE_COOKIE);
-        $this->assertTrue($this->request->hasValueError('foo', stubRequest::SOURCE_COOKIE));
-
+
+
-        $this->assertTrue($this->request->hasValueErrors(stubRequest::SOURCE_COOKIE));
-
+'bar' => 
-    }
-
@@ -309 +318 @@
-     * assure that the same error occurs only once in list of errors for a value
-     */
-
+ 
-    {
-        $errorValue = new stubRequestValueError('foo', array());
-        $this->request->addValueError($errorValue, 'foo');
-
+'foo' => 
-        $this->request->getFilteredValue(new stubTestExceptionFilter(), 'foo');
-
+'foo' => 
-    }
-

trunk/src/test/php/net/stubbles/ipo/request/stubRequestPrefixDecoratorTestCase.php

@@ -128 +128 @@
-    {
-        $errorValue = new stubRequestValueError('bar', array());
-
+Once
-        $this->request->addValueError($errorValue, 'foo');
-        
-
+Once
-        $this->request->hasValueError('foo');
-        
-
+
+
+
+
-        $this->request->getValueError('foo');
-        
-        $this->mockRequest->expect('hasValueErrors', array(stubRequest::SOURCE_PARAM));
-        $this->request->hasValueErrors();
-        
-        $this->mockRequest->setReturnValue('getValueErrors', array('test_foo' => array(), 'bar' => array()));
@@ -150 +150 @@
-    {
-        $errorValue = new stubRequestValueError('bar', array());
-
+Once
-        $this->request->addValueError($errorValue, 'foo', stubRequest::SOURCE_HEADER);
-        
-
+Once
-        $this->request->hasValueError('foo', stubRequest::SOURCE_HEADER);
-        
-
+
+
+
+
-        $this->request->getValueError('foo', stubRequest::SOURCE_HEADER);
-        
-
-
-
-
+
-        $this->mockRequest->setReturnValue('getValueErrors', array('test_foo' => array(), 'bar' => array()));
-        $this->assertEqual($this->request->getValueErrors(stubRequest::SOURCE_HEADER), array('test_foo' => array(), 'bar' => array()));
@@ -173 +173 @@
-    {
-        $errorValue = new stubRequestValueError('bar', array());
-
+Once
-        $this->request->addValueError($errorValue, 'foo', stubRequest::SOURCE_COOKIE);
-        
-
+Once
-        $this->request->hasValueError('foo', stubRequest::SOURCE_COOKIE);
-        
-
+
+
+
+
-        $this->request->getValueError('foo', stubRequest::SOURCE_COOKIE);
-        
-        $this->mockRequest->expect('hasValueErrors', array(stubRequest::SOURCE_COOKIE));
-        $this->request->hasValueErrors();
-        
-        $this->mockRequest->expect('getValueErrors', array(stubRequest::SOURCE_COOKIE));