PHP 8.0 & 8.1 > Deprecated of null to non-nullable internal function parameters

Mainly ensure use of string instead of null / false by casting the variable into (string)
Also fix method/function arguments with default value must be at the end.

Thanks to @teymour
cba71a4

Author: Tybaze

lib/helper/DateHelper.php

@@ -17,7 +17,7 @@
  * @version    SVN: $Id$
  */
 
-function format_daterange($start_date, $end_date, $format = 'd', $full_text, $start_text, $end_text, $culture = null, $charset = null)
+function format_daterange($start_date, $end_date, $format = 'd', $full_text = '', $start_text = '', $end_text = '', $culture = null, $charset = null)
 {
   if ($start_date != '' && $end_date != '')
   {

lib/helper/I18NHelper.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -60,7 +60,7 @@ function __($text, $args = array(), $catalogue = 'messages')
  *
  * @return string Result of the translation
  */
-function format_number_choice($text, $args = array(), $number, $catalogue = 'messages')
+function format_number_choice($text, $args = array(), $number = null, $catalogue = 'messages')
 {
   $translated = __($text, $args, $catalogue);
 

lib/i18n/sfDateFormat.class.php

@@ -239,9 +239,10 @@ public function format($time, $pattern = 'F', $inputPattern = null, $charset = '
       }
       else
       {
-        $function = ucfirst($this->getFunctionName($pattern));
+        $function = $this->getFunctionName($pattern);
         if ($function != null)
         {
+          $function = ucfirst($function);
           $fName = 'get'.$function;
           if (in_array($fName, $this->methods))
           {

lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php

@@ -200,7 +200,7 @@ static public function fixParams($params)
 
     foreach ($params as $key => $param)
     {
-      if (strlen($param) >= 255)
+      if ($param && strlen($param) >= 255)
       {
         $params[$key] = '['.number_format(strlen($param) / 1024, 2).'Kb]';
       }

lib/plugins/sfDoctrinePlugin/lib/debug/sfWebDebugPanelDoctrine.class.php

@@ -68,7 +68,7 @@ static public function listenToAddPanelEvent(sfEvent $event)
 
   /**
    * Returns an array of Doctrine query events.
-   * 
+   *
    * @return array
    */
   protected function getDoctrineEvents()
@@ -116,7 +116,7 @@ protected function getSqlLogs()
       // interpolate parameters
       foreach ($params as $param)
       {
-        $param = htmlspecialchars($param, ENT_QUOTES, sfConfig::get('sf_charset'));
+        $param = htmlspecialchars((string) $param, ENT_QUOTES, sfConfig::get('sf_charset'));
         $query = join(var_export(is_scalar($param) ? $param : (string) $param, true), explode('?', $query, 2));
       }
 

lib/routing/sfRoute.class.php

@@ -285,7 +285,7 @@ protected function generateWithTokens($parameters)
       switch ($token[0])
       {
         case 'variable':
-          if (!$optional || !isset($this->defaults[$token[3]]) || $parameters[$token[3]] != $this->defaults[$token[3]])
+          if (!$optional || !isset($this->defaults[$token[3]]) || (isset($parameters[$token[3]]) && $parameters[$token[3]] != $this->defaults[$token[3]]))
           {
             $url[] = urlencode($parameters[$token[3]]);
             $optional = false;
@@ -791,7 +791,7 @@ protected function fixDefaults()
       }
       else
       {
-        $this->defaults[$key] = urldecode($value);
+        $this->defaults[$key] = urldecode((string) $value);
       }
     }
   }

lib/util/sfBrowserBase.class.php

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

lib/util/sfInflector.class.php

@@ -28,7 +28,7 @@ class sfInflector
   public static function camelize($lower_case_and_underscored_word)
   {
 
-    return strtr(ucwords(strtr($lower_case_and_underscored_word, array('/' => ':: ', '_' => ' ', '-' => ' '))), array(' ' => ''));
+    return strtr(ucwords(strtr((string) $lower_case_and_underscored_word, array('/' => ':: ', '_' => ' ', '-' => ' '))), array(' ' => ''));
   }
 
   /**
@@ -40,7 +40,7 @@ public static function camelize($lower_case_and_underscored_word)
    */
   public static function underscore($camel_cased_word)
   {
-    $tmp = $camel_cased_word;
+    $tmp = (string) $camel_cased_word;
     $tmp = str_replace('::', '/', $tmp);
     $tmp = sfToolkit::pregtr($tmp, array('/([A-Z]+)([A-Z][a-z])/' => '\\1_\\2',
                                          '/([a-z\d])([A-Z])/'     => '\\1_\\2'));

lib/util/sfToolkit.class.php

@@ -366,7 +366,7 @@ public static function replaceConstants($value)
    */
   public static function pregtr($search, $replacePairs)
   {
-    return preg_replace(array_keys($replacePairs), array_values($replacePairs), $search);
+    return preg_replace(array_keys($replacePairs), array_values($replacePairs), (string) $search);
   }
 
   /**

lib/vendor/lime/lime.php

@@ -564,7 +564,7 @@ protected function find_caller($traces)
     return array($traces[$last]['file'], $traces[$last]['line']);
   }
 
-  public function handle_error($code, $message, $file, $line, $context)
+  public function handle_error($code, $message, $file, $line, $context = null)
   {
     if (!$this->options['error_reporting'] || ($code & error_reporting()) == 0)
     {