cseufert / hamle

php/hamle/Field.php

Doc Comments +6 added lines

@@ -110,6 +110,9 @@ 
     }

   }

 

+  /**
+   * @return string
+   */
   function getValue() {

     if (!is_null($this->setValue)) return $this->setValue;

     if (isset($_REQUEST[$this->form . "_" . $this->name])) {

@@ -173,6 +176,9 @@ 
     }

   }

 

+  /**
+   * @param boolean $submit
+   */
   function doProcess($submit) {

     if ($submit) {

       $value = $this->getValue();

Braces +26 added lines, -16 removed lines

@@ -66,7 +66,9 @@ 
   }

 

   function __call($name, $valarray) {

-    if (count($valarray) < 1) return $this->__get($name);

+    if (count($valarray) < 1) {
+      return $this->__get($name);
+    }
     $val = count($valarray) == 1 ? current($valarray) : $valarray;

     switch ($name) {

       case "name":

@@ -111,12 +113,15 @@ 
   }

 

   function getValue() {

-    if (!is_null($this->setValue)) return $this->setValue;

+    if (!is_null($this->setValue)) {
+      return $this->setValue;
+    }
     if (isset($_REQUEST[$this->form . "_" . $this->name])) {

-      if (get_magic_quotes_runtime())

-        return stripslashes($_REQUEST[$this->form . "_" . $this->name]);

-      else

-        return $_REQUEST[$this->form . "_" . $this->name];

+      if (get_magic_quotes_runtime()) {
+              return stripslashes($_REQUEST[$this->form . "_" . $this->name]);
+      } else {
+              return $_REQUEST[$this->form . "_" . $this->name];
+      }
     }

     return $this->opt['default'];

   }

@@ -133,12 +138,15 @@ 
     if (!$this->valid) {

       $atts['class'][] = "hamleFormError";

     }

-    if ($this->opt["disabled"])

-      $atts['disabled'] = "disabled";

-    if ($this->opt['required'])

-      $atts['required'] = "required";

-    if ($this->opt['help'])

-      $atts['title'] = $this->opt['help'];

+    if ($this->opt["disabled"]) {
+          $atts['disabled'] = "disabled";
+    }
+    if ($this->opt['required']) {
+          $atts['required'] = "required";
+    }
+    if ($this->opt['help']) {
+          $atts['title'] = $this->opt['help'];
+    }
   }

 

   function getLabelAttStatic(&$atts, &$type, &$content) {

@@ -176,10 +184,12 @@ 
   function doProcess($submit) {

     if ($submit) {

       $value = $this->getValue();

-      if ($this->opt['required'])

-        $this->valid = $this->valid && strlen($value);

-      if ($this->opt['regex'])

-        $this->valid = $this->valid && preg_match($this->opt['regex'], $value);

+      if ($this->opt['required']) {
+              $this->valid = $this->valid && strlen($value);
+      }
+      if ($this->opt['regex']) {
+              $this->valid = $this->valid && preg_match($this->opt['regex'], $value);
+      }
     }

   }

 

Spacing +8 added lines, -8 removed lines

@@ -112,19 +112,19 @@ 
 

   function getValue() {

     if (!is_null($this->setValue)) return $this->setValue;

-    if (isset($_REQUEST[$this->form . "_" . $this->name])) {

+    if (isset($_REQUEST[$this->form."_".$this->name])) {

       if (get_magic_quotes_runtime())

-        return stripslashes($_REQUEST[$this->form . "_" . $this->name]);

+        return stripslashes($_REQUEST[$this->form."_".$this->name]);

       else

-        return $_REQUEST[$this->form . "_" . $this->name];

+        return $_REQUEST[$this->form."_".$this->name];

     }

     return $this->opt['default'];

   }

 

   function getInputAttStatic(&$atts, &$type, &$content) {

-    $atts['id'] = $atts['name'] = $this->form . "_" . $this->name;

+    $atts['id'] = $atts['name'] = $this->form."_".$this->name;

     $atts['type'] = "text";

-    $atts['class'][] = str_replace(['Seufert\\','\\'],['','_'],get_class($this));

+    $atts['class'][] = str_replace(['Seufert\\', '\\'], ['', '_'], get_class($this));

   }

 

   function getInputAttDynamic(&$atts, &$type, &$content) {

@@ -142,8 +142,8 @@ 
   }

 

   function getLabelAttStatic(&$atts, &$type, &$content) {

-    $atts['class'][] = str_replace(['Seufert\\','\\'],['','_'],get_class($this));

-    $atts["for"] = $this->form . "_" . $this->name;

+    $atts['class'][] = str_replace(['Seufert\\', '\\'], ['', '_'], get_class($this));

+    $atts["for"] = $this->form."_".$this->name;

     $content = array($this->opt['label']);

   }

 

@@ -151,7 +151,7 @@ 
   }

 

   function getHintAttStatic(&$atts, &$type, &$content) {

-    $atts['class'][] = str_replace(['Seufert\\','\\'],['','_'],get_class($this));

+    $atts['class'][] = str_replace(['Seufert\\', '\\'], ['', '_'], get_class($this));

     $atts['class'][] = "hamleFormHint";

   }

 

php/hamle/Run.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
  */

 namespace Seufert\Hamle;

 

-use Seufert\Hamle\Exception\RunTime;

+use Seufert\Hamle\Exception\RunTime;
 use Seufert\Hamle\Model;

 

 /**

Braces +8 added lines, -5 removed lines

@@ -54,10 +54,11 @@ 
    */

   static function popInstance() {

     array_pop(self::$hamleList);

-    if (self::$hamleList)

-      self::$hamle = self::$hamleList[count(self::$hamleList) - 1];

-    else

-      self::$hamle = NULL;

+    if (self::$hamleList) {
+          self::$hamle = self::$hamleList[count(self::$hamleList) - 1];
+    } else {
+          self::$hamle = NULL;
+    }
   }

 

   /**

@@ -116,7 +117,9 @@ 
   static function modelId($id, $sortDir = 0, $sortField = "", $limit = 0, $offset = 0) {

     $o = self::$hamle->setup->getModelDefault($id,

         $sortDir, $sortField, $limit, $offset);

-    if (!$o instanceOf Model) throw new RunTime("Application must return instance of hamleModel");

+    if (!$o instanceOf Model) {
+      throw new RunTime("Application must return instance of hamleModel");
+    }
     return $o;

   }

 

php/hamle/Scope.php

Doc Comments +3 added lines

@@ -17,6 +17,9 @@
   /** @var Model[] Assoc array of Models by Scope Name */

   static $namedScopes = array();

 

+  /**
+   * @param Model $model
+   */
   static function add($model, $name = null) {

     if (!$model instanceOf Model)

       throw new Unsupported("Unsupported Model (".get_class($model)."), Needs to implement hamleModel Interface");

Unused Use Statements +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@
 <?php

 namespace Seufert\Hamle;

 

-use Seufert\Hamle\Exception\OutOfScope;

-use Seufert\Hamle\Exception\Unsupported;

-use Seufert\Hamle\Exception\RunTime;

+use Seufert\Hamle\Exception\OutOfScope;
+use Seufert\Hamle\Exception\Unsupported;
+use Seufert\Hamle\Exception\RunTime;
 use Seufert\Hamle\Model;

 

 /**

Braces +23 added lines, -14 removed lines

@@ -18,12 +18,14 @@ 
   static $namedScopes = array();

 

   static function add($model, $name = null) {

-    if (!$model instanceOf Model)

-      throw new Unsupported("Unsupported Model (".get_class($model)."), Needs to implement hamleModel Interface");

-    if ($name)

-      self::$namedScopes[$name] = $model;

-    else

-      self::$scopes[] = $model;

+    if (!$model instanceOf Model) {
+          throw new Unsupported("Unsupported Model (".get_class($model)."), Needs to implement hamleModel Interface");
+    }
+    if ($name) {
+          self::$namedScopes[$name] = $model;
+    } else {
+          self::$scopes[] = $model;
+    }
   }

 

   static function done() {

@@ -41,15 +43,21 @@ 
    */

   static function get($id = 0) {

     if (0 == $id) {

-      if ($scope = end(self::$scopes))

-        return $scope;

+      if ($scope = end(self::$scopes)) {
+              return $scope;
+      }
       throw new OutOfScope("Unable to find Scope ($id)");

     }

     $key = $id - 1;

-    if ($id < 0) $key = count(self::$scopes) + $id - 1;

-    if ($id == 0) $key = count(self::$scopes) - 1;

-    if (!isset(self::$scopes[$key]))

-      throw new OutOfScope("Unable to find Scope ($id) or $key");

+    if ($id < 0) {
+      $key = count(self::$scopes) + $id - 1;
+    }
+    if ($id == 0) {
+      $key = count(self::$scopes) - 1;
+    }
+    if (!isset(self::$scopes[$key])) {
+          throw new OutOfScope("Unable to find Scope ($id) or $key");
+    }
     return self::$scopes[$key];

   }

 

@@ -64,8 +72,9 @@ 
     if ($name && isset(self::$namedScopes[$name])) {

       self::$namedScopes[$name]->rewind();

       return self::$namedScopes[$name];

-    } else

-      throw new RunTime("Unable to find scope ($name)");

+    } else {
+          throw new RunTime("Unable to find scope ($name)");
+    }
   }

 

 }

php/hamle/Setup.php

Doc Comments +4 added lines, -4 removed lines

@@ -48,8 +48,8 @@ 
   /**

    * Open the default model when only an ID is specified in the template

    *

-   * @param mixed $id Identifier when no type is passed

-   * @param array $sort

+   * @param string $id Identifier when no type is passed

+   * @param integer $sort

    * @param int $limit Results Limit

    * @param int $offset Results Offset

    * @return Model Instance of model class that implements hamleModel

@@ -60,7 +60,7 @@ 
    * Open a specific model type with id

    *

    * @param array[] $typeId Type ID array [type=>[id]] or [page=>[3]]

-   * @param array $sort

+   * @param integer $sort

    * @param int $limit Results Limit

    * @param int $offset Results Offset

    * @return Model

@@ -76,7 +76,7 @@ 
    * Return Iterator containing results from search of tags

    *

    * @param array[] $typeTags Type Tag Array [type=>[tag1,tag2],type2=>[]]

-   * @param array $sort

+   * @param integer $sort

    * @param int $limit Results Limit

    * @param int $offset Results Limit

    * @return Model Instance of Iterable model class

Braces +6 added lines, -3 removed lines

@@ -41,7 +41,9 @@ 
   public function cachePath($f) {

     $s = DIRECTORY_SEPARATOR;

     $dir = implode($s,[__DIR__,"..","..","cache",""]);

-    if(!is_dir($dir)) mkdir($dir);

+    if(!is_dir($dir)) {
+      mkdir($dir);
+    }
     return $dir.$f;

   }

 

@@ -67,8 +69,9 @@ 
    * @throws Exception\RunTime

    */

   public function getModelTypeID($typeId, $sort = [], $limit = 0, $offset = 0) {

-    if(count($typeId) > 1)

-      throw new Exception\RunTime("Unable to open more than one ID at a time");

+    if(count($typeId) > 1) {
+          throw new Exception\RunTime("Unable to open more than one ID at a time");
+    }
     return new Model\Zero();

   }

 

Spacing +3 added lines, -3 removed lines

@@ -40,8 +40,8 @@ 
    */

   public function cachePath($f) {

     $s = DIRECTORY_SEPARATOR;

-    $dir = implode($s,[__DIR__,"..","..","cache",""]);

-    if(!is_dir($dir)) mkdir($dir);

+    $dir = implode($s, [__DIR__, "..", "..", "cache", ""]);

+    if (!is_dir($dir)) mkdir($dir);

     return $dir.$f;

   }

 

@@ -67,7 +67,7 @@ 
    * @throws Exception\RunTime

    */

   public function getModelTypeID($typeId, $sort = [], $limit = 0, $offset = 0) {

-    if(count($typeId) > 1)

+    if (count($typeId) > 1)

       throw new Exception\RunTime("Unable to open more than one ID at a time");

     return new Model\Zero();

   }

php/hamle/Text/Plain.php

Doc Comments +3 added lines

@@ -13,6 +13,9 @@
   protected $s;
   protected $type;
 
+  /**
+   * @param string $s
+   */
   function __construct($s, $type = self::TOKEN_HTML) {
     $this->s = str_replace('\\$', "$", $s);
     $this->type = $type;

Braces +3 added lines, -2 removed lines

@@ -23,8 +23,9 @@
   }
 
   function toHTML($escape = false) {
-    if ($this->type == self::TOKEN_CODE)
-      return $this->s;
+    if ($this->type == self::TOKEN_CODE) {
+          return $this->s;
+    }
     return htmlspecialchars($this->s);
   }
 }
\ No newline at end of file

php/autoload.php

Braces +3 added lines, -1 removed lines

@@ -38,7 +38,9 @@
     $s = DIRECTORY_SEPARATOR;

     $class = str_replace("\\",$s,substr($class,14));

     $path = __DIR__.$s."hamle".$s."$class.php";

-    if(is_file($path)) include_once($path);

+    if(is_file($path)) {
+      include_once($path);
+    }
   }

 },true,true);

 

Spacing +4 added lines, -4 removed lines

@@ -34,11 +34,11 @@
  * @param string $class Class name to be autoloaded

  */

 spl_autoload_register(function($class) {

-  if(strpos($class, "Seufert\\Hamle\\") === 0) {

+  if (strpos($class, "Seufert\\Hamle\\") === 0) {

     $s = DIRECTORY_SEPARATOR;

-    $class = str_replace("\\",$s,substr($class,14));

+    $class = str_replace("\\", $s, substr($class, 14));

     $path = __DIR__.$s."hamle".$s."$class.php";

-    if(is_file($path)) include_once($path);

+    if (is_file($path)) include_once($path);

   }

-},true,true);

+},true, true);

 

php/hamle/Filter/Sass.php

Braces +9 added lines, -5 removed lines

@@ -34,14 +34,18 @@
   static function filterText($s) {
     $as = explode("\n", $s);
     $indent = -1;
-    foreach ($as as $line)
-      if (preg_match('/^(\s+).*$/', $line, $m)) {
+    foreach ($as as $line) {
+          if (preg_match('/^(\s+).*$/', $line, $m)) {
         $lnInd = strlen($m[1]);
-        if ($indent < 0) $indent = $lnInd;
+    }
+        if ($indent < 0) {
+          $indent = $lnInd;
+        }
         $indent = min($indent, $lnInd);
       }
-    foreach ($as as $k => $v)
-      $as[$k] = substr($v, $indent);
+    foreach ($as as $k => $v) {
+          $as[$k] = substr($v, $indent);
+    }
     $s = implode("\n", $as);
 
     require_once ME_DIR . "/lib/phpsass/SassParser.php";

Spacing +2 added lines, -2 removed lines

@@ -44,13 +44,13 @@
       $as[$k] = substr($v, $indent);
     $s = implode("\n", $as);
 
-    require_once ME_DIR . "/lib/phpsass/SassParser.php";
+    require_once ME_DIR."/lib/phpsass/SassParser.php";
     $sp = new SassParser(array("cache" => FALSE,
         "style" => stdConf::get("me.developer") ? SassRenderer::STYLE_EXPANDED : SassRenderer::STYLE_COMPRESSED,
         "syntax" => SassFile::SASS, 'debug' => TRUE));
     $tree = $sp->toTree($s);
     $out = $tree->render();
     $pad = str_pad("", $indent, " ");
-    return $pad . str_replace("\n", "\n$pad", trim($out));
+    return $pad.str_replace("\n", "\n$pad", trim($out));
   }
 }
\ No newline at end of file

php/hamle/Text.php

Braces +27 added lines, -16 removed lines

@@ -53,39 +53,48 @@ 
     $pos = 0;
     $this->nodes = array();
     $rFlag = PREG_OFFSET_CAPTURE + PREG_SET_ORDER;
-    if (strlen(trim($s)) == 0) return;
+    if (strlen(trim($s)) == 0) {
+      return;
+    }
     if ($mode == self::TOKEN_CONTROL) {
       if (preg_match('/^"(.*)"$/', trim($s), $m)) {
         $this->nodes[] = new Text($m[1]);
-      } else
-        $this->nodes[] = new Text\Complex(trim($s));
+      } else {
+              $this->nodes[] = new Text\Complex(trim($s));
+      }
       return;
     }
     preg_match_all(self::REGEX_HTML, $s, $m, $rFlag);
     foreach ($m as $match) {
       if ($mode & self::FIND_BARDOLLAR && isset($match[2])) {
-        if ($match[2][1] != $pos)
-          $this->nodes[] = new Text\Plain(
+        if ($match[2][1] != $pos) {
+                  $this->nodes[] = new Text\Plain(
               substr($s, $pos, $match[2][1] - $pos), $mode);
+        }
         $this->nodes[] = new Text\Complex(substr($match[2][0], 1, -1));
         $pos = $match[2][1] + strlen($match[2][0]);
       } elseif ($mode & self::FIND_DOLLARVAR) {
-        if ($match[1][1] > 0 && $s[$match[1][1] - 1] == '\\') continue;
-        if ($match[1][1] != $pos)
-          $this->nodes[] = new Text\Plain(
+        if ($match[1][1] > 0 && $s[$match[1][1] - 1] == '\\') {
+          continue;
+        }
+        if ($match[1][1] != $pos) {
+                  $this->nodes[] = new Text\Plain(
               substr($s, $pos, $match[1][1] - $pos), $mode);
+        }
         $this->nodes[] = new Text\SimpleVar($match[1][0]);
         $pos = $match[1][1] + strlen($match[1][0]);
       }
     }
-    if ($pos != strlen($s))
-      $this->nodes[] = new Text\Plain(substr($s, $pos), $mode);
+    if ($pos != strlen($s)) {
+          $this->nodes[] = new Text\Plain(substr($s, $pos), $mode);
+    }
   }
 
   function toHTML($escape = false) {
     $out = array();
-    foreach ($this->nodes as $string)
-      $out[] = $string->toHTML($escape);
+    foreach ($this->nodes as $string) {
+          $out[] = $string->toHTML($escape);
+    }
     return implode("", $out);
   }
 
@@ -95,8 +104,9 @@ 
 
   function toPHP() {
     $out = array();
-    foreach ($this->nodes as $string)
-      $out[] = $string->toPHP();
+    foreach ($this->nodes as $string) {
+          $out[] = $string->toPHP();
+    }
     return implode(".", $out);
   }
 
@@ -107,8 +117,9 @@ 
   static function varToCode($var) {
     if (is_array($var)) {
       $code = array();
-      foreach ($var as $key => $value)
-        $code[] = self::varToCode($key) . "=>" . self::varToCode($value);
+      foreach ($var as $key => $value) {
+              $code[] = self::varToCode($key) . "=>" . self::varToCode($value);
+      }
       return 'array(' . implode(",", $code) . ')'; //remove unnecessary coma
     } elseif (is_bool($var)) {
       return ($var ? 'TRUE' : 'FALSE');

Spacing +4 added lines, -4 removed lines

@@ -101,15 +101,15 @@ 
   }
 
   function doEval() {
-    return eval('return ' . $this->toPHP() . ';');
+    return eval('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)."'";
     }
   }
 

php/hamle/Tag/DynHtml.php

Braces +6 added lines, -3 removed lines

@@ -60,11 +60,14 @@
     $out = "<" . $d['type'] . " ";
     foreach ($d['opt'] as $k => $v) {
       if (is_array($v)) {
-        foreach ($v as $k2 => $v2)
-          if ($v[$k2] instanceof Text) $v[$k2] = eval('return ' . $v[$k2]->toPHP() . ';');
+        foreach ($v as $k2 => $v2) {
+                  if ($v[$k2] instanceof Text) $v[$k2] = eval('return ' . $v[$k2]->toPHP() . ';');
+        }
         $v = implode(" ", $v);
       }
-      if ($v instanceOf H\Text) $v = eval('return ' . $v->toPHP() . ';');
+      if ($v instanceOf H\Text) {
+        $v = eval('return ' . $v->toPHP() . ';');
+      }
       $out .= $k . "=\"" . htmlspecialchars($v) . "\" ";
     }
     $out .= in_array($d['type'], self::$selfCloseTags) ? "/>" : ">";

Spacing +9 added lines, -9 removed lines

@@ -38,14 +38,14 @@ 
     $this->source[] = $ref;
     $this->baseType = $tag;
     self::$var++;
-    $this->varname = "\$dynhtml" . self::$var;
+    $this->varname = "\$dynhtml".self::$var;
   }
 
   function render($indent = 0, $doIndent = true) {
     $data = H\Text::varToCode(array("base" => $this->baseType, "type" => $this->type, "opt" => $this->opt, "source" => $this->source, "content" => $this->content));
-    $out = "<?php " . $this->varname . "=$data; echo Hamle\\Tag\\DynHtml::toStTag(" . $this->varname . ",\$form).";
-    $out .= "implode(\"\\n\"," . $this->varname . "['content']).";
-    $out .= "Hamle\\Tag\\DynHtml::toEnTag(" . $this->varname . ",\$form)?>\n";
+    $out = "<?php ".$this->varname."=$data; echo Hamle\\Tag\\DynHtml::toStTag(".$this->varname.",\$form).";
+    $out .= "implode(\"\\n\",".$this->varname."['content']).";
+    $out .= "Hamle\\Tag\\DynHtml::toEnTag(".$this->varname.",\$form)?>\n";
     return $out;
   }
 
@@ -57,21 +57,21 @@ 
     foreach ($d["source"] as $source) {
       $form->getField($source)->getDynamicAtt($d['base'], $d['opt'], $d['type'], $d['content']);
     }
-    $out = "<" . $d['type'] . " ";
+    $out = "<".$d['type']." ";
     foreach ($d['opt'] as $k => $v) {
       if (is_array($v)) {
         foreach ($v as $k2 => $v2)
-          if ($v[$k2] instanceof Text) $v[$k2] = eval('return ' . $v[$k2]->toPHP() . ';');
+          if ($v[$k2] instanceof Text) $v[$k2] = eval('return '.$v[$k2]->toPHP().';');
         $v = implode(" ", $v);
       }
-      if ($v instanceOf H\Text) $v = eval('return ' . $v->toPHP() . ';');
-      $out .= $k . "=\"" . htmlspecialchars($v) . "\" ";
+      if ($v instanceOf H\Text) $v = eval('return '.$v->toPHP().';');
+      $out .= $k."=\"".htmlspecialchars($v)."\" ";
     }
     $out .= in_array($d['type'], self::$selfCloseTags) ? "/>" : ">";
     return $out;
   }
 
   static function toEnTag($d, $form) {
-    return in_array($d['type'], self::$selfCloseTags) ? "" : "</" . $d['type'] . ">";
+    return in_array($d['type'], self::$selfCloseTags) ? "" : "</".$d['type'].">";
   }
 }
\ No newline at end of file

Doc Comments +5 added lines

@@ -33,6 +33,11 @@
   protected $varname;
   protected $baseType;
 
+  /**
+   * @param string $tag
+   * @param string $id
+   * @param integer $ref
+   */
   function __construct($tag, $class, $param, $id, $ref) {
     parent::__construct($tag, $class, $param, $id);
     $this->source[] = $ref;