Code Simplification from Merge Review

Author: Tybaze

lib/event/sfEvent.class.php

@@ -83,7 +83,7 @@ public function getReturnValue()
   /**
    * Sets the processed flag.
    *
-   * @param boolean $processed The processed flag value
+   * @param bool $processed The processed flag value
    */
   public function setProcessed($processed)
   {

lib/exception/sfException.class.php

@@ -367,7 +367,7 @@ static protected function formatArrayAsHtml($values)
   static protected function fileExcerpt($file, $line)
   {
     // $file can be null for RuntimeException
-    if ($file === null)
+    if (null === $file)
     {
       return '';
     }

lib/i18n/sfDateFormat.class.php

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

lib/i18n/sfI18N.class.php

@@ -272,16 +272,8 @@ public function getTimestampForCulture($dateTime, $culture = null)
     list($hour, $minute) = $this->getTimeForCulture($dateTime, null === $culture ? $this->culture : $culture);
 
     // mktime behavior change with php8
-    // $hour become not nullable
-    if (!$hour)
-    {
-      $hour = 0;
-    }
-    // Before 8.0, $minutes value to null, was casted as (int)0
-    if (!$minute)
-    {
-      $minute = 0;
-    }
+    $hour = null !== $hour ? $hour : 0;
+    $minute = null !== $minute ? $minute : 0;
     return null === $day ? null : mktime($hour, $minute, 0, $month, $day, $year);
   }
 

lib/test/sfTestFunctionalBase.class.php

@@ -478,7 +478,7 @@ static public function handlePhpError($errno, $errstr, $errfile, $errline)
   /**
    * Exception handler for the current test browser instance.
    *
-   * @param Throwable $exception The exception
+   * @param Throwable|Exception $exception The exception
    */
   function handleException($exception)
   {

lib/test/sfTesterResponse.class.php

@@ -49,9 +49,9 @@ public function initialize()
       }
       else
       {
-        if ($this->response->getContent())
+        if ($content = $this->response->getContent())
         {
-          @$this->dom->loadHTML($this->response->getContent());
+          @$this->dom->loadHTML($content);
         }
       }
       $this->domCssSelector = new sfDomCssSelector($this->dom);

lib/util/sfBrowserBase.class.php

@@ -363,9 +363,9 @@ public function call($uri, $method = 'get', $parameters = array(), $changeStack
       }
       else
       {
-        if ($response->getContent())
+        if ($content = $response->getContent())
         {
-          @$this->dom->loadHTML($response->getContent());
+          @$this->dom->loadHTML($content);
         }
       }
       $this->domCssSelector = new sfDomCssSelector($this->dom);
@@ -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, null, '&') : '';
       $sep = false === strpos($url, '?') ? '?' : '&';
 
       return array($url.($queryString ? $sep.$queryString : ''), 'get', array());

lib/util/sfNamespacedParameterHolder.class.php

@@ -395,7 +395,7 @@ public function __serialize()
   }
 
   /**
-   * Unserializes a sfParameterHolder instance. for PHP 7.4
+   * Unserializes a sfParameterHolder instance for PHP 7.4+
    *
    * @param array $data
    */

lib/util/sfParameterHolder.class.php

@@ -209,7 +209,7 @@ public function __serialize()
   }
 
   /**
-   * Unserializes a sfParameterHolder instance. for PHP 7.4
+   * Unserializes a sfParameterHolder instance for PHP 7.4+
    *
    * @param array $data
    */

lib/vendor/lime/lime.php

@@ -589,7 +589,7 @@ public function handle_error($code, $message, $file, $line, $context = null)
   }
 
   /**
-   * @param Throwable $exception only available on php7
+   * @param Throwable|Exception $exception
    * @return bool
    */
   public function handle_exception($exception)