Author: fabien
Date: 2010-03-23 12:57:16 +0100 (Tue, 23 Mar 2010)
New Revision: 28700
Modified:
branches/1.3/lib/validator/sfValidatorFromDescription.class.php
branches/1.4/lib/validator/sfValidatorFromDescription.class.php
Log:
[1.3, 1.4] fixed warnings
Modified: branches/1.3/lib/validator/sfValidatorFromDescription.class.php
===================================================================
--- branches/1.3/lib/validator/sfValidatorFromDescription.class.php
2010-03-23 11:29:36 UTC (rev 28699)
+++ branches/1.3/lib/validator/sfValidatorFromDescription.class.php
2010-03-23 11:57:16 UTC (rev 28700)
@@ -351,8 +351,8 @@
{
return sprintf('new %s(array(%s, %s), %s)',
$this->class,
- in_array(get_class($tokenLeft), array('sfValidatorFDToken',
'sfValidatorFDTokenFilter')) ? $tokenLeft->asPhp() : $tokenLeft,
- in_array(get_class($tokenRight), array('sfValidatorFDToken',
'sfValidatorFDTokenFilter')) ? $tokenRight->asPhp() : $tokenRight,
+ is_object($tokenLeft) && in_array(get_class($tokenLeft),
array('sfValidatorFDToken', 'sfValidatorFDTokenFilter')) ? $tokenLeft->asPhp()
: $tokenLeft,
+ is_object($tokenRight) && in_array(get_class($tokenRight),
array('sfValidatorFDToken', 'sfValidatorFDTokenFilter')) ? $tokenRight->asPhp()
: $tokenRight,
implode(', ', array_map(create_function('$a', 'return var_export($a,
true);'), $this->arguments))
);
}
Modified: branches/1.4/lib/validator/sfValidatorFromDescription.class.php
===================================================================
--- branches/1.4/lib/validator/sfValidatorFromDescription.class.php
2010-03-23 11:29:36 UTC (rev 28699)
+++ branches/1.4/lib/validator/sfValidatorFromDescription.class.php
2010-03-23 11:57:16 UTC (rev 28700)
@@ -351,8 +351,8 @@
{
return sprintf('new %s(array(%s, %s), %s)',
$this->class,
- in_array(get_class($tokenLeft), array('sfValidatorFDToken',
'sfValidatorFDTokenFilter')) ? $tokenLeft->asPhp() : $tokenLeft,
- in_array(get_class($tokenRight), array('sfValidatorFDToken',
'sfValidatorFDTokenFilter')) ? $tokenRight->asPhp() : $tokenRight,
+ is_object($tokenLeft) && in_array(get_class($tokenLeft),
array('sfValidatorFDToken', 'sfValidatorFDTokenFilter')) ? $tokenLeft->asPhp()
: $tokenLeft,
+ is_object($tokenRight) && in_array(get_class($tokenRight),
array('sfValidatorFDToken', 'sfValidatorFDTokenFilter')) ? $tokenRight->asPhp()
: $tokenRight,
implode(', ', array_map(create_function('$a', 'return var_export($a,
true);'), $this->arguments))
);
}
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
