Cleanup and reformat code

src/Fenom.php

@@ -574,7 +574,8 @@ class Fenom
      * @param string $name test name
      * @param string $code test PHP code. Code may contains placeholder %s, which will be replaced by test-value. For example: is_callable(%s)
      */
-    public function addTest($name, $code) {
+    public function addTest($name, $code)
+    {
         $this->_tests[$name] = $code;
     }
 
@@ -583,7 +584,8 @@ class Fenom
      * @param string $name
      * @return string|bool
      */
-    public function getTest($name) {
+    public function getTest($name)
+    {
         return isset($this->_tests[$name]) ? $this->_tests[$name] : false;
     }
 

src/Fenom/Scope.php

@@ -1,153 +0,0 @@
-<?php
-/*
- * This file is part of Fenom.
- *
- * (c) 2013 Ivan Shalganov
- *
- * For the full copyright and license information, please view the license.md
- * file that was distributed with this source code.
- */
-namespace Fenom;
-
-/**
- * Scope for blocks tags
- *
- * @author     Ivan Shalganov <a.cobest@gmail.com>
- */
-class Scope extends \ArrayObject
-{
-
-    public $line = 0;
-    public $name;
-    public $level = 0;
-    /**
-     * @var Template
-     */
-    public $tpl;
-    public $is_compiler = true;
-    public $is_closed = false;
-    public $options;
-    private $_action;
-    private $_body;
-    private $_offset;
-
-    /**
-     * Creating cope
-     *
-     * @param string $name
-     * @param Template $tpl
-     * @param int $line
-     * @param array $action
-     * @param int $level
-     * @param $body
-     */
-    public function __construct($name, $tpl, $line, $action, $level, &$body)
-    {
-        $this->line = $line;
-        $this->name = $name;
-        $this->tpl = $tpl;
-        $this->_action = $action;
-        $this->level = $level;
-        $this->_body = & $body;
-        $this->_offset = strlen($body);
-    }
-
-    /**
-     *
-     * @param string $function
-     */
-    public function setFuncName($function)
-    {
-        $this["function"] = $function;
-        $this->is_compiler = false;
-        $this->escape = $this->tpl->escape;
-    }
-
-    /**
-     * Open callback
-     *
-     * @param Tokenizer $tokenizer
-     * @return mixed
-     */
-    public function open($tokenizer)
-    {
-        return call_user_func($this->_action["open"], $tokenizer, $this);
-    }
-
-    /**
-     * Check, has the block this tag
-     *
-     * @param string $tag
-     * @param int $level
-     * @return bool
-     */
-    public function hasTag($tag, $level)
-    {
-        if (isset($this->_action["tags"][$tag])) {
-            if ($level) {
-                return isset($this->_action["float_tags"][$tag]);
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Call tag callback
-     *
-     * @param string $tag
-     * @param Tokenizer $tokenizer
-     * @return string
-     */
-    public function tag($tag, $tokenizer)
-    {
-        return call_user_func($this->_action["tags"][$tag], $tokenizer, $this);
-    }
-
-    /**
-     * Close callback
-     *
-     * @param Tokenizer $tokenizer
-     * @return string
-     */
-    public function close($tokenizer)
-    {
-        return call_user_func($this->_action["close"], $tokenizer, $this);
-    }
-
-    /**
-     * Return content of block
-     *
-     * @throws \LogicException
-     * @return string
-     */
-    public function getContent()
-    {
-        return substr($this->_body, $this->_offset);
-    }
-
-    /**
-     * Cut scope content
-     *
-     * @return string
-     * @throws \LogicException
-     */
-    public function cutContent()
-    {
-        $content = substr($this->_body, $this->_offset + 1);
-        $this->_body = substr($this->_body, 0, $this->_offset);
-        return $content;
-    }
-
-    /**
-     * Replace scope content
-     *
-     * @param $new_content
-     */
-    public function replaceContent($new_content)
-    {
-        $this->cutContent();
-        $this->_body .= $new_content;
-    }
-}

src/Fenom/Tag.php

@@ -10,7 +10,8 @@
 namespace Fenom;
 
 
-class Tag extends \ArrayObject {
+class Tag extends \ArrayObject
+{
     const COMPILER = 1;
     const FUNC = 2;
     const BLOCK = 4;
@@ -34,6 +35,13 @@ class Tag extends \ArrayObject {
     private $_tags = array();
     private $_floats = array();
 
+    /**
+     * Create tag entity
+     * @param string $name the tag name
+     * @param Template $tpl current template
+     * @param string $info tag's information
+     * @param string $body template's code
+     */
     public function __construct($name, Template $tpl, $info, &$body)
     {
         $this->tpl = $tpl;
@@ -59,11 +67,21 @@ class Tag extends \ArrayObject {
         }
     }
 
-    public function setOption($option) {
+    /**
+     * Set tag option
+     * @param string $option
+     */
+    public function setOption($option)
+    {
 
     }
 
-    public function isClosed() {
+    /**
+     * Check, if the tag closed
+     * @return bool
+     */
+    public function isClosed()
+    {
         return $this->_closed;
     }
 
@@ -134,7 +152,11 @@ class Tag extends \ArrayObject {
         }
     }
 
-    public function close() {
+    /**
+     * Forcefully close the tag
+     */
+    public function close()
+    {
         $this->_closed = true;
     }
 
@@ -173,28 +195,33 @@ class Tag extends \ArrayObject {
         $this->_body .= $new_content;
     }
 
-    public function escape($code) {
-
+    public function escape($code)
+    {
         return $this->tpl->out($code);
     }
 
-    public function optLtrim() {
+    public function optLtrim()
+    {
 
     }
 
-    public function optRtrim() {
+    public function optRtrim()
+    {
 
     }
 
-    public function optTrim() {
+    public function optTrim()
+    {
 
     }
 
-    public function optRaw() {
+    public function optRaw()
+    {
 
     }
 
-    public function optEscape() {
+    public function optEscape()
+    {
 
     }
 }

src/Fenom/Template.php

@@ -616,7 +616,8 @@ class Template extends Render
      * Get current template line
      * @return int
      */
-    public function getLine() {
+    public function getLine()
+    {
         return $this->_line;
     }