ingenerator / kohana-view

koharness.php

Indentation +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@
  * @link      https://github.com/ingenerator/koharness
  */
 return array(
-  'modules' => array(
+    'modules' => array(
     'kohana-view' => __DIR__,
-  )
+    )
 );

classes/Kohana/View/Stream/Wrapper.php

Indentation +171 added lines, -171 removed lines

@@ -39,85 +39,85 @@ 
  */
 class Kohana_View_Stream_Wrapper
 {
-	/**
-	 * Current stream position.
-	 *
-	 * @var int
-	 */
-	protected $_pos = 0;
-
-	/**
-	 * Data for streaming.
-	 *
-	 * @var string
-	 */
-	protected $_data;
-
-	/**
-	 * Stream stats.
-	 *
-	 * @var array
-	 */
-	protected $_stat;
-
-	/**
-	 * Raw output character. Prepend this on any echo variables to
-	 * turn off auto encoding of the output
-	 */
-	protected $_raw_output_char = '!';
-
-	/**
-	 * The encoding method to use on view output. Only use the method name
-	 */
-	protected $_encode_method = 'HTML::chars';
-
-	/**
-	 * Opens the script file and converts markup.
-	 */
-	public function stream_open($path, $mode, $options, &$opened_path)
-	{
-		// get the view script source
-		$path        = str_replace('kohana.view://', '', $path);
-		$this->_data = file_get_contents($path);
-
-		/**
-		 * 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)
-		{
-			$this->_stat = stat($path);
-			return false;
-		}
+    /**
+     * Current stream position.
+     *
+     * @var int
+     */
+    protected $_pos = 0;
+
+    /**
+     * Data for streaming.
+     *
+     * @var string
+     */
+    protected $_data;
+
+    /**
+     * Stream stats.
+     *
+     * @var array
+     */
+    protected $_stat;
+
+    /**
+     * Raw output character. Prepend this on any echo variables to
+     * turn off auto encoding of the output
+     */
+    protected $_raw_output_char = '!';
+
+    /**
+     * The encoding method to use on view output. Only use the method name
+     */
+    protected $_encode_method = 'HTML::chars';
+
+    /**
+     * Opens the script file and converts markup.
+     */
+    public function stream_open($path, $mode, $options, &$opened_path)
+    {
+        // get the view script source
+        $path        = str_replace('kohana.view://', '', $path);
+        $this->_data = file_get_contents($path);
+
+        /**
+         * 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)
+        {
+            $this->_stat = stat($path);
+            return false;
+        }
                 
-		/**
-                 * Escape all variables and convert <?= ?> to long-form <?php echo ?>
-		 *
-		 */
-		$regex = '/<\?(\=|php)?(.+?)\?>/s';
-		$this->_data = preg_replace_callback($regex, array($this, '_escape_val'), $this->_data);
-
-		/**
-		 * file_get_contents() won't update PHP's stat cache, so we grab a stat
-		 * of the file to prevent additional reads should the script be
-		 * requested again, which will make include() happy.
-		 */
-		$this->_stat = stat($path);
-
-		// PHP7.4 requires that we return the accurate value for the filesize, otherwise it does not read the full string
+        /**
+         * Escape all variables and convert <?= ?> to long-form <?php echo ?>
+         *
+         */
+        $regex = '/<\?(\=|php)?(.+?)\?>/s';
+        $this->_data = preg_replace_callback($regex, array($this, '_escape_val'), $this->_data);
+
+        /**
+         * file_get_contents() won't update PHP's stat cache, so we grab a stat
+         * of the file to prevent additional reads should the script be
+         * requested again, which will make include() happy.
+         */
+        $this->_stat = stat($path);
+
+        // PHP7.4 requires that we return the accurate value for the filesize, otherwise it does not read the full string
         // and then causes a cryptic "unexpected end of file" error
         $this->_stat['size'] = strlen($this->_data);
-		return true;
-	}
-
-	/**
-	 * Escapes a variable from template matching
-	 *
-	 * @param   array   matches
-	 * @return  string
-	 */
-	protected function _escape_val($matches)
-	{
+        return true;
+    }
+
+    /**
+     * Escapes a variable from template matching
+     *
+     * @param   array   matches
+     * @return  string
+     */
+    protected function _escape_val($matches)
+    {
             // Start by trimming the echoed string
             $code = trim($matches[2]);
 
@@ -143,101 +143,101 @@ 
                 // Remove the "turn off escape" character
                 return '<?php echo '.substr($var, strlen($this->_raw_output_char), strlen($var)-1).'; ?>';
             }
-	}
-
-	/**
-	 * Included so that __FILE__ returns the appropriate info
-	 *
-	 * @return array
-	 */
-	public function url_stat()
-	{
-		return $this->_stat;
-	}
-
-	/**
-	 * Reads from the stream.
-	 */
-	public function stream_read($count)
-	{
-		$ret = substr($this->_data, $this->_pos, $count);
-		$this->_pos += strlen($ret);
-		return $ret;
-	}
-
-	/**
-	 * Tells the current position in the stream.
-	 */
-	public function stream_tell()
-	{
-		return $this->_pos;
-	}
-
-	/**
-	 * Tells if we are at the end of the stream.
-	 */
-	public function stream_eof()
-	{
-		return $this->_pos >= strlen($this->_data);
-	}
-
-	/**
-	 * Stream statistics.
-	 */
-	public function stream_stat()
-	{
-		return $this->_stat;
-	}
-
-	/**
-	 * Seek to a specific point in the stream.
-	 */
-	public function stream_seek($offset, $whence)
-	{
-		switch ($whence)
-		{
-			case SEEK_SET:
-				if ($offset < strlen($this->_data) && $offset >= 0)
-				{
-					$this->_pos = $offset;
-					return true;
-				}
-				else
-				{
-					return false;
-				}
-				break;
-
-			case SEEK_CUR:
-				if ($offset >= 0)
-				{
-					$this->_pos += $offset;
-					return true;
-				}
-				else
-				{
-					return false;
-				}
-				break;
-
-			case SEEK_END:
-				if (strlen($this->_data) + $offset >= 0)
-				{
-					$this->_pos = strlen($this->_data) + $offset;
-					return true;
-				}
-				else
-				{
-					return false;
-				}
-				break;
-
-			default:
-				return false;
-		}
-	}
-
-	public function stream_set_option($option, $arg1, $arg2)
+    }
+
+    /**
+     * Included so that __FILE__ returns the appropriate info
+     *
+     * @return array
+     */
+    public function url_stat()
+    {
+        return $this->_stat;
+    }
+
+    /**
+     * Reads from the stream.
+     */
+    public function stream_read($count)
+    {
+        $ret = substr($this->_data, $this->_pos, $count);
+        $this->_pos += strlen($ret);
+        return $ret;
+    }
+
+    /**
+     * Tells the current position in the stream.
+     */
+    public function stream_tell()
+    {
+        return $this->_pos;
+    }
+
+    /**
+     * Tells if we are at the end of the stream.
+     */
+    public function stream_eof()
+    {
+        return $this->_pos >= strlen($this->_data);
+    }
+
+    /**
+     * Stream statistics.
+     */
+    public function stream_stat()
+    {
+        return $this->_stat;
+    }
+
+    /**
+     * Seek to a specific point in the stream.
+     */
+    public function stream_seek($offset, $whence)
+    {
+        switch ($whence)
+        {
+            case SEEK_SET:
+                if ($offset < strlen($this->_data) && $offset >= 0)
+                {
+                    $this->_pos = $offset;
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+                break;
+
+            case SEEK_CUR:
+                if ($offset >= 0)
+                {
+                    $this->_pos += $offset;
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+                break;
+
+            case SEEK_END:
+                if (strlen($this->_data) + $offset >= 0)
+                {
+                    $this->_pos = strlen($this->_data) + $offset;
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+                break;
+
+            default:
+                return false;
+        }
+    }
+
+    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)

classes/Kohana/View/Model.php

Indentation +241 added lines, -241 removed lines

@@ -12,272 +12,272 @@
  */
 class Kohana_View_Model {
 
-	// View filename
-	protected $_file;
+    // View filename
+    protected $_file;
 
-	/**
-	 * Returns a new raw View object. If you do not define the "file" parameter,
-	 * you must call [View::set_filename].
-	 *
-	 *     $view = View::factory($file);
-	 *
-	 * @param   string  view filename
-	 * @param   array   array of values
-	 * @return  View
-	 */
-	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);
+    /**
+     * Returns a new raw View object. If you do not define the "file" parameter,
+     * you must call [View::set_filename].
+     *
+     *     $view = View::factory($file);
+     *
+     * @param   string  view filename
+     * @param   array   array of values
+     * @return  View
+     */
+    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);
 
-		$class = 'View_'.strtr($file, '/', '_');
+        $class = 'View_'.strtr($file, '/', '_');
 
-		if ( ! class_exists($class))
-		{
-			$class = 'View';
-		}
+        if ( ! class_exists($class))
+        {
+            $class = 'View';
+        }
 
-		return new $class($file, $data);
-	}
+        return new $class($file, $data);
+    }
 
-	/**
-	 * Captures the output that is generated when a view is included.
-	 * The view data will be extracted to make local variables.
-	 *
-	 *     $output = $this->capture($file);
-	 *
-	 * @param   string  filename
-	 * @return  string
-	 */
-	protected function capture($kohana_view_filename)
-	{
-		if ( ! in_array('kohana.view', stream_get_wrappers()))
-		{
-			stream_wrapper_register('kohana.view', 'View_Stream_Wrapper');
-		}
+    /**
+     * Captures the output that is generated when a view is included.
+     * The view data will be extracted to make local variables.
+     *
+     *     $output = $this->capture($file);
+     *
+     * @param   string  filename
+     * @return  string
+     */
+    protected function capture($kohana_view_filename)
+    {
+        if ( ! in_array('kohana.view', stream_get_wrappers()))
+        {
+            stream_wrapper_register('kohana.view', 'View_Stream_Wrapper');
+        }
 
-		// Capture the view output
-		ob_start();
+        // Capture the view output
+        ob_start();
 
-		try
-		{
-			include 'kohana.view://'.$kohana_view_filename;
-		}
-		catch (Exception $e)
-		{
-			// Delete the output buffer
-			ob_end_clean();
+        try
+        {
+            include 'kohana.view://'.$kohana_view_filename;
+        }
+        catch (Exception $e)
+        {
+            // Delete the output buffer
+            ob_end_clean();
 
-			// Re-throw the exception
-			throw $e;
-		}
+            // Re-throw the exception
+            throw $e;
+        }
 
-		// Get the captured output and close the buffer
-		return ob_get_clean();
-	}
+        // Get the captured output and close the buffer
+        return ob_get_clean();
+    }
 
-	/**
-	 * Sets the initial view filename and local data. Views should almost
-	 * always only be created using [View::factory].
-	 *
-	 *     $view = new View($file);
-	 *
-	 * @param   string  view filename
-	 * @param   array   array of values
-	 * @return  void
-	 * @uses    View::set_filename
-	 */
-	public function __construct($file = NULL, array $data = NULL)
-	{
-		if ($file === NULL)
-		{
-			$foo = explode('_', get_class($this));
-			array_shift($foo);
-			$file = strtolower(implode('/', $foo));
-		}
+    /**
+     * Sets the initial view filename and local data. Views should almost
+     * always only be created using [View::factory].
+     *
+     *     $view = new View($file);
+     *
+     * @param   string  view filename
+     * @param   array   array of values
+     * @return  void
+     * @uses    View::set_filename
+     */
+    public function __construct($file = NULL, array $data = NULL)
+    {
+        if ($file === NULL)
+        {
+            $foo = explode('_', get_class($this));
+            array_shift($foo);
+            $file = strtolower(implode('/', $foo));
+        }
 		
-		if ($file !== FALSE)
-		{
-			$this->set_filename($file);
-		}
+        if ($file !== FALSE)
+        {
+            $this->set_filename($file);
+        }
 
-		if ($data !== NULL)
-		{
-			// Add the values to the current data
-			$this->set($data);
-		}
-	}
+        if ($data !== NULL)
+        {
+            // Add the values to the current data
+            $this->set($data);
+        }
+    }
 
-	/**
-	 * Magic method, searches for the given variable and returns its value.
-	 * Local variables will be returned before global variables.
-	 *
-	 *     $value = $view->foo;
-	 *
-	 * [!!] If the variable has not yet been set, an exception will be thrown.
-	 *
-	 * @param   string  variable name
-	 * @return  mixed
-	 * @throws  Kohana_Exception
-	 */
-	public function __get($key)
-	{
-		if (method_exists($this, $key))
-		{
-			return $this->$key();
-		}
-		elseif (property_exists($this, $key))
-		{
-			return $this->$key;
-		}
-		else
-		{
-			throw new Kohana_Exception('View variable is not set: :var',
-				array(':var' => $key));
-		}
-	}
+    /**
+     * Magic method, searches for the given variable and returns its value.
+     * Local variables will be returned before global variables.
+     *
+     *     $value = $view->foo;
+     *
+     * [!!] If the variable has not yet been set, an exception will be thrown.
+     *
+     * @param   string  variable name
+     * @return  mixed
+     * @throws  Kohana_Exception
+     */
+    public function __get($key)
+    {
+        if (method_exists($this, $key))
+        {
+            return $this->$key();
+        }
+        elseif (property_exists($this, $key))
+        {
+            return $this->$key;
+        }
+        else
+        {
+            throw new Kohana_Exception('View variable is not set: :var',
+                array(':var' => $key));
+        }
+    }
 
-	/**
-	 * Magic method, calls [View::set] with the same parameters.
-	 *
-	 *     $view->foo = 'something';
-	 *
-	 * @param   string  variable name
-	 * @param   mixed   value
-	 * @return  void
-	 */
-	public function __set($key, $value)
-	{
-		$this->set($key, $value);
-	}
+    /**
+     * Magic method, calls [View::set] with the same parameters.
+     *
+     *     $view->foo = 'something';
+     *
+     * @param   string  variable name
+     * @param   mixed   value
+     * @return  void
+     */
+    public function __set($key, $value)
+    {
+        $this->set($key, $value);
+    }
 
 
-	/**
-	 * Magic method, returns the output of [View::render].
-	 *
-	 * @return  string
-	 * @uses    View::render
-	 */
-	public function __toString()
-	{
-		try
-		{
-			return $this->render();
-		}
-		catch (Exception $e)
-		{
-			// Display the exception message
-			Kohana_Exception::handler($e);
+    /**
+     * Magic method, returns the output of [View::render].
+     *
+     * @return  string
+     * @uses    View::render
+     */
+    public function __toString()
+    {
+        try
+        {
+            return $this->render();
+        }
+        catch (Exception $e)
+        {
+            // Display the exception message
+            Kohana_Exception::handler($e);
 
-			return '';
-		}
-	}
+            return '';
+        }
+    }
 
-	/**
-	 * Sets the view filename.
-	 *
-	 *     $view->set_filename($file);
-	 *
-	 * @param   string  view filename
-	 * @return  View
-	 * @throws  Kohana_View_Exception
-	 */
-	public function set_filename($file)
-	{
-		if (($path = Kohana::find_file('views', $file)) === FALSE)
-		{
-			throw new Kohana_View_Exception('The requested view :file could not be found', array(
-				':file' => $file,
-			));
-		}
+    /**
+     * Sets the view filename.
+     *
+     *     $view->set_filename($file);
+     *
+     * @param   string  view filename
+     * @return  View
+     * @throws  Kohana_View_Exception
+     */
+    public function set_filename($file)
+    {
+        if (($path = Kohana::find_file('views', $file)) === FALSE)
+        {
+            throw new Kohana_View_Exception('The requested view :file could not be found', array(
+                ':file' => $file,
+            ));
+        }
 
-		// Store the file path locally
-		$this->_file = $path;
+        // Store the file path locally
+        $this->_file = $path;
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Assigns a variable by name. Assigned values will be available as a
-	 * variable within the view file:
-	 *
-	 *     // This value can be accessed as $foo within the view
-	 *     $view->set('foo', 'my value');
-	 *
-	 * You can also use an array to set several values at once:
-	 *
-	 *     // Create the values $food and $beverage in the view
-	 *     $view->set(array('food' => 'bread', 'beverage' => 'water'));
-	 *
-	 * @param   string   variable name or an array of variables
-	 * @param   mixed    value
-	 * @return  $this
-	 */
-	public function set($key, $value = NULL)
-	{
-		if (is_array($key))
-		{
-			foreach ($key as $name => $value)
-			{
-				$this->{$name} = $value;
-			}
-		}
-		else
-		{
-			$this->{$key} = $value;
-		}
+    /**
+     * Assigns a variable by name. Assigned values will be available as a
+     * variable within the view file:
+     *
+     *     // This value can be accessed as $foo within the view
+     *     $view->set('foo', 'my value');
+     *
+     * You can also use an array to set several values at once:
+     *
+     *     // Create the values $food and $beverage in the view
+     *     $view->set(array('food' => 'bread', 'beverage' => 'water'));
+     *
+     * @param   string   variable name or an array of variables
+     * @param   mixed    value
+     * @return  $this
+     */
+    public function set($key, $value = NULL)
+    {
+        if (is_array($key))
+        {
+            foreach ($key as $name => $value)
+            {
+                $this->{$name} = $value;
+            }
+        }
+        else
+        {
+            $this->{$key} = $value;
+        }
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Assigns a value by reference. The benefit of binding is that values can
-	 * be altered without re-setting them. It is also possible to bind variables
-	 * before they have values. Assigned values will be available as a
-	 * variable within the view file:
-	 *
-	 *     // This reference can be accessed as $ref within the view
-	 *     $view->bind('ref', $bar);
-	 *
-	 * @param   string   variable name
-	 * @param   mixed    referenced variable
-	 * @return  $this
-	 */
-	public function bind($key, & $value)
-	{
-		$this->{$key} =& $value;
+    /**
+     * Assigns a value by reference. The benefit of binding is that values can
+     * be altered without re-setting them. It is also possible to bind variables
+     * before they have values. Assigned values will be available as a
+     * variable within the view file:
+     *
+     *     // This reference can be accessed as $ref within the view
+     *     $view->bind('ref', $bar);
+     *
+     * @param   string   variable name
+     * @param   mixed    referenced variable
+     * @return  $this
+     */
+    public function bind($key, & $value)
+    {
+        $this->{$key} =& $value;
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Renders the view object to a string. Global and local data are merged
-	 * and extracted to create local variables within the view file.
-	 *
-	 *     $output = View::render();
-	 *
-	 * [!!] Global variables with the same key name as local variables will be
-	 * overwritten by the local variable.
-	 *
-	 * @param    string  view filename
-	 * @return   string
-	 * @throws   Kohana_View_Exception
-	 * @uses     View::capture
-	 */
-	public function render($file = NULL)
-	{
-		if ($file !== NULL)
-		{
-			$this->set_filename($file);
-		}
+    /**
+     * Renders the view object to a string. Global and local data are merged
+     * and extracted to create local variables within the view file.
+     *
+     *     $output = View::render();
+     *
+     * [!!] Global variables with the same key name as local variables will be
+     * overwritten by the local variable.
+     *
+     * @param    string  view filename
+     * @return   string
+     * @throws   Kohana_View_Exception
+     * @uses     View::capture
+     */
+    public function render($file = NULL)
+    {
+        if ($file !== NULL)
+        {
+            $this->set_filename($file);
+        }
 
-		if (empty($this->_file))
-		{
-			throw new Kohana_View_Exception('You must set the file to use within your view before rendering');
-		}
+        if (empty($this->_file))
+        {
+            throw new Kohana_View_Exception('You must set the file to use within your view before rendering');
+        }
 
-		// Combine local and global data and capture the output
-		return $this->capture($this->_file);
-	}
+        // Combine local and global data and capture the output
+        return $this->capture($this->_file);
+    }
 } // End View
\ No newline at end of file

classes/Ingenerator/ViewFactory.php

Indentation +37 added lines, -37 removed lines

@@ -18,42 +18,42 @@
  */
 class ViewFactory {
 
-	/**
-	 * Create and return a view of the specified type
-	 *
-	 * @param string $class name of the view class to create
-	 * @param array  $data  array of data to pass to the view
-	 *
-	 * @return \View
-	 * @throws \View_Exception if the class is not defined
-	 */
-	public function create($class, $data = array())
-	{
-		// Check the view class exists
-		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))
-		{
-			// Strip the \View\ prefix
-			$template = substr($class, 6);
-
-			// Exchange namespace separators for directory separators
-			$template = str_replace('\\', DIRECTORY_SEPARATOR, $template);
-
-			// Lowercase the View file name
-			$template = strtolower($template);
-		}
-		else
-		{
-			$template = NULL;
-		}
-
-		return new $class($template, $data);
-	}
+    /**
+     * Create and return a view of the specified type
+     *
+     * @param string $class name of the view class to create
+     * @param array  $data  array of data to pass to the view
+     *
+     * @return \View
+     * @throws \View_Exception if the class is not defined
+     */
+    public function create($class, $data = array())
+    {
+        // Check the view class exists
+        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))
+        {
+            // Strip the \View\ prefix
+            $template = substr($class, 6);
+
+            // Exchange namespace separators for directory separators
+            $template = str_replace('\\', DIRECTORY_SEPARATOR, $template);
+
+            // Lowercase the View file name
+            $template = strtolower($template);
+        }
+        else
+        {
+            $template = NULL;
+        }
+
+        return new $class($template, $data);
+    }
 
 }
\ No newline at end of file