cseufert / hamle

php/hamle/Hamle.php

Indentation +5 added lines, -5 removed lines

@@ -25,11 +25,11 @@
  */
 namespace Seufert\Hamle;
 /**
- * HAMLE - HAML inspired template, with (E)nhancements
- *
- *
- * @author Chris Seufert <chris@seufert.id.au>
- */
+   * HAMLE - HAML inspired template, with (E)nhancements
+   *
+   *
+   * @author Chris Seufert <chris@seufert.id.au>
+   */
 class Hamle {
   /**
    * @var Setup instance of hamleSetup Object

Spacing +26 added lines, -26 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,22 +81,22 @@ 
    */
   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)
-      throw new Exception\Unsupported("Unsupported Model(".get_class($baseModel).") Type was passed, it must implement hamleModel");
+    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;
     $this->initSnipFiles();
   }
 
   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();
   }

Braces +47 added lines, -29 removed lines

@@ -81,13 +81,16 @@ 
    */
   function __construct($baseModel, $setup = NULL) {
     self::$me = $this;
-    if(!$setup)
-      $setup = new Setup();
+    if(!$setup) {
+          $setup = new Setup();
+    }
     $this->parse = new Parse();
-    if(!$setup instanceOf Setup)
-      throw new Exception\Unsupported("Unsupported Setup Helper was passed, it must extends hamleSetup");
-    if(!$baseModel instanceOf Model)
-      throw new Exception\Unsupported("Unsupported Model(".get_class($baseModel).") Type was passed, it must implement hamleModel");
+    if(!$setup instanceOf Setup) {
+          throw new Exception\Unsupported("Unsupported Setup Helper was passed, it must extends hamleSetup");
+    }
+    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;
     $this->initSnipFiles();
@@ -97,7 +100,9 @@ 
     if($this->snipMod == 0) {
       $this->snipFiles = $this->setup->snippetFiles();
       foreach($this->snipFiles as $f) {
-        if (!file_exists($f)) throw new Exception\NotFound("Unable to find Snippet File ($f)");
+        if (!file_exists($f)) {
+          throw new Exception\NotFound("Unable to find Snippet File ($f)");
+        }
         $this->snipFiles = max($this->snipFiles, filemtime($f));
       }
     }
@@ -111,8 +116,9 @@ 
    */
   function load($hamleFile, \Closure $parseFunc = null) {
     $template = $this->setup->templatePath($hamleFile);
-      if(!file_exists($template)) 
-        throw new Exception\NotFound("Unable to find HAMLE Template ($template)");
+      if(!file_exists($template)) {
+              throw new Exception\NotFound("Unable to find HAMLE Template ($template)");
+      }
     $this->cacheFile = $this->setup->cachePath(
                   str_replace("/","-",$hamleFile).".php");
     $this->setup->debugLog("Set cache file path to ({$this->cacheFile})");
@@ -122,8 +128,9 @@ 
     if($cacheDirty) {
       $this->setup->debugLog("Parsing File ($template to {$this->cacheFile})");
       $this->parse($parseFunc?"":file_get_contents($template), $parseFunc);
-    } else
-      $this->setup->debugLog("Using Cached file ({$this->cacheFile})");
+    } else {
+          $this->setup->debugLog("Using Cached file ({$this->cacheFile})");
+    }
     return $this;
   }
   /**
@@ -135,24 +142,29 @@ 
    * @throws Exception\ParseError if unable to write to the cache file
    */
   function parse($hamleCode, \Closure $parseFunc = null) {
-    if(!$this->cacheFile)
-        $this->cacheFile = $this->setup->cachePath("string.hamle.php");
-    if($parseFunc)
-      $parseFunc($this->parse);
-    else
-      $this->parse->str($hamleCode);
+    if(!$this->cacheFile) {
+            $this->cacheFile = $this->setup->cachePath("string.hamle.php");
+    }
+    if($parseFunc) {
+          $parseFunc($this->parse);
+    } else {
+          $this->parse->str($hamleCode);
+    }
     $this->setup->debugLog("Loading Snippet Files");
-    foreach($this->snipFiles as $snip)
-      $this->parse->parseSnip(file_get_contents($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)
-      $this->parse->parseFilter($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()))
-      throw new Exception\ParseError(
+    if(FALSE === file_put_contents($this->cacheFile, $this->parse->output())) {
+          throw new Exception\ParseError(
                       "Unable to write to cache file ({$this->cacheFile})");
+    }
   }
 
   /**
@@ -163,8 +175,9 @@ 
     $md5 = md5($hamleString);
     $stringId = substr($md5,0,12).substr($md5,24,8);
     $this->cacheFile = $this->setup->cachePath("string.$stringId.hamle.php");
-    if(!is_file($this->cacheFile))
-      $this->parse($hamleString);
+    if(!is_file($this->cacheFile)) {
+          $this->parse($hamleString);
+    }
   }
 
   /**
@@ -179,9 +192,13 @@ 
       $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,8 +215,9 @@ 
    * @return int The line number being passed by the parser
    */
   static function getLineNo() {
-    if(!isset(self::$me))
-      return 0;
+    if(!isset(self::$me)) {
+          return 0;
+    }
     return self::$me->parse->getLineNo();
   }