cseufert / hamle

php/hamle/Text/FuncSub.php

Spacing +10 added lines, -10 removed lines

@@ -39,7 +39,7 @@ 
    */
   public function __construct($s) {
     $m = array();
-    if (!preg_match('/^ +([><]) +('.self::REGEX_FUNCSEL . '+)(.*)$/', $s, $m))
+    if (!preg_match('/^ +([><]) +('.self::REGEX_FUNCSEL.'+)(.*)$/', $s, $m))
       throw new ParseError("Unable to read \$ sub func in '$s'");
     if ($m[1] == "<") $this->dir = Hamle\Hamle::REL_PARENT;
     elseif ($m[1] == ">") $this->dir = Hamle\Hamle::REL_CHILD;
@@ -57,24 +57,24 @@ 
    * @return string
    */
   public function toPHP() {
-    $limit = Hamle\Text::varToCode($this->sortlimit['sort']) . "," .
-        $this->sortlimit['limit'] . "," . $this->sortlimit['offset'] . "," .
+    $limit = Hamle\Text::varToCode($this->sortlimit['sort']).",".
+        $this->sortlimit['limit'].",".$this->sortlimit['offset'].",".
         $this->grouptype['grouptype'];
-    $sub = $this->sub ? "->" . $this->sub->toPHP() : "";
-    return "hamleRel(" . $this->dir . "," .
-    Hamle\Text::varToCode($this->filt['tag']) . ",$limit)$sub";
+    $sub = $this->sub ? "->".$this->sub->toPHP() : "";
+    return "hamleRel(".$this->dir.",".
+    Hamle\Text::varToCode($this->filt['tag']).",$limit)$sub";
   }
 
   public function getOrCreateModel(Model $parent = null) {
     $model = $parent->hamleRel($this->dir, $this->filt['tag'], $this->sortlimit['sort'],
       $this->sortlimit['limit'], $this->sortlimit['offset']);
-    if(!$model->valid()) {
-      if(!$parent instanceof Hamle\WriteModel)
-        throw new \Exception('Cant create model, ' . get_class($parent) . ' must implement Hamle\\WriteModel.');
+    if (!$model->valid()) {
+      if (!$parent instanceof Hamle\WriteModel)
+        throw new \Exception('Cant create model, '.get_class($parent).' must implement Hamle\\WriteModel.');
       $model = $parent->current()->hamleCreateRel($this->dir, $this->filt['tag'], $this->sortlimit['sort'],
         $this->sortlimit['limit'], $this->sortlimit['offset']);
     }
-    if($this->sub)
+    if ($this->sub)
       return $this->sub->getOrCreateModel($model)->current();
     return $model->current();
   }

Braces +22 added lines, -12 removed lines

@@ -39,17 +39,25 @@ 
    */
   public function __construct($s) {
     $m = array();
-    if (!preg_match('/^ +([><]) +('.self::REGEX_FUNCSEL . '+)(.*)$/', $s, $m))
-      throw new ParseError("Unable to read \$ sub func in '$s'");
-    if ($m[1] == "<") $this->dir = Hamle\Hamle::REL_PARENT;
-    elseif ($m[1] == ">") $this->dir = Hamle\Hamle::REL_CHILD;
-    else $this->dir = Hamle\Hamle::REL_ANY;
+    if (!preg_match('/^ +([><]) +('.self::REGEX_FUNCSEL . '+)(.*)$/', $s, $m)) {
+          throw new ParseError("Unable to read \$ sub func in '$s'");
+    }
+    if ($m[1] == "<") {
+      $this->dir = Hamle\Hamle::REL_PARENT;
+    } elseif ($m[1] == ">") {
+      $this->dir = Hamle\Hamle::REL_CHILD;
+    } else {
+      $this->dir = Hamle\Hamle::REL_ANY;
+    }
     $this->sortlimit = $this->attSortLimit($m[2]);
     $this->filt = $this->attIdTag($m[2]);
     $this->grouptype = $this->attGroupType($m[2]);
-    if ($this->filt['id']) throw new ParseError("Unable to select by id");
-    if (trim($m[3]))
-      $this->sub = new FuncSub($m[3]);
+    if ($this->filt['id']) {
+      throw new ParseError("Unable to select by id");
+    }
+    if (trim($m[3])) {
+          $this->sub = new FuncSub($m[3]);
+    }
   }
 
   /**
@@ -69,13 +77,15 @@ 
     $model = $parent->hamleRel($this->dir, $this->filt['tag'], $this->sortlimit['sort'],
       $this->sortlimit['limit'], $this->sortlimit['offset']);
     if(!$model->valid()) {
-      if(!$parent instanceof Hamle\WriteModel)
-        throw new \Exception('Cant create model, ' . get_class($parent) . ' must implement Hamle\\WriteModel.');
+      if(!$parent instanceof Hamle\WriteModel) {
+              throw new \Exception('Cant create model, ' . get_class($parent) . ' must implement Hamle\\WriteModel.');
+      }
       $model = $parent->current()->hamleCreateRel($this->dir, $this->filt['tag'], $this->sortlimit['sort'],
         $this->sortlimit['limit'], $this->sortlimit['offset']);
     }
-    if($this->sub)
-      return $this->sub->getOrCreateModel($model)->current();
+    if($this->sub) {
+          return $this->sub->getOrCreateModel($model)->current();
+    }
     return $model->current();
   }
 

php/hamle/Text/Func.php

Spacing +19 added lines, -19 removed lines

@@ -50,7 +50,7 @@ 
    */
   public function __construct($s) {
     $m = array();
-    if (!preg_match('/^\$\((' . self::REGEX_FUNCSEL . '*)(.*)\)$/', $s, $m))
+    if (!preg_match('/^\$\(('.self::REGEX_FUNCSEL.'*)(.*)\)$/', $s, $m))
       throw new ParseError("Unable to read \$ func in '$s'");
     if (trim($m[2]))
       $this->sub = new FuncSub($m[2]);
@@ -92,13 +92,13 @@ 
     }
     $rand = false;
     if (preg_match_all('/\\^(-?)([a-zA-Z0-9\_]*)/', $s, $m)) {
-      foreach($m[0] as $k=>$mv)
+      foreach ($m[0] as $k=>$mv)
         if ($m[2][$k]) {
-          $dir = $m[1][$k] == "-"?Hamle\Hamle::SORT_DESCENDING:Hamle\Hamle::SORT_ASCENDING;
+          $dir = $m[1][$k] == "-" ?Hamle\Hamle::SORT_DESCENDING : Hamle\Hamle::SORT_ASCENDING;
           $att['sort'][$m[2][$k]] = $dir;
         } else $rand = true;
     }
-    if($rand)
+    if ($rand)
       $att['sort'] = [""=>$att['dir'] = Hamle\Hamle::SORT_RANDOM];
     return $att;
   }
@@ -116,25 +116,25 @@ 
    * @return string PHP Code
    */
   public function toPHP() {
-    $sub = $this->sub ? "->" . $this->sub->toPHP() : "";
-    if($this->scope instanceof Scope) {
-      return $this->scope->toPHP() . $sub;
-    } elseif($this->scope === true) {
+    $sub = $this->sub ? "->".$this->sub->toPHP() : "";
+    if ($this->scope instanceof Scope) {
+      return $this->scope->toPHP().$sub;
+    } elseif ($this->scope === true) {
       return "Hamle\\Scope::get(0)$sub";
     }
-    $limit = Text::varToCode($this->sortlimit['sort']) . "," .
-        $this->sortlimit['limit'] . "," . $this->sortlimit['offset'];
+    $limit = Text::varToCode($this->sortlimit['sort']).",".
+        $this->sortlimit['limit'].",".$this->sortlimit['offset'];
     if (count($this->filt['tag']))
-      return "Hamle\\Run::modelTypeTags(" .
-      Text::varToCode($this->filt['tag']) . ",$limit)$sub";
+      return "Hamle\\Run::modelTypeTags(".
+      Text::varToCode($this->filt['tag']).",$limit)$sub";
     if (count($this->filt['id']))
       if (isset($this->filt['id']['*']) && count($this->filt['id']['*']) == 1)
-        return "Hamle\\Run::modelId(" .
-        Text::varToCode(current($this->filt['id']['*'])) .
+        return "Hamle\\Run::modelId(".
+        Text::varToCode(current($this->filt['id']['*'])).
         ",$limit)$sub";
       else
-        return "Hamle\\Run::modelTypeId(" .
-        Text::varToCode($this->filt['id']) . ",$limit)$sub";
+        return "Hamle\\Run::modelTypeId(".
+        Text::varToCode($this->filt['id']).",$limit)$sub";
     return "";
   }
 
@@ -143,7 +143,7 @@ 
    * @return Model
    */
   public function getOrCreateModel(Model $parent = null) {
-    if($this->scope instanceof Scope) {
+    if ($this->scope instanceof Scope) {
       $parent = $this->scope->getOrCreateModel();
     } elseif ($this->scope === true)
       $parent = \Seufert\Hamle\Scope::get(0);
@@ -169,9 +169,9 @@ 
           $this->sortlimit['limit'],
           $this->sortlimit['offset']
         );
-    if($this->sub)
+    if ($this->sub)
       return $this->sub->getOrCreateModel($parent)->current();
-    if(!$parent)
+    if (!$parent)
       throw new \RuntimeException('Unable to create model with no relation');
     return $parent->current();
   }

Braces +55 added lines, -35 removed lines

@@ -50,10 +50,12 @@ 
    */
   public function __construct($s) {
     $m = array();
-    if (!preg_match('/^\$\((' . self::REGEX_FUNCSEL . '*)(.*)\)$/', $s, $m))
-      throw new ParseError("Unable to read \$ func in '$s'");
-    if (trim($m[2]))
-      $this->sub = new FuncSub($m[2]);
+    if (!preg_match('/^\$\((' . self::REGEX_FUNCSEL . '*)(.*)\)$/', $s, $m)) {
+          throw new ParseError("Unable to read \$ func in '$s'");
+    }
+    if (trim($m[2])) {
+          $this->sub = new FuncSub($m[2]);
+    }
     if (!trim($m[1])) {
       $this->scope = true;
       return;
@@ -70,16 +72,23 @@ 
     $m = array();
     $att = array('id' => array(), 'tag' => array());
     foreach (explode(",", $s) as $str) {
-      if (preg_match('/^[a-zA-Z0-9\\_]+/', $str, $m)) $type = $m[0];
-      else $type = "*";
-      if (preg_match('/#([a-zA-Z0-9\_\\${}]+)/', $str, $m)) $att['id'][$type][] = $m[1];
-      elseif (preg_match_all('/\\.([a-zA-Z0-9\_\-\\${}]+)/', $str, $m))
-        foreach ($m[1] as $tag)
+      if (preg_match('/^[a-zA-Z0-9\\_]+/', $str, $m)) {
+        $type = $m[0];
+      } else {
+        $type = "*";
+      }
+      if (preg_match('/#([a-zA-Z0-9\_\\${}]+)/', $str, $m)) {
+        $att['id'][$type][] = $m[1];
+      } elseif (preg_match_all('/\\.([a-zA-Z0-9\_\-\\${}]+)/', $str, $m)) {
+              foreach ($m[1] as $tag)
           $att['tag'][$type][] = new Text($tag, Text::TOKEN_CODE);
-      else $att['tag'][$type] = array();
+      } else {
+        $att['tag'][$type] = array();
+      }
+    }
+    if (!(count($att['id']) xor count($att['tag']))) {
+          throw new ParseError("Only tag, type or id can be combined");
     }
-    if (!(count($att['id']) xor count($att['tag'])))
-      throw new ParseError("Only tag, type or id can be combined");
     return $att;
   }
 
@@ -92,14 +101,18 @@ 
     }
     $rand = false;
     if (preg_match_all('/\\^(-?)([a-zA-Z0-9\_]*)/', $s, $m)) {
-      foreach($m[0] as $k=>$mv)
-        if ($m[2][$k]) {
+      foreach($m[0] as $k=>$mv) {
+              if ($m[2][$k]) {
           $dir = $m[1][$k] == "-"?Hamle\Hamle::SORT_DESCENDING:Hamle\Hamle::SORT_ASCENDING;
+      }
           $att['sort'][$m[2][$k]] = $dir;
-        } else $rand = true;
+        } else {
+          $rand = true;
+        }
+    }
+    if($rand) {
+          $att['sort'] = [""=>$att['dir'] = Hamle\Hamle::SORT_RANDOM];
     }
-    if($rand)
-      $att['sort'] = [""=>$att['dir'] = Hamle\Hamle::SORT_RANDOM];
     return $att;
   }
 
@@ -124,17 +137,19 @@ 
     }
     $limit = Text::varToCode($this->sortlimit['sort']) . "," .
         $this->sortlimit['limit'] . "," . $this->sortlimit['offset'];
-    if (count($this->filt['tag']))
-      return "Hamle\\Run::modelTypeTags(" .
+    if (count($this->filt['tag'])) {
+          return "Hamle\\Run::modelTypeTags(" .
       Text::varToCode($this->filt['tag']) . ",$limit)$sub";
-    if (count($this->filt['id']))
-      if (isset($this->filt['id']['*']) && count($this->filt['id']['*']) == 1)
+    }
+    if (count($this->filt['id'])) {
+          if (isset($this->filt['id']['*']) && count($this->filt['id']['*']) == 1)
         return "Hamle\\Run::modelId(" .
         Text::varToCode(current($this->filt['id']['*'])) .
         ",$limit)$sub";
-      else
-        return "Hamle\\Run::modelTypeId(" .
+    } else {
+              return "Hamle\\Run::modelTypeId(" .
         Text::varToCode($this->filt['id']) . ",$limit)$sub";
+      }
     return "";
   }
 
@@ -145,34 +160,39 @@ 
   public function getOrCreateModel(Model $parent = null) {
     if($this->scope instanceof Scope) {
       $parent = $this->scope->getOrCreateModel();
-    } elseif ($this->scope === true)
-      $parent = \Seufert\Hamle\Scope::get(0);
-    if ($this->filt && count($this->filt['tag']))
-      $parent = \Seufert\Hamle\Run::modelTypeTags(
+    } elseif ($this->scope === true) {
+          $parent = \Seufert\Hamle\Scope::get(0);
+    }
+    if ($this->filt && count($this->filt['tag'])) {
+          $parent = \Seufert\Hamle\Run::modelTypeTags(
         $this->filt['tag'],
         $this->sortlimit['sort'],
         $this->sortlimit['limit'],
         $this->sortlimit['offset']
       );
-    if ($this->filt && count($this->filt['id']))
-      if (isset($this->filt['id']['*']) && count($this->filt['id']['*']) === 1)
+    }
+    if ($this->filt && count($this->filt['id'])) {
+          if (isset($this->filt['id']['*']) && count($this->filt['id']['*']) === 1)
         $parent = \Seufert\Hamle\Run::modelId(
           current($this->filt['id']['*']),
             $this->sortlimit['sort'],
             $this->sortlimit['limit'],
             $this->sortlimit['offset']
             );
-      else
-        $parent = \Seufert\Hamle\Run::modelTypeId(
+    } else {
+              $parent = \Seufert\Hamle\Run::modelTypeId(
           $this->filt['id'],
           $this->sortlimit['sort'],
           $this->sortlimit['limit'],
           $this->sortlimit['offset']
         );
-    if($this->sub)
-      return $this->sub->getOrCreateModel($parent)->current();
-    if(!$parent)
-      throw new \RuntimeException('Unable to create model with no relation');
+      }
+    if($this->sub) {
+          return $this->sub->getOrCreateModel($parent)->current();
+    }
+    if(!$parent) {
+          throw new \RuntimeException('Unable to create model with no relation');
+    }
     return $parent->current();
   }