ingenerator / kohana-view

classes/Kohana/View/Stream/Wrapper.php

Braces +12 added lines, -27 removed lines

@@ -84,8 +84,7 @@ 
 		 * If reading the file failed, update our local stat store
 		 * to reflect the real stat of the file, then return on failure
 		 */
-		if ($this->_data === false)
-		{
+		if ($this->_data === false) {
 			$this->_stat = stat($path);
 			return false;
 		}
@@ -126,20 +125,16 @@ 
                     '$this->var_$1', $code);
 
             // If this block is not the special <?= block return
-            if ($matches[1] !== '=')
-            {
+            if ($matches[1] !== '=') {
                 return '<?php '. $code . '?>';
             }
 
             // Remove trailing ; characters
             $var = trim($code, ';');
 
-            if (substr($var, 0, 1) != $this->_raw_output_char)
-            {
+            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).'; ?>';
             }
@@ -194,40 +189,30 @@ 
 	 */
 	public function stream_seek($offset, $whence)
 	{
-		switch ($whence)
-		{
+		switch ($whence) {
 			case SEEK_SET:
-				if ($offset < strlen($this->_data) && $offset >= 0)
-				{
+				if ($offset < strlen($this->_data) && $offset >= 0) {
 					$this->_pos = $offset;
 					return true;
-				}
-				else
-				{
+				} else {
 					return false;
 				}
 				break;
 
 			case SEEK_CUR:
-				if ($offset >= 0)
-				{
+				if ($offset >= 0) {
 					$this->_pos += $offset;
 					return true;
-				}
-				else
-				{
+				} else {
 					return false;
 				}
 				break;
 
 			case SEEK_END:
-				if (strlen($this->_data) + $offset >= 0)
-				{
+				if (strlen($this->_data) + $offset >= 0) {
 					$this->_pos = strlen($this->_data) + $offset;
 					return true;
-				}
-				else
-				{
+				} else {
 					return false;
 				}
 				break;
@@ -238,7 +223,7 @@ 
 	}
 
 	public function stream_set_option($option, $arg1, $arg2)
-    {
+	{
         // PHP7.4 requires this be implemented, but we can return FALSE that we don't support any of the options
         // (blocking mode, buffering, etc)
         return FALSE;

classes/Kohana/View/Model.php

Braces +23 added lines, -44 removed lines

@@ -10,7 +10,8 @@ 
  * @copyright  (c) 2008-2010 Kohana Team
  * @license    http://kohanaphp.com/license
  */
-class Kohana_View_Model {
+class Kohana_View_Model
+{
 
 	// View filename
 	protected $_file;
@@ -28,13 +29,13 @@ 
 	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, '/', '_');
 
-		if ( ! class_exists($class))
-		{
+		if ( ! class_exists($class)) {
 			$class = 'View';
 		}
 
@@ -52,20 +53,16 @@ 
 	 */
 	protected function capture($kohana_view_filename)
 	{
-		if ( ! in_array('kohana.view', stream_get_wrappers()))
-		{
+		if ( ! in_array('kohana.view', stream_get_wrappers())) {
 			stream_wrapper_register('kohana.view', 'View_Stream_Wrapper');
 		}
 
 		// Capture the view output
 		ob_start();
 
-		try
-		{
+		try {
 			include 'kohana.view://'.$kohana_view_filename;
-		}
-		catch (Exception $e)
-		{
+		} catch (Exception $e) {
 			// Delete the output buffer
 			ob_end_clean();
 
@@ -90,20 +87,17 @@ 
 	 */
 	public function __construct($file = NULL, array $data = NULL)
 	{
-		if ($file === NULL)
-		{
+		if ($file === NULL) {
 			$foo = explode('_', get_class($this));
 			array_shift($foo);
 			$file = strtolower(implode('/', $foo));
 		}
 		
-		if ($file !== FALSE)
-		{
+		if ($file !== FALSE) {
 			$this->set_filename($file);
 		}
 
-		if ($data !== NULL)
-		{
+		if ($data !== NULL) {
 			// Add the values to the current data
 			$this->set($data);
 		}
@@ -123,16 +117,11 @@ 
 	 */
 	public function __get($key)
 	{
-		if (method_exists($this, $key))
-		{
+		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',
 				array(':var' => $key));
 		}
@@ -161,12 +150,9 @@ 
 	 */
 	public function __toString()
 	{
-		try
-		{
+		try {
 			return $this->render();
-		}
-		catch (Exception $e)
-		{
+		} catch (Exception $e) {
 			// Display the exception message
 			Kohana_Exception::handler($e);
 
@@ -185,8 +171,7 @@ 
 	 */
 	public function set_filename($file)
 	{
-		if (($path = Kohana::find_file('views', $file)) === FALSE)
-		{
+		if (($path = Kohana::find_file('views', $file)) === FALSE) {
 			throw new Kohana_View_Exception('The requested view :file could not be found', array(
 				':file' => $file,
 			));
@@ -216,15 +201,11 @@ 
 	 */
 	public function set($key, $value = NULL)
 	{
-		if (is_array($key))
-		{
-			foreach ($key as $name => $value)
-			{
+		if (is_array($key)) {
+			foreach ($key as $name => $value) {
 				$this->{$name} = $value;
 			}
-		}
-		else
-		{
+		} else {
 			$this->{$key} = $value;
 		}
 
@@ -267,13 +248,11 @@ 
 	 */
 	public function render($file = NULL)
 	{
-		if ($file !== NULL)
-		{
+		if ($file !== NULL) {
 			$this->set_filename($file);
 		}
 
-		if (empty($this->_file))
-		{
+		if (empty($this->_file)) {
 			throw new Kohana_View_Exception('You must set the file to use within your view before rendering');
 		}
 

classes/ViewFactory.php

Braces +3 added lines, -1 removed lines

@@ -14,4 +14,6 @@
  * The ViewFactory creates view classes, to allow stubbing of views for testing and easier extension in applications.
  *
  */
-class ViewFactory extends Ingenerator\ViewFactory{}
\ No newline at end of file
+class ViewFactory extends Ingenerator\ViewFactory
+{
+}
\ No newline at end of file

classes/View/Stream/Wrapper.php

Braces +3 added lines, -1 removed lines

@@ -1,3 +1,5 @@
 <?php defined('SYSPATH') or die('No direct script access.');
 
-class View_Stream_Wrapper extends Kohana_View_Stream_Wrapper {}
+class View_Stream_Wrapper extends Kohana_View_Stream_Wrapper
+{
+}

classes/View/Model.php

Braces +3 added lines, -1 removed lines

@@ -1,3 +1,5 @@
 <?php defined('SYSPATH') or die('No direct script access.');
 
-class View_Model extends Kohana_View_Model {}
+class View_Model extends Kohana_View_Model
+{
+}

classes/Ingenerator/ViewFactory.php

Braces +5 added lines, -8 removed lines

@@ -16,7 +16,8 @@ 
  *
  * @package Ingenerator
  */
-class ViewFactory {
+class ViewFactory
+{
 
 	/**
 	 * Create and return a view of the specified type
@@ -30,15 +31,13 @@ 
 	public function create($class, $data = array())
 	{
 		// Check the view class exists
-		if ( ! class_exists($class))
-		{
+		if ( ! class_exists($class)) {
 			throw new \View_Exception("View class $class does not exist");
 		}
 
 		// Temporary fix to map template names for namespaced classes
 		//@todo: Refactor the existing factory methods and classes to support namespaces
-		if ('\\View\\' === substr($class, 0, 6))
-		{
+		if ('\\View\\' === substr($class, 0, 6)) {
 			// Strip the \View\ prefix
 			$template = substr($class, 6);
 
@@ -47,9 +46,7 @@ 
 
 			// Lowercase the View file name
 			$template = strtolower($template);
-		}
-		else
-		{
+		} else {
 			$template = NULL;
 		}
 

classes/Ingenerator/View/Layout.php

Braces +8 added lines, -17 removed lines

@@ -47,11 +47,9 @@ 
      */
     public function var_page()
     {
-        if ( is_string($this->template))
-        {
+        if ( is_string($this->template)) {
             $class = 'View_Template_'.$this->template;
-            if ( ! class_exists($class))
-            {
+            if ( ! class_exists($class)) {
                 $class = 'View';
             }
             $this->template = new $class();
@@ -109,8 +107,7 @@ 
         $this->post_render();
 
         // Render the template if required
-        if ($this->use_template())
-        {
+        if ($this->use_template()) {
             $template = $this->var_page();
             $template->set('var_body', $body);
             return $template->render();
@@ -138,27 +135,21 @@ 
     public function use_template($use_template = null)
     {
         // If we're being called as a setter
-        if ($use_template !== null)
-        {
+        if ($use_template !== null) {
             $this->_use_template = $use_template;
             return $this;
         }
 
         // If an explicit value was set
-        if ($this->_use_template !== null)
-        {
+        if ($this->_use_template !== null) {
             return $this->_use_template;
         }
 
         // Guess based on is_ajax
-        if (Request::current())
-        {
-            if (Request::current()->is_ajax())
-            {
+        if (Request::current()) {
+            if (Request::current()->is_ajax()) {
                 return false;
-            }
-            else
-            {
+            } else {
                 return true;
             }
         }