ingenerator / kohana-view

classes/Ingenerator/View/Layout.php

Indentation +141 added lines, -141 removed lines

@@ -22,146 +22,146 @@
  */
 abstract class Ingenerator_View_Layout extends View_Model
 {
-    // The name of the template model to use
-    public $template = 'Global';
-
-    // Whether to render the view within the template or not, null for auto
-    protected $_use_template = null;
-
-    /**
-     * Sets a new template to use for this view model. By default template names
-     * become View_Template_$template classes.
-     *
-     * @param string $template
-     */
-    public function set_template($template)
-    {
-        $this->template = $template;
-    }
-
-    /**
-     * Returns the View_Model representing the template layout (instantiating it
-     * if it has not previously been created).
-     *
-     * @return View_Model
-     */
-    public function var_page()
-    {
-        if ( is_string($this->template))
-        {
-            $class = 'View_Template_'.$this->template;
-            if ( ! class_exists($class))
-            {
-                $class = 'View';
-            }
-            $this->template = new $class();
-        }
-        return $this->template;
-    }
-
-    /**
-     * Hook called just before the body content is rendered, as a useful extension
-     * point for transforming any data or setting variables on the page template.
-     *
-     *     class View_Index extends View_Layout
-     *     {
-     *         public function pre_render()
-     *         {
-     *             $page = $this->var_page();
-     *             $page->title = 'Index';
-     *         }
-     *     }
-     */
-    public function pre_render()
-    {
-    }
-
-    /**
-     * Hook called just after the body content is rendered, as a useful extension
-     * point for transforming any data or setting variables on the page template.
-     *
-     * @see View_Layout::pre_render()
-     */
-    public function post_render()
-    {
-    }
-
-
-    /**
-     * Renders the body content (calling [View_Layout::pre_render()] and
-     * [View_Layout::post_render()] in the process).
-     *
-     * If required, the body content will then be passed to the template view
-     * for rendering within the page layout and the fully templated page returned.
-     * Otherwise, the body fragment is returned alone and the page template is
-     * never rendered.
-     *
-     * @param string $file If wishing to generate a view to a file
-     * @return string The formatted view content
-     */
-    public function render($file = null)
-    {
-        $this->pre_render();
-
-        // Generate the body content
-        $body = parent::render($file);
-
-        $this->post_render();
-
-        // Render the template if required
-        if ($this->use_template())
-        {
-            $template = $this->var_page();
-            $template->set('var_body', $body);
-            return $template->render();
-        }
-
-        return $body;
-    }
-
-    /**
-     * Setter/Getter for the use_template setting determining whether or not to
-     * render the page template or just the body fragment.
-     *
-     * By default, $this-_use_template is null, meaning the class should determine
-     * automatically based on whether the request is an AJAX request.
-     *
-     * If manually set true or false, the class will respect this value.
-     *
-     * @uses Request::is_ajax
-     * @uses Request::current()
-     *
-     * @param boolean $use_template
-     * @return boolean If called as getter
-     * @return View_Layout If called as setter
-     */
-    public function use_template($use_template = null)
-    {
-        // If we're being called as a setter
-        if ($use_template !== null)
-        {
-            $this->_use_template = $use_template;
-            return $this;
-        }
-
-        // If an explicit value was set
-        if ($this->_use_template !== null)
-        {
-            return $this->_use_template;
-        }
-
-        // Guess based on is_ajax
-        if (Request::current())
-        {
-            if (Request::current()->is_ajax())
-            {
-                return false;
-            }
-            else
-            {
-                return true;
-            }
-        }
-    }
+	// The name of the template model to use
+	public $template = 'Global';
+
+	// Whether to render the view within the template or not, null for auto
+	protected $_use_template = null;
+
+	/**
+	 * Sets a new template to use for this view model. By default template names
+	 * become View_Template_$template classes.
+	 *
+	 * @param string $template
+	 */
+	public function set_template($template)
+	{
+		$this->template = $template;
+	}
+
+	/**
+	 * Returns the View_Model representing the template layout (instantiating it
+	 * if it has not previously been created).
+	 *
+	 * @return View_Model
+	 */
+	public function var_page()
+	{
+		if ( is_string($this->template))
+		{
+			$class = 'View_Template_'.$this->template;
+			if ( ! class_exists($class))
+			{
+				$class = 'View';
+			}
+			$this->template = new $class();
+		}
+		return $this->template;
+	}
+
+	/**
+	 * Hook called just before the body content is rendered, as a useful extension
+	 * point for transforming any data or setting variables on the page template.
+	 *
+	 *     class View_Index extends View_Layout
+	 *     {
+	 *         public function pre_render()
+	 *         {
+	 *             $page = $this->var_page();
+	 *             $page->title = 'Index';
+	 *         }
+	 *     }
+	 */
+	public function pre_render()
+	{
+	}
+
+	/**
+	 * Hook called just after the body content is rendered, as a useful extension
+	 * point for transforming any data or setting variables on the page template.
+	 *
+	 * @see View_Layout::pre_render()
+	 */
+	public function post_render()
+	{
+	}
+
+
+	/**
+	 * Renders the body content (calling [View_Layout::pre_render()] and
+	 * [View_Layout::post_render()] in the process).
+	 *
+	 * If required, the body content will then be passed to the template view
+	 * for rendering within the page layout and the fully templated page returned.
+	 * Otherwise, the body fragment is returned alone and the page template is
+	 * never rendered.
+	 *
+	 * @param string $file If wishing to generate a view to a file
+	 * @return string The formatted view content
+	 */
+	public function render($file = null)
+	{
+		$this->pre_render();
+
+		// Generate the body content
+		$body = parent::render($file);
+
+		$this->post_render();
+
+		// Render the template if required
+		if ($this->use_template())
+		{
+			$template = $this->var_page();
+			$template->set('var_body', $body);
+			return $template->render();
+		}
+
+		return $body;
+	}
+
+	/**
+	 * Setter/Getter for the use_template setting determining whether or not to
+	 * render the page template or just the body fragment.
+	 *
+	 * By default, $this-_use_template is null, meaning the class should determine
+	 * automatically based on whether the request is an AJAX request.
+	 *
+	 * If manually set true or false, the class will respect this value.
+	 *
+	 * @uses Request::is_ajax
+	 * @uses Request::current()
+	 *
+	 * @param boolean $use_template
+	 * @return boolean If called as getter
+	 * @return View_Layout If called as setter
+	 */
+	public function use_template($use_template = null)
+	{
+		// If we're being called as a setter
+		if ($use_template !== null)
+		{
+			$this->_use_template = $use_template;
+			return $this;
+		}
+
+		// If an explicit value was set
+		if ($this->_use_template !== null)
+		{
+			return $this->_use_template;
+		}
+
+		// Guess based on is_ajax
+		if (Request::current())
+		{
+			if (Request::current()->is_ajax())
+			{
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+	}
 
 }

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
      */
     public function var_page()
     {
-        if ( is_string($this->template))
+        if (is_string($this->template))
         {
             $class = 'View_Template_'.$this->template;
             if ( ! class_exists($class))

Braces +1 added lines, -2 removed lines

@@ -156,8 +156,7 @@
             if (Request::current()->is_ajax())
             {
                 return false;
-            }
-            else
+            } else
             {
                 return true;
             }

classes/Ingenerator/View/Template/Global.php

Indentation +1 added lines, -1 removed lines

@@ -16,5 +16,5 @@
  */
 abstract class Ingenerator_View_Template_Global extends View_Model
 {
-    public $var_title = 'Page title';
+	public $var_title = 'Page title';
 }

classes/Kohana/View/Model.php

Indentation +10 added lines, -10 removed lines

@@ -1,15 +1,15 @@
 <?php
 /**
- * Acts as an object wrapper for output with embedded PHP, called "views".
- * Variables can be assigned with the view object and referenced locally within
- * the view.
- *
- * @package    Kohana
- * @category   Base
- * @author     Kohana Team
- * @copyright  (c) 2008-2010 Kohana Team
- * @license    http://kohanaphp.com/license
- */
+	 * Acts as an object wrapper for output with embedded PHP, called "views".
+	 * Variables can be assigned with the view object and referenced locally within
+	 * the view.
+	 *
+	 * @package    Kohana
+	 * @category   Base
+	 * @author     Kohana Team
+	 * @copyright  (c) 2008-2010 Kohana Team
+	 * @license    http://kohanaphp.com/license
+	 */
 class Kohana_View_Model {
 
 	// View filename

Spacing +1 added lines, -1 removed lines

@@ -245,7 +245,7 @@
 	 */
 	public function bind($key, & $value)
 	{
-		$this->{$key} =& $value;
+		$this->{$key} = & $value;
 
 		return $this;
 	}

Braces +8 added lines, -12 removed lines

@@ -28,8 +28,9 @@ 
 	public static function factory($file = NULL, array $data = NULL)
 	{
 		// Return a raw view object if no template is specified.
-		if ($file === FALSE)
-			return new View(FALSE, $data);
+		if ($file === FALSE) {
+					return new View(FALSE, $data);
+		}
 
 		$class = 'View_'.strtr($file, '/', '_');
 
@@ -63,8 +64,7 @@ 
 		try
 		{
 			include 'kohana.view://'.$kohana_view_filename;
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			// Delete the output buffer
 			ob_end_clean();
@@ -126,12 +126,10 @@ 
 		if (method_exists($this, $key))
 		{
 			return $this->$key();
-		}
-		elseif (property_exists($this, $key))
+		} elseif (property_exists($this, $key))
 		{
 			return $this->$key;
-		}
-		else
+		} else
 		{
 			throw new Kohana_Exception('View variable is not set: :var', [':var' => $key]);
 		}
@@ -163,8 +161,7 @@ 
 		try
 		{
 			return $this->render();
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			// Display the exception message
 			Kohana_Exception::handler($e);
@@ -221,8 +218,7 @@ 
 			{
 				$this->{$name} = $value;
 			}
-		}
-		else
+		} else
 		{
 			$this->{$key} = $value;
 		}

Doc Comments +1 added lines, -1 removed lines

@@ -179,7 +179,7 @@
 	 *     $view->set_filename($file);
 	 *
 	 * @param   string  view filename
-	 * @return  View
+	 * @return  Kohana_View_Model
 	 * @throws  Kohana_View_Exception
 	 */
 	public function set_filename($file)

classes/Kohana/View/Stream/Wrapper.php

Indentation +43 added lines, -43 removed lines

@@ -1,23 +1,23 @@ 
 <?php
 /**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
+	 * Zend Framework
+	 *
+	 * LICENSE
+	 *
+	 * This source file is subject to the new BSD license that is bundled
+	 * with this package in the file LICENSE.txt.
+	 * It is also available through the world-wide-web at this URL:
+	 * http://framework.zend.com/license/new-bsd
+	 * If you did not receive a copy of the license and are unable to
+	 * obtain it through the world-wide-web, please send an email
+	 * to license@zend.com so we can send you a copy immediately.
+	 *
+	 * @category   Zend
+	 * @package    Zend_View
+	 * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+	 * @license    http://framework.zend.com/license/new-bsd     New BSD License
+	 * @version    $Id$
+	 */
 
 /**
  * Stream wrapper to convert markup of mostly-PHP templates into PHP prior to
@@ -115,31 +115,31 @@ 
 	 */
 	protected function _escape_val($matches)
 	{
-            // Start by trimming the echoed string
-            $code = trim($matches[2]);
-
-            // Then map all variables within the codeblock to the view class
-            $code = preg_replace('/\$(?!tmp_|this->)([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]+)/',
-                    '$this->var_$1', $code);
-
-            // If this block is not the special <?= block return
-            if ($matches[1] !== '=')
-            {
-                return '<?php '. $code . '?>';
-            }
-
-            // Remove trailing ; characters
-            $var = trim($code, ';');
-
-            if (substr($var, 0, 1) != $this->_raw_output_char)
-            {
-                return '<?php echo '.$this->_encode_method.'('.$var.'); ?>';
-            }
-            else
-            {
-                // Remove the "turn off escape" character
-                return '<?php echo '.substr($var, strlen($this->_raw_output_char), strlen($var)-1).'; ?>';
-            }
+			// Start by trimming the echoed string
+			$code = trim($matches[2]);
+
+			// Then map all variables within the codeblock to the view class
+			$code = preg_replace('/\$(?!tmp_|this->)([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]+)/',
+					'$this->var_$1', $code);
+
+			// If this block is not the special <?= block return
+			if ($matches[1] !== '=')
+			{
+				return '<?php '. $code . '?>';
+			}
+
+			// Remove trailing ; characters
+			$var = trim($code, ';');
+
+			if (substr($var, 0, 1) != $this->_raw_output_char)
+			{
+				return '<?php echo '.$this->_encode_method.'('.$var.'); ?>';
+			}
+			else
+			{
+				// Remove the "turn off escape" character
+				return '<?php echo '.substr($var, strlen($this->_raw_output_char), strlen($var)-1).'; ?>';
+			}
 	}
 
 	/**

Spacing +2 added lines, -2 removed lines

@@ -125,7 +125,7 @@ 
             // If this block is not the special <?= block return
             if ($matches[1] !== '=')
             {
-                return '<?php '. $code . '?>';
+                return '<?php '.$code.'?>';
             }
 
             // Remove trailing ; characters
@@ -138,7 +138,7 @@ 
             else
             {
                 // Remove the "turn off escape" character
-                return '<?php echo '.substr($var, strlen($this->_raw_output_char), strlen($var)-1).'; ?>';
+                return '<?php echo '.substr($var, strlen($this->_raw_output_char), strlen($var) - 1).'; ?>';
             }
 	}
 

Braces +4 added lines, -8 removed lines

@@ -134,8 +134,7 @@ 
             if (substr($var, 0, 1) != $this->_raw_output_char)
             {
                 return '<?php echo '.$this->_encode_method.'('.$var.'); ?>';
-            }
-            else
+            } else
             {
                 // Remove the "turn off escape" character
                 return '<?php echo '.substr($var, strlen($this->_raw_output_char), strlen($var)-1).'; ?>';
@@ -198,8 +197,7 @@ 
 				{
 					$this->_pos = $offset;
 					return true;
-				}
-				else
+				} else
 				{
 					return false;
 				}
@@ -210,8 +208,7 @@ 
 				{
 					$this->_pos += $offset;
 					return true;
-				}
-				else
+				} else
 				{
 					return false;
 				}
@@ -222,8 +219,7 @@ 
 				{
 					$this->_pos = strlen($this->_data) + $offset;
 					return true;
-				}
-				else
+				} else
 				{
 					return false;
 				}

views/template/global.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Basic global template view, rendered by the View_Template_Global class.
- *
- * @see View_Template_Global
- * @var string $title Page title
- * @var string $body  Page body HTML
- */
+   * Basic global template view, rendered by the View_Template_Global class.
+   *
+   * @see View_Template_Global
+   * @var string $title Page title
+   * @var string $body  Page body HTML
+   */
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>

Spacing +2 added lines, -2 removed lines

@@ -10,9 +10,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
     <head>
-        <title><?=$title;?></title>
+        <title><?=$title; ?></title>
     </head>
     <body>
-        <?=$body;?>
+        <?=$body; ?>
     </body>
 </html>

classes/Ingenerator/KohanaView/TemplateSpecifyingViewModel.php

Indentation +4 added lines, -4 removed lines

@@ -16,8 +16,8 @@
 interface TemplateSpecifyingViewModel
 {
 
-    /**
-     * @return string
-     */
-    public function getTemplateName();
+	/**
+	 * @return string
+	 */
+	public function getTemplateName();
 }

classes/Ingenerator/KohanaView/ViewModel.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * @author     Andrew Coulton <andrew@ingenerator.com>
- * @copyright  2015 inGenerator Ltd
- * @license    http://kohanaframework.org/license
- */
+	 * @author     Andrew Coulton <andrew@ingenerator.com>
+	 * @copyright  2015 inGenerator Ltd
+	 * @license    http://kohanaframework.org/license
+	 */
 
 namespace Ingenerator\KohanaView;
 

classes/Ingenerator/KohanaView/ViewTemplateSelector.php

Indentation +51 added lines, -51 removed lines

@@ -18,61 +18,61 @@
 class ViewTemplateSelector
 {
 
-    /**
-     * @param ViewModel $view
-     *
-     * @return string
-     */
-    public function getTemplateName(ViewModel $view)
-    {
-        if ($view instanceof TemplateSpecifyingViewModel) {
-            return $this->validateSpecifiedTemplateName($view);
-        } else {
-            return $this->calculateTemplateFromClassName($view);
-        }
-    }
+	/**
+	 * @param ViewModel $view
+	 *
+	 * @return string
+	 */
+	public function getTemplateName(ViewModel $view)
+	{
+		if ($view instanceof TemplateSpecifyingViewModel) {
+			return $this->validateSpecifiedTemplateName($view);
+		} else {
+			return $this->calculateTemplateFromClassName($view);
+		}
+	}
 
-    /**
-     * @param TemplateSpecifyingViewModel $view
-     *
-     * @return mixed
-     * @throws \UnexpectedValueException if no template is provided
-     */
-    protected function validateSpecifiedTemplateName(TemplateSpecifyingViewModel $view)
-    {
-        $template   = $view->getTemplateName();
-        $view_class = get_class($view);
-        if ( ! $template) {
-            throw new \UnexpectedValueException(
-                "$view_class::getTemplateName() must return a template name, empty value returned"
-            );
-        }
+	/**
+	 * @param TemplateSpecifyingViewModel $view
+	 *
+	 * @return mixed
+	 * @throws \UnexpectedValueException if no template is provided
+	 */
+	protected function validateSpecifiedTemplateName(TemplateSpecifyingViewModel $view)
+	{
+		$template   = $view->getTemplateName();
+		$view_class = get_class($view);
+		if ( ! $template) {
+			throw new \UnexpectedValueException(
+				"$view_class::getTemplateName() must return a template name, empty value returned"
+			);
+		}
 
-        if ( ! is_string($template)) {
-            $type = is_object($template) ? get_class($template) : gettype($template);
-            throw new \UnexpectedValueException(
-                "$view_class::getTemplateName() must return a string template name, $type value returned"
-            );
-        }
+		if ( ! is_string($template)) {
+			$type = is_object($template) ? get_class($template) : gettype($template);
+			throw new \UnexpectedValueException(
+				"$view_class::getTemplateName() must return a string template name, $type value returned"
+			);
+		}
 
-        return $template;
-    }
+		return $template;
+	}
 
-    /**
-     * @param ViewModel $view
-     *
-     * @return string
-     */
-    protected function calculateTemplateFromClassName(ViewModel $view)
-    {
-        $template = preg_replace('/\\\\|_/', '/', get_class($view));
-        $template = preg_replace('/([a-z])([A-Z])/', '\1_\2', $template);
-        $template = strtolower($template);
-        if (substr($template, 0, 5) === 'view/') {
-            $template = substr($template, 5);
-        }
+	/**
+	 * @param ViewModel $view
+	 *
+	 * @return string
+	 */
+	protected function calculateTemplateFromClassName(ViewModel $view)
+	{
+		$template = preg_replace('/\\\\|_/', '/', get_class($view));
+		$template = preg_replace('/([a-z])([A-Z])/', '\1_\2', $template);
+		$template = strtolower($template);
+		if (substr($template, 0, 5) === 'view/') {
+			$template = substr($template, 5);
+		}
 
-        return $template;
-    }
+		return $template;
+	}
 
 }

koharness.php

Indentation +7 added lines, -7 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * Configuration for the koharness module testing environment.
- * 
- * @author    Andrew Coulton <andrew@ingenerator.com>
- * @copyright 2013 inGenerator Ltd
- * @link      https://github.com/ingenerator/koharness
- */
+	 * Configuration for the koharness module testing environment.
+	 * 
+	 * @author    Andrew Coulton <andrew@ingenerator.com>
+	 * @copyright 2013 inGenerator Ltd
+	 * @link      https://github.com/ingenerator/koharness
+	 */
 return array(
   'modules' => array(
-    'kohana-view' => __DIR__,
+	'kohana-view' => __DIR__,
   )
 );