cseufert / hamle

php/hamle/Text/Complex.php

Unused Use Statements -2 removed lines

@@ -25,8 +25,6 @@
  */
 namespace Seufert\Hamle\Text;
 
-use http\Exception\RuntimeException;
-use Seufert\Hamle\Run;
 use Seufert\Hamle\Text;
 use Seufert\Hamle\Exception\ParseError;
 use Seufert\Hamle\WriteModel;

Spacing +8 added lines, -8 removed lines

@@ -37,9 +37,9 @@ 
   protected $filter;
 
   function __construct($s) {
-    if(FALSE !== $pos = strpos($s,'|')) {
-      $this->filter = new Filter(substr($s, $pos+1), $this);
-      $s = substr($s,0,$pos);
+    if (FALSE !== $pos = strpos($s, '|')) {
+      $this->filter = new Filter(substr($s, $pos + 1), $this);
+      $s = substr($s, 0, $pos);
     }
     $s = preg_split("/-[>!]/", $s);
     // if(count($s) == 1) $s = explode("-!",$s[0]);
@@ -55,19 +55,19 @@ 
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
-    return "<?=" . $this->toPHP() . "?>";
+    if ($escape)
+      return "<?=htmlspecialchars(".$this->toPHP().")?>";
+    return "<?=".$this->toPHP()."?>";
   }
   function toPHP() {
-    return $this->filter?$this->filter->toPHP():$this->toPHPVar();
+    return $this->filter ? $this->filter->toPHP() : $this->toPHPVar();
   }
   function toPHPVar() {
     if ($this->sel) {
       $sel = array();
       foreach ($this->sel as $s)
         $sel[] = "hamleGet('$s')";
-      return $this->func->toPHP() . "->" . implode('->', $sel);
+      return $this->func->toPHP()."->".implode('->', $sel);
     } else
       return $this->func->toPHP();
   }

Braces +19 added lines, -13 removed lines

@@ -43,20 +43,24 @@ 
     }
     $s = preg_split("/-[>!]/", $s);
     // if(count($s) == 1) $s = explode("-!",$s[0]);
-    if (!$s[0]) throw new ParseError("Unable to parse Complex Expression");
-    if ($s[0][1] == "(")
-      $this->func = new Text\Func($s[0]);
-    elseif ($s[0][1] == "[")
-      $this->func = new Text\Scope($s[0]);
-    else
-      $this->func = new SimpleVar($s[0]);
+    if (!$s[0]) {
+      throw new ParseError("Unable to parse Complex Expression");
+    }
+    if ($s[0][1] == "(") {
+          $this->func = new Text\Func($s[0]);
+    } elseif ($s[0][1] == "[") {
+          $this->func = new Text\Scope($s[0]);
+    } else {
+          $this->func = new SimpleVar($s[0]);
+    }
     array_shift($s);
     $this->sel = $s;
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    if($escape) {
+          return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    }
     return "<?=" . $this->toPHP() . "?>";
   }
   function toPHP() {
@@ -65,11 +69,13 @@ 
   function toPHPVar() {
     if ($this->sel) {
       $sel = array();
-      foreach ($this->sel as $s)
-        $sel[] = "hamleGet('$s')";
+      foreach ($this->sel as $s) {
+              $sel[] = "hamleGet('$s')";
+      }
       return $this->func->toPHP() . "->" . implode('->', $sel);
-    } else
-      return $this->func->toPHP();
+    } else {
+          return $this->func->toPHP();
+    }
   }
 
   /**

php/hamle/Text/SimpleVar.php

Spacing +9 added lines, -9 removed lines

@@ -34,26 +34,26 @@ 
   protected $filter;
 
   function __construct($s) {
-    if(FALSE !== $pos = strpos($s,'|')) {
-      $this->var = substr($s,1,$pos-1);
-      $this->filter = new Filter(substr($s, $pos+1), $this);
+    if (FALSE !== $pos = strpos($s, '|')) {
+      $this->var = substr($s, 1, $pos - 1);
+      $this->filter = new Filter(substr($s, $pos + 1), $this);
     } else {
       $this->var = substr($s, 1);
     }
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
-    return "<?=" . $this->toPHP() . "?>";
+    if ($escape)
+      return "<?=htmlspecialchars(".$this->toPHP().")?>";
+    return "<?=".$this->toPHP()."?>";
   }
 
   function toPHP() {
-    return $this->filter?$this->filter->toPHP():$this->toPHPVar();
+    return $this->filter ? $this->filter->toPHP() : $this->toPHPVar();
   }
 
   function toPHPVar() {
-    return "Hamle\\Scope::get()->hamleGet(" . Text::varToCode($this->var) . ")";
+    return "Hamle\\Scope::get()->hamleGet(".Text::varToCode($this->var).")";
   }
 
   /**
@@ -62,7 +62,7 @@ 
    */
   function setValue($value) {
     $model = \Seufert\Hamle\Scope::get();
-    if(!$model instanceof WriteModel)
+    if (!$model instanceof WriteModel)
       throw new \RuntimeException('Can only write to model that implements WriteModel');
     $model->hamleSet($this->var, $value);
     return $model;

Braces +6 added lines, -4 removed lines

@@ -43,8 +43,9 @@ 
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    if($escape) {
+          return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    }
     return "<?=" . $this->toPHP() . "?>";
   }
 
@@ -62,8 +63,9 @@ 
    */
   function setValue($value) {
     $model = \Seufert\Hamle\Scope::get();
-    if(!$model instanceof WriteModel)
-      throw new \RuntimeException('Can only write to model that implements WriteModel');
+    if(!$model instanceof WriteModel) {
+          throw new \RuntimeException('Can only write to model that implements WriteModel');
+    }
     $model->hamleSet($this->var, $value);
     return $model;
   }

php/hamle/Text.php

Spacing +4 added lines, -4 removed lines

@@ -101,15 +101,15 @@ 
   }
 
   function doEval() {
-    return eval('use Seufert\Hamle; return ' . $this->toPHP() . ';');
+    return eval('use Seufert\Hamle; return '.$this->toPHP().';');
   }
 
   static function varToCode($var) {
     if (is_array($var)) {
       $code = array();
       foreach ($var as $key => $value)
-        $code[] = self::varToCode($key) . "=>" . self::varToCode($value);
-      return 'array(' . implode(",", $code) . ')'; //remove unnecessary coma
+        $code[] = self::varToCode($key)."=>".self::varToCode($value);
+      return 'array('.implode(",", $code).')'; //remove unnecessary coma
     } elseif (is_bool($var)) {
       return ($var ? 'TRUE' : 'FALSE');
     } elseif (is_int($var) || is_float($var) || is_numeric($var)) {
@@ -117,7 +117,7 @@ 
     } elseif ($var instanceof Text) {
       return $var->toPHP();
     } else {
-      return "'" . str_replace(array('$', "'"), array('\\$', "\\'"), $var) . "'";
+      return "'".str_replace(array('$', "'"), array('\\$', "\\'"), $var)."'";
     }
   }