fix use of null on string parameter

Author: mentalstring

lib/generator/sfModelGenerator.class.php

@@ -273,7 +273,7 @@ public function renderField($field)
     }
     else if ('Date' == $field->getType())
     {
-      $html = sprintf("false !== strtotime($html) ? format_date(%s, \"%s\") : ' '", $html, $field->getConfig('date_format', 'f'));
+      $html = sprintf("is_string($html) && false !== strtotime($html) ? format_date(%s, \"%s\") : ' '", $html, $field->getConfig('date_format', 'f'));
     }
     else if ('Boolean' == $field->getType())
     {

lib/util/sfBrowserBase.class.php

@@ -911,7 +911,7 @@ public function doClickElement(DOMElement $item, $arguments = array(), $options
     }
     else
     {
-      $queryString = is_array($arguments) ? http_build_query($arguments, null, '&') : '';
+      $queryString = is_array($arguments) ? http_build_query($arguments, '', '&') : '';
       $sep = false === strpos($url, '?') ? '?' : '&';
 
       return array($url.($queryString ? $sep.$queryString : ''), 'get', array());

lib/view/sfViewCacheManager.class.php

@@ -1005,8 +1005,8 @@ public function getCurrentCacheKey()
 
     if ($getParameters = $this->request->getGetParameters())
     {
-      $cacheKey .= false === strpos($cacheKey, '?') ? '?' : '&';
-      $cacheKey .= http_build_query($getParameters, null, '&');
+      $cacheKey .= false === strpos((string) $cacheKey, '?') ? '?' : '&';
+      $cacheKey .= http_build_query($getParameters, '', '&');
     }
 
     return $cacheKey;

test/unit/sfNoRouting.class.php

@@ -29,7 +29,7 @@ public function getCurrentInternalUri($with_route_name = false)
     // other parameters
     unset($parameters['module'], $parameters['action']);
     ksort($parameters);
-    $parameters = count($parameters) ? '?'.http_build_query($parameters, null, '&') : '';
+    $parameters = count($parameters) ? '?'.http_build_query($parameters, '', '&') : '';
 
     return sprintf('%s%s', $action, $parameters);
   }
@@ -49,7 +49,7 @@ public function generate($name, $params = array(), $absolute = false)
       unset($parameters['action']);
     }
 
-    $parameters = http_build_query($parameters, null, '&');
+    $parameters = http_build_query($parameters, '', '&');
 
     return $this->fixGeneratedUrl('/'.($parameters ? '?'.$parameters : ''), $absolute);
   }