merge r25104 to release-1.12

git-svn-id: http://framework.zend.com/svn/framework/standard/branches/release-1.12@25105 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Validate/Abstract.php

@@ -230,16 +230,20 @@ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface
                 $value = $value->__toString();
             }
         } else {
-            $value = (string)$value;
+            $value = implode((array) $value);
         }
 
         if ($this->getObscureValue()) {
             $value = str_repeat('*', strlen($value));
         }
 
-        $message = str_replace('%value%', (string) $value, $message);
+        $message = str_replace('%value%', $value, $message);
         foreach ($this->_messageVariables as $ident => $property) {
-            $message = str_replace("%$ident%", implode(' ',(array)$this->$property), $message);
+            $message = str_replace(
+                "%$ident%",
+                implode(' ', (array) $this->$property),
+                $message
+            );
         }
 
         $length = self::getMessageLength();

tests/Zend/Validate/EmailAddressTest.php

@@ -165,7 +165,7 @@ class Zend_Validate_EmailAddressTest extends PHPUnit_Framework_TestCase
 
         $messages = $this->_validator->getMessages();
 
-        $this->assertType('array', $messages);
+        $this->assertTrue(is_array($messages));
         $this->assertEquals(0, count($messages));
     }
 

tests/Zend/Validate/MessageTest.php

@@ -184,7 +184,7 @@ class Zend_Validate_MessageTest extends PHPUnit_Framework_TestCase
             );
             $this->fail('Expected to catch Zend_Validate_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Validate_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Validate_Exception,
                 'Expected exception of type Zend_Validate_Exception, got ' . get_class($e));
             $this->assertEquals("No message template exists for key '$keyInvalid'", $e->getMessage());
         }
@@ -262,7 +262,7 @@ class Zend_Validate_MessageTest extends PHPUnit_Framework_TestCase
             $property = $this->_validator->unknownProperty;
             $this->fail('Expected to catch Zend_Validate_Exception');
         } catch (Zend_Exception $e) {
-            $this->assertType('Zend_Validate_Exception', $e,
+            $this->assertTrue($e instanceof Zend_Validate_Exception,
                 'Expected exception of type Zend_Validate_Exception, got ' . get_class($e));
             $this->assertEquals("No property exists by the name 'unknownProperty'", $e->getMessage());
         }
@@ -295,7 +295,7 @@ class Zend_Validate_MessageTest extends PHPUnit_Framework_TestCase
     {
         $vars = $this->_validator->getMessageVariables();
 
-        $this->assertType('array', $vars);
+        $this->assertTrue(is_array($vars));
         $this->assertEquals(array('min', 'max'), $vars);
         $message = 'variables: %notvar% ';
         foreach ($vars as $var) {