cseufert / hamle

php/hamle/Tag/Snippet.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
   static function decodeClassId($s) {
     $out = $m = array();
-    if(preg_match('/^[a-zA-Z0-9\_]+/', $s, $m))
+    if (preg_match('/^[a-zA-Z0-9\_]+/', $s, $m))
       $out['type'] = $m[0];
     preg_match_all('/[#\.][a-zA-Z0-9\-\_]+/m', $s, $m);
     if (isset($m[0])) foreach ($m[0] as $s) {

php/autoload.php

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/Setup.php

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/Form.php

Spacing +11 added lines, -11 removed lines

@@ -54,7 +54,7 @@ 
     $this->setup();

     $fields = $this->_fields;

     $this->_fields = array();

-    foreach($fields as $v) {

+    foreach ($fields as $v) {

       $this->_fields[$v->name] = $v;

       $v->form($this->_name);

     }

@@ -64,23 +64,23 @@ 
   

   function process() {

     $clicked = "";

-    foreach($this->_fields as $f)

-      if($f instanceOf Field\Button)

-        if($f->isClicked())

+    foreach ($this->_fields as $f)

+      if ($f instanceOf Field\Button)

+        if ($f->isClicked())

           $clicked = $f;

-    foreach($this->_fields as $f)

-      $f->doProcess($clicked?true:false);

-    if($clicked)

+    foreach ($this->_fields as $f)

+      $f->doProcess($clicked ? true : false);

+    if ($clicked)

       try {

         $this->onSubmit($clicked);

-      } catch(Exception\FormInvalid $e) {

+      } catch (Exception\FormInvalid $e) {

         $this->hint = $e->getMessage();

       }

   }

   

   function isValid() {

     $valid = true;

-    foreach($this->_fields as $f)

+    foreach ($this->_fields as $f)

       $valid = $f->valid && $valid;

     return $valid;

   }

@@ -95,7 +95,7 @@ 
     return $this->_fields;

   }

   function getField($n) {

-    if(!isset($this->_fields[$n]))

+    if (!isset($this->_fields[$n]))

       throw new Exception\NoKey("unable to find form field ($n)");

     return $this->_fields[$n];

   }

@@ -104,7 +104,7 @@ 
   }

   

   function getHTMLProp() {

-    return array('action'=>'','method'=>'post','name'=>$this->_name,

+    return array('action'=>'', 'method'=>'post', 'name'=>$this->_name,

                                         'enctype'=>'multipart/form-data');

   }

 

php/hamle/Hamle.php

Spacing +25 added lines, -25 removed lines

@@ -63,14 +63,14 @@ 
 
   public $baseModel;
 
-  const REL_CHILD = 0x01;  /* Child Relation */
+  const REL_CHILD = 0x01; /* Child Relation */
   const REL_PARENT = 0x02; /* Parent Relation */
-  const REL_ANY = 0x03;    /* Unspecified or any relation */
+  const REL_ANY = 0x03; /* Unspecified or any relation */
   
-  const SORT_NATURAL = 0x00;    /* Sort in what ever order is 'default' */
-  const SORT_ASCENDING = 0x02;  /* Sort Ascending */
+  const SORT_NATURAL = 0x00; /* Sort in what ever order is 'default' */
+  const SORT_ASCENDING = 0x02; /* Sort Ascending */
   const SORT_DESCENDING = 0x03; /* Sort Decending */
-  const SORT_RANDOM = 0x04;     /* Sort Randomly */
+  const SORT_RANDOM = 0x04; /* Sort Randomly */
   /**
    * Create new HAMLE Parser
    * 
@@ -81,12 +81,12 @@ 
    */
   function __construct($baseModel, $setup = NULL) {
     self::$me = $this;
-    if(!$setup)
+    if (!$setup)
       $setup = new Setup();
     $this->parse = new Parse();
-    if(!$setup instanceOf Setup)
+    if (!$setup instanceOf Setup)
       throw new Exception\Unsupported("Unsupported Setup Helper was passed, it must extends hamleSetup");
-    if(!$baseModel instanceOf Model)
+    if (!$baseModel instanceOf Model)
       throw new Exception\Unsupported("Unsupported Model(".get_class($baseModel).") Type was passed, it must implement hamleModel");
     $this->setup = $setup;
     $this->baseModel = $baseModel;
@@ -94,9 +94,9 @@ 
   }
 
   function initSnipFiles() {
-    if($this->snipMod == 0) {
+    if ($this->snipMod == 0) {
       $this->snipFiles = $this->setup->snippetFiles();
-      foreach($this->snipFiles as $f) {
+      foreach ($this->snipFiles as $f) {
         if (!file_exists($f)) throw new Exception\NotFound("Unable to find Snippet File ($f)");
         $this->snipFiles = max($this->snipFiles, filemtime($f));
       }
@@ -111,17 +111,17 @@ 
    */
   function load($hamleFile, \Closure $parseFunc = null) {
     $template = $this->setup->templatePath($hamleFile);
-      if(!file_exists($template)) 
+      if (!file_exists($template)) 
         throw new Exception\NotFound("Unable to find HAMLE Template ($template)");
     $this->cacheFile = $this->setup->cachePath(
-                  str_replace("/","-",$hamleFile).".php");
+                  str_replace("/", "-", $hamleFile).".php");
     $this->setup->debugLog("Set cache file path to ({$this->cacheFile})");
-    $cacheFileAge = is_file($this->cacheFile)?filemtime($this->cacheFile):0;
+    $cacheFileAge = is_file($this->cacheFile) ? filemtime($this->cacheFile) : 0;
     $cacheDirty = !$this->cache ||
         $cacheFileAge < $this->snipMod || $cacheFileAge < filemtime($template);
-    if($cacheDirty) {
+    if ($cacheDirty) {
       $this->setup->debugLog("Parsing File ($template to {$this->cacheFile})");
-      $this->parse($parseFunc?"":file_get_contents($template), $parseFunc);
+      $this->parse($parseFunc ? "" : file_get_contents($template), $parseFunc);
     } else
       $this->setup->debugLog("Using Cached file ({$this->cacheFile})");
     return $this;
@@ -135,22 +135,22 @@ 
    * @throws Exception\ParseError if unable to write to the cache file
    */
   function parse($hamleCode, \Closure $parseFunc = null) {
-    if(!$this->cacheFile)
+    if (!$this->cacheFile)
         $this->cacheFile = $this->setup->cachePath("string.hamle.php");
-    if($parseFunc)
+    if ($parseFunc)
       $parseFunc($this->parse);
     else
       $this->parse->str($hamleCode);
     $this->setup->debugLog("Loading Snippet Files");
-    foreach($this->snipFiles as $snip)
+    foreach ($this->snipFiles as $snip)
       $this->parse->parseSnip(file_get_contents($snip));
     $this->setup->debugLog("Applying Snippet Files");
     $this->parse->applySnip();
     $this->setup->debugLog("Executing Parse Filters");
-    foreach($this->setup->getFilters() as $filter)
+    foreach ($this->setup->getFilters() as $filter)
       $this->parse->parseFilter($filter);
     $this->setup->debugLog("Updating Cache File ({$this->cacheFile})");
-    if(FALSE === file_put_contents($this->cacheFile, $this->parse->output()))
+    if (FALSE === file_put_contents($this->cacheFile, $this->parse->output()))
       throw new Exception\ParseError(
                       "Unable to write to cache file ({$this->cacheFile})");
   }
@@ -161,9 +161,9 @@ 
    */
   function string($hamleString) {
     $md5 = md5($hamleString);
-    $stringId = substr($md5,0,12).substr($md5,24,8);
+    $stringId = substr($md5, 0, 12).substr($md5, 24, 8);
     $this->cacheFile = $this->setup->cachePath("string.$stringId.hamle.php");
-    if(!is_file($this->cacheFile))
+    if (!is_file($this->cacheFile))
       $this->parse($hamleString);
   }
 
@@ -179,9 +179,9 @@ 
       $baseModel = $this->baseModel;
       $this->baseModel = null;
       $currentModel = $baseModel == Scope::getTopScope();
-      if(!$currentModel && $baseModel) Scope::add($baseModel);
+      if (!$currentModel && $baseModel) Scope::add($baseModel);
       require $this->cacheFile;
-      if(!$currentModel && $baseModel) Scope::done();
+      if (!$currentModel && $baseModel) Scope::done();
       $this->baseModel = $baseModel;
       $out = ob_get_contents();
       ob_end_clean();
@@ -198,7 +198,7 @@ 
    * @return int The line number being passed by the parser
    */
   static function getLineNo() {
-    if(!isset(self::$me))
+    if (!isset(self::$me))
       return 0;
     return self::$me->parse->getLineNo();
   }

php/hamle/Exception/ParseError.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
   function __construct($message = "", $code = 0, $previous = NULL) {
     ///@todo  Include Line number & file name within parse error exceptions
-    $message .= ", on line " . Hamle\Hamle::getLineNo() . " in file ?.hamle";
+    $message .= ", on line ".Hamle\Hamle::getLineNo()." in file ?.hamle";
     parent::__construct($message, $code, $previous);
   }
 

php/hamle/Tag.php

Spacing +3 added lines, -3 removed lines

@@ -144,11 +144,11 @@ 
     //if(strtoupper($this->type) == "A") var_dump($this);

     $ind = $doIndent ? str_pad("", $indent, " ") : "";

     $oneliner = ((count($this->content) > 1 || $this->tags) ? false : true);

-    $out = $ind . $this->renderStTag() . ($oneliner ? "" : "\n");

+    $out = $ind.$this->renderStTag().($oneliner ? "" : "\n");

     if ($this->content) $out .= $this->renderContent($ind, $oneliner);

     foreach ($this->tags as $tag)

       $out .= $tag->render($indent + self::INDENT_SIZE);

-    $out .= ($oneliner ? "" : $ind) . $this->renderEnTag() . "\n";

+    $out .= ($oneliner ? "" : $ind).$this->renderEnTag()."\n";

     return $out;

   }

 

@@ -162,7 +162,7 @@ 
   function renderContent($pad = "", $oneliner = false) {

     $out = "";

     foreach ($this->content as $c)

-      $out .= ($oneliner ? "" : $pad) . $c . ($oneliner ? "" : "\n");

+      $out .= ($oneliner ? "" : $pad).$c.($oneliner ? "" : "\n");

     return $out;

   }

 

php/hamle/Field.php

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/Field/Memo.php

Spacing +1 added lines, -1 removed lines

@@ -42,6 +42,6 @@
   }
 
   function isClicked() {
-    return isset($_REQUEST[$this->form . "_" . $this->name]);
+    return isset($_REQUEST[$this->form."_".$this->name]);
   }
 }
\ No newline at end of file