HexMakina / Lezer

Lezer.php

Braces +44 added lines, -31 removed lines

@@ -28,8 +28,9 @@ 
     $this->detect_language_env();
     $the_one_language = current(array_intersect($this->detect_language_files(), $this->detect_language_env()));
 
-    if($the_one_language)
-      $this->setForcedLang($the_one_language);
+    if($the_one_language) {
+          $this->setForcedLang($the_one_language);
+    }
 
     return $the_one_language;
   }
@@ -37,13 +38,16 @@ 
   public function detect_language_files()
   {
     $files = FileSystem::preg_scandir(dirname($this->filePath), '/.json$/');
-    if(empty($files))
-      return [];
+    if(empty($files)) {
+          return [];
+    }
 
     $files = implode('',$files);
     $res = preg_match_all('/([a-z]{3})\.json/', $files, $m);
-    if($res) // false or 0 is none found
+    if($res) {
+      // false or 0 is none found
       $this->detected_language_files = $m[1];
+    }
     return $this->detected_language_files;
   }
 
@@ -91,8 +95,9 @@ 
       // remove illegal userLangs
       foreach ($userLangs as $key => $value) {
           // only allow a-z, A-Z and 0-9 and _ and -
-          if (preg_match('/^[a-zA-Z0-9_-]*$/', $value) === 1)
-              $this->detected_language_env[$key] = $value;
+          if (preg_match('/^[a-zA-Z0-9_-]*$/', $value) === 1) {
+                        $this->detected_language_env[$key] = $value;
+          }
       }
 
       return $this->detected_language_env;
@@ -119,12 +124,13 @@ 
       return __FUNCTION__.': error';
     }
 
-    if($amount_of_days === -1)
-      return L('DATETIME_RANGE_YESTERDAY');
-    elseif($amount_of_days === 0)
-      return L('DATETIME_RANGE_TODAY');
-    elseif($amount_of_days === 1)
-      return L('DATETIME_RANGE_TOMORROW');
+    if($amount_of_days === -1) {
+          return L('DATETIME_RANGE_YESTERDAY');
+    } elseif($amount_of_days === 0) {
+          return L('DATETIME_RANGE_TODAY');
+    } elseif($amount_of_days === 1) {
+          return L('DATETIME_RANGE_TOMORROW');
+    }
 
 
     $datetime_parts = [
@@ -141,18 +147,21 @@ 
     $ordering = [];
     foreach($datetime_parts as $unit => $label)
     {
-      if(!isset($date_diff[$unit]))
-        continue;
+      if(!isset($date_diff[$unit])) {
+              continue;
+      }
 
       $qty = (int)$date_diff[$unit];
 
-      if($qty === 0)
-        continue;
+      if($qty === 0) {
+              continue;
+      }
 
-      if(isset($options['abbrev']))
-        $label.= '_ABBREV';
-      elseif($qty > 1)
-        $label.= '_PLURAL';
+      if(isset($options['abbrev'])) {
+              $label.= '_ABBREV';
+      } elseif($qty > 1) {
+              $label.= '_PLURAL';
+      }
 
       $ordering[$unit] = $qty.' '.L($label).'.';
     }
@@ -164,27 +173,31 @@ 
 
   public static function time($time_string, $short=true)
   {
-    if ($short === true)
-      $time_string = substr($time_string, 0, 5);
+    if ($short === true) {
+          $time_string = substr($time_string, 0, 5);
+    }
     return $time_string;
   }
 
   public static function human_date($date_string, $short=true)
   {
-    if($date_string === '0000-00-00' || empty($date_string))
-      return L('MODEL_common_VALUE_EMPTY');
+    if($date_string === '0000-00-00' || empty($date_string)) {
+          return L('MODEL_common_VALUE_EMPTY');
+    }
 
-    if(preg_match('/^[0-9]{4}$/', $date_string) === 1)
-      return intval($date_string);
+    if(preg_match('/^[0-9]{4}$/', $date_string) === 1) {
+          return intval($date_string);
+    }
 
     list($year, $month, $day) = explode('-',$date_string);
 
     $ret = intval($day).' '.L("DATETIME_CALENDAR_MONTH_$month");
 
-    if($short === true && Dato::format(null, 'Y') === $year)
-      return $ret;
-    else
-      return "$ret $year";
+    if($short === true && Dato::format(null, 'Y') === $year) {
+          return $ret;
+    } else {
+          return "$ret $year";
+    }
   }
 
   public static function human_month($date_string)

Spacing +29 added lines, -29 removed lines

@@ -9,9 +9,9 @@ 
 namespace HexMakina\Lezer;
 
 use \HexMakina\LocalFS\FileSystem;
-use \HexMakina\Tempus\{Dato,DatoTempo,Tempo};
+use \HexMakina\Tempus\{Dato, DatoTempo, Tempo};
 
-class Lezer extends \i18n{
+class Lezer extends \i18n {
 
   private $detected_language_files = [];
   private $detected_language_env = [];
@@ -28,7 +28,7 @@ 
     $this->detect_language_env();
     $the_one_language = current(array_intersect($this->detect_language_files(), $this->detect_language_env()));
 
-    if($the_one_language)
+    if ($the_one_language)
       $this->setForcedLang($the_one_language);
 
     return $the_one_language;
@@ -37,12 +37,12 @@ 
   public function detect_language_files()
   {
     $files = FileSystem::preg_scandir(dirname($this->filePath), '/.json$/');
-    if(empty($files))
+    if (empty($files))
       return [];
 
-    $files = implode('',$files);
+    $files = implode('', $files);
     $res = preg_match_all('/([a-z]{3})\.json/', $files, $m);
-    if($res) // false or 0 is none found
+    if ($res) // false or 0 is none found
       $this->detected_language_files = $m[1];
     return $this->detected_language_files;
   }
@@ -50,7 +50,7 @@ 
   public function compileFunction()
   {
     return ''
-    . "function ".$this->prefix .'($string, $args=NULL) {'."\n"
+    . "function ".$this->prefix.'($string, $args=NULL) {'."\n"
     . '    if (!defined("'.$this->prefix.'::".$string))'
     . '       return $string;'
     . '    $return = constant("'.$this->prefix.'::".$string);'."\n"
@@ -111,16 +111,16 @@ 
 
   public static function model_type_to_label($form_model)
   {
-    return L(sprintf('MODEL_%s_INSTANCE',get_class($form_model)::model_type()));
+    return L(sprintf('MODEL_%s_INSTANCE', get_class($form_model)::model_type()));
   }
   public static function field_name_to_label($form_model, $field_name)
   {
-    return L(sprintf('MODEL_%s_FIELD_%s',(get_class($form_model))::model_type(), $field_name));
+    return L(sprintf('MODEL_%s_FIELD_%s', (get_class($form_model))::model_type(), $field_name));
   }
 
   // options['decimals'] = int
   // options['abbrev'] = mixed: key needs to be set
-  public static function when($event, $options=[])
+  public static function when($event, $options = [])
   {
     try {
       $amount_of_days = DatoTempo::days_diff(new \DateTime($event), new \DateTime());
@@ -129,11 +129,11 @@ 
       return __FUNCTION__.': error';
     }
 
-    if($amount_of_days === -1)
+    if ($amount_of_days === -1)
       return L('DATETIME_RANGE_YESTERDAY');
-    elseif($amount_of_days === 0)
+    elseif ($amount_of_days === 0)
       return L('DATETIME_RANGE_TODAY');
-    elseif($amount_of_days === 1)
+    elseif ($amount_of_days === 1)
       return L('DATETIME_RANGE_TOMORROW');
 
 
@@ -149,49 +149,49 @@ 
 
     $date_diff = DatoTempo::days_diff_in_parts(abs($amount_of_days));
     $ordering = [];
-    foreach($datetime_parts as $unit => $label)
+    foreach ($datetime_parts as $unit => $label)
     {
-      if(!isset($date_diff[$unit]))
+      if (!isset($date_diff[$unit]))
         continue;
 
       $qty = (int)$date_diff[$unit];
 
-      if($qty === 0)
+      if ($qty === 0)
         continue;
 
-      if(isset($options['abbrev']))
-        $label.= '_ABBREV';
-      elseif($qty > 1)
-        $label.= '_PLURAL';
+      if (isset($options['abbrev']))
+        $label .= '_ABBREV';
+      elseif ($qty > 1)
+        $label .= '_PLURAL';
 
       $ordering[$unit] = $qty.' '.L($label).'.';
     }
     $ret = (isset($amount_of_days) && $amount_of_days >= 0) ? L('DATETIME_RANGE_PREFIX_FUTURE') : L('DATETIME_RANGE_PREFIX_PAST');
-    $ret.= ' '.implode(' & ', array_slice($ordering, 0,2));
+    $ret .= ' '.implode(' & ', array_slice($ordering, 0, 2));
 
     return $ret;
   }
 
-  public static function time($time_string, $short=true)
+  public static function time($time_string, $short = true)
   {
     if ($short === true)
       $time_string = substr($time_string, 0, 5);
     return $time_string;
   }
 
-  public static function human_date($date_string, $short=true)
+  public static function human_date($date_string, $short = true)
   {
-    if($date_string === '0000-00-00' || empty($date_string))
+    if ($date_string === '0000-00-00' || empty($date_string))
       return L('MODEL_common_VALUE_EMPTY');
 
-    if(preg_match('/^[0-9]{4}$/', $date_string) === 1)
+    if (preg_match('/^[0-9]{4}$/', $date_string) === 1)
       return intval($date_string);
 
-    list($year, $month, $day) = explode('-',$date_string);
+    list($year, $month, $day) = explode('-', $date_string);
 
     $ret = intval($day).' '.L("DATETIME_CALENDAR_MONTH_$month");
 
-    if($short === true && Dato::format(null, 'Y') === $year)
+    if ($short === true && Dato::format(null, 'Y') === $year)
       return $ret;
     else
       return "$ret $year";
@@ -210,10 +210,10 @@ 
   public static function human_seconds($seconds)
   {
     $hours = floor($seconds / 3600);
-    $mins = floor(($seconds-$hours*3600) / 60);
+    $mins = floor(($seconds-$hours * 3600) / 60);
     $secs = floor($seconds % 60);
 
-    $hours_format ='%dh %dm %ds';
+    $hours_format = '%dh %dm %ds';
     return sprintf($hours_format, $hours, $mins, $secs);
   }