Refactor code and apply Coding Style fixes

Author: Tybaze

lib/cache/sfFileCache.class.php

@@ -256,9 +256,13 @@ protected function read($path, $type = self::READ_DATA)
         fseek($fp, 0, SEEK_END);
         $length = ftell($fp) - 24;
         fseek($fp, 24);
-        if($length > 0) {
+
+        if ($length > 0)
+        {
           $data[self::READ_DATA] = @fread($fp, $length);
-        } else {
+        }
+        else
+        {
           $data[self::READ_DATA] = '';
         }
       }

lib/escaper/sfOutputEscaperObjectDecorator.class.php

@@ -119,7 +119,8 @@ public function __isset($key)
   public function count()
   {
     // See https://github.com/symfony/polyfill/commit/d330c0094a47d8edceeea1ed553d6e08215a9fc2
-    if(is_array($this->value) || $this->value instanceof Countable || $this->value instanceof ResourceBundle || $this->value instanceof SimpleXmlElement) {
+    if (is_array($this->value) || $this->value instanceof Countable || $this->value instanceof ResourceBundle || $this->value instanceof SimpleXmlElement)
+    {
       return count($this->value);
     }
     return 1;

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,9 +367,11 @@ static protected function formatArrayAsHtml($values)
   static protected function fileExcerpt($file, $line)
   {
     // $file can be null for RuntimeException
-    if($file === null) {
+    if (null === $file)
+    {
       return '';
     }
+
     if (is_readable($file))
     {
       $content = preg_split('#<br />#', preg_replace('/^<code>(.*)<\/code>$/s', '$1', highlight_file($file, true)));

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,14 +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/log/sfFileLogger.class.php

@@ -136,7 +136,8 @@ public function shutdown()
    */
   public static function strftime($format)
   {
-    if (version_compare(PHP_VERSION, '8.1.0') < 0) {
+    if (version_compare(PHP_VERSION, '8.1.0') < 0)
+    {
       return strftime($format);
     }
     return date(self::_strftimeFormatToDateFormat($format));
@@ -160,8 +161,8 @@ public static function strftime($format)
    *
    * @return array|string|string[]
    */
-  private static function _strftimeFormatToDateFormat($strftimeFormat) {
-
+  private static function _strftimeFormatToDateFormat($strftimeFormat)
+  {
     // Missing %V %C %g %G
     $search = array(
       '%a', '%A', '%d', '%e', '%u',

lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php

@@ -65,7 +65,7 @@ public function check($model, $query, $value = true)
         }
 
         $operator = '=';
-        if (strlen($condition) && '!' == substr($condition,0,1))
+        if (strlen($condition) && '!' == substr($condition, 0, 1))
         {
           $operator = false !== strpos($condition, '%') ? 'NOT LIKE' : '!=';
           $condition = substr($condition, 1);

lib/response/sfResponse.class.php

@@ -177,7 +177,8 @@ public function unserialize($serialized)
    *
    * @return array
    */
-  public function __serialize() {
+  public function __serialize()
+  {
     return array('content' => $this->content);
   }
 

lib/routing/sfRoute.class.php

@@ -862,7 +862,8 @@ public function unserialize($serialized)
    *
    * @return array
    */
-  public function __serialize() {
+  public function __serialize()
+  {
     // always serialize compiled routes
     $this->compile();
     // sfPatternRouting will always re-set defaultParameters, so no need to serialize them