ci-bonfire / Sprint

myth/Docs/DocBuilderInterface.php

Indentation +103 added lines, -103 removed lines

@@ -40,117 +40,117 @@
  */
 interface DocBuilderInterface
 {
-    /**
-     * Does the actual work of reading in and parsing the help file.
-     * If a folder Nickname (see addDocFolder() ) is passed as the second parameter,
-     * it will limit it's search to that single folder. If nothing is passed, it will
-     * search through all of the folders in the order they were given to the library,
-     * until it finds the first one.
-     *
-     * @param string $path The 'path' of the file (relative to the docs
-     *                                 folder. Usually from the URI)
-     * @param string $restrictToFolder (Optional) The folder nickname
-     *
-     * @return string
-     */
-    public function readPage($path, $restrictToFolder = null);
+	/**
+	 * Does the actual work of reading in and parsing the help file.
+	 * If a folder Nickname (see addDocFolder() ) is passed as the second parameter,
+	 * it will limit it's search to that single folder. If nothing is passed, it will
+	 * search through all of the folders in the order they were given to the library,
+	 * until it finds the first one.
+	 *
+	 * @param string $path The 'path' of the file (relative to the docs
+	 *                                 folder. Usually from the URI)
+	 * @param string $restrictToFolder (Optional) The folder nickname
+	 *
+	 * @return string
+	 */
+	public function readPage($path, $restrictToFolder = null);
 
-    /**
-     * Parses the contents. Currently runs through the Markdown Extended
-     * parser to convert to HTML.
-     *
-     * @param $str
-     * @return mixed
-     */
-    public function parse($str);
+	/**
+	 * Parses the contents. Currently runs through the Markdown Extended
+	 * parser to convert to HTML.
+	 *
+	 * @param $str
+	 * @return mixed
+	 */
+	public function parse($str);
 
-    /**
-     * Perform a few housekeeping tasks on a page, like rewriting URLs to full
-     * URLs, not relative, ensuring they link correctly, etc.
-     *
-     * @param      $content
-     * @param null $site_url
-     * @param null $current_url
-     * @return string   The post-processed HTML.
-     */
-    public function postProcess($content, $site_url = null, $current_url = null);
+	/**
+	 * Perform a few housekeeping tasks on a page, like rewriting URLs to full
+	 * URLs, not relative, ensuring they link correctly, etc.
+	 *
+	 * @param      $content
+	 * @param null $site_url
+	 * @param null $current_url
+	 * @return string   The post-processed HTML.
+	 */
+	public function postProcess($content, $site_url = null, $current_url = null);
 
-    /**
-     * Allows users to define the classes that are attached to
-     * generated tables.
-     *
-     * @param null $classes
-     * @return $this
-     */
-    public function setTableClasses($classes = null);
+	/**
+	 * Allows users to define the classes that are attached to
+	 * generated tables.
+	 *
+	 * @param null $classes
+	 * @return $this
+	 */
+	public function setTableClasses($classes = null);
 
-    /**
-     * Given the contents to render, will build a list of links for the sidebar
-     * out of the headings in the file.
-     *
-     * Note: Will ONLY use h2 and h3 to build the links from.
-     *
-     * Note: The $content passed in WILL be modified by adding named anchors
-     * that match up with the locations.
-     *
-     * @param string $content The HTML to analyse for headings.
-     * @return string
-     */
-    public function buildDocumentMap(&$content);
+	/**
+	 * Given the contents to render, will build a list of links for the sidebar
+	 * out of the headings in the file.
+	 *
+	 * Note: Will ONLY use h2 and h3 to build the links from.
+	 *
+	 * Note: The $content passed in WILL be modified by adding named anchors
+	 * that match up with the locations.
+	 *
+	 * @param string $content The HTML to analyse for headings.
+	 * @return string
+	 */
+	public function buildDocumentMap(&$content);
 
-    /**
-     * Stores the name of the callback method to run to convert the source
-     * files to viewable files. By default, this should be used to register
-     * a Mardown Extended formatter with the system, but could be used to
-     * extend the
-     *
-     * @param string $callback_name
-     * @param bool $cascade // If FALSE the formatting of a component ends here. If TRUE, will be passed to next formatter.
-     * @return $this
-     */
-    public function registerFormatter($callback_name = '', $cascade = false);
+	/**
+	 * Stores the name of the callback method to run to convert the source
+	 * files to viewable files. By default, this should be used to register
+	 * a Mardown Extended formatter with the system, but could be used to
+	 * extend the
+	 *
+	 * @param string $callback_name
+	 * @param bool $cascade // If FALSE the formatting of a component ends here. If TRUE, will be passed to next formatter.
+	 * @return $this
+	 */
+	public function registerFormatter($callback_name = '', $cascade = false);
 
-    /**
-     * Runs the text through the registered formatters.
-     *
-     * @param $str
-     * @return mixed
-     */
-    public function format($str);
+	/**
+	 * Runs the text through the registered formatters.
+	 *
+	 * @param $str
+	 * @return mixed
+	 */
+	public function format($str);
 
-    /**
-     * Retrieves the list of files in a folder and preps the name and filename
-     * so it's ready for creating the HTML.
-     *
-     * @param  String $folder The path to the folder to retrieve.
-     *
-     * @return Array  An associative array @see parse_ini_file for format
-     * details.
-     */
-    public function buildTOC($folder);
+	/**
+	 * Retrieves the list of files in a folder and preps the name and filename
+	 * so it's ready for creating the HTML.
+	 *
+	 * @param  String $folder The path to the folder to retrieve.
+	 *
+	 * @return Array  An associative array @see parse_ini_file for format
+	 * details.
+	 */
+	public function buildTOC($folder);
 
-    /**
-     * Returns the current docFolders array.
-     *
-     * @return array
-     */
-    public function docFolders();
+	/**
+	 * Returns the current docFolders array.
+	 *
+	 * @return array
+	 */
+	public function docFolders();
 
-    /**
-     * Registers a path to be used when searching for documentation files.
-     *
-     * @param $name     A nickname to reference it by later.
-     * @param $path     The server path to the folder.
-     * @return $this
-     */
-    public function addDocFolder($name, $path);
+	/**
+	 * Registers a path to be used when searching for documentation files.
+	 *
+	 * @param $name     A nickname to reference it by later.
+	 * @param $path     The server path to the folder.
+	 * @return $this
+	 */
+	public function addDocFolder($name, $path);
 
-    /**
-     * Removes a folder from the folders we scan for documentation files
-     * within.
-     *
-     * @param $name
-     * @return $this
-     */
-    public function removeDocFolder($name);
+	/**
+	 * Removes a folder from the folders we scan for documentation files
+	 * within.
+	 *
+	 * @param $name
+	 * @return $this
+	 */
+	public function removeDocFolder($name);
 }

myth/Docs/DocSearchInterface.php

Indentation +59 added lines, -59 removed lines

@@ -1,71 +1,71 @@
 <?php namespace Myth\Docs;
 /**
- * Sprint
- *
- * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package     Sprint
- * @author      Lonnie Ezell
- * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
- * @license     http://opensource.org/licenses/MIT  (MIT)
- * @link        http://sprintphp.com
- * @since       Version 1.0
- */
+	 * Sprint
+	 *
+	 * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
+	 * of this software and associated documentation files (the "Software"), to deal
+	 * in the Software without restriction, including without limitation the rights
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	 * THE SOFTWARE.
+	 *
+	 * @package     Sprint
+	 * @author      Lonnie Ezell
+	 * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
+	 * @license     http://opensource.org/licenses/MIT  (MIT)
+	 * @link        http://sprintphp.com
+	 * @since       Version 1.0
+	 */
 
 interface DocSearchInterface {
 
-    /**
-     * The entry point for performing a search of the documentation.
-     *
-     * @param null  $terms
-     * @param array $folders
-     *
-     * @return array|null
-     */
-    public function search($terms = null, $folders = []);
+	/**
+	 * The entry point for performing a search of the documentation.
+	 *
+	 * @param null  $terms
+	 * @param array $folders
+	 *
+	 * @return array|null
+	 */
+	public function search($terms = null, $folders = []);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Stores the name of the callback method to run to convert the source
-     * files to viewable files. By default, this should be used to register
-     * a Mardown Extended formatter with the system, but could be used to
-     * extend the
-     *
-     * @param string $callback_name
-     * @param bool   $cascade       // If FALSE the formatting of a component ends here. If TRUE, will be passed to next formatter.
-     * @return $this
-     */
-    public function registerFormatter($callback_name='', $cascade=false);
+	/**
+	 * Stores the name of the callback method to run to convert the source
+	 * files to viewable files. By default, this should be used to register
+	 * a Mardown Extended formatter with the system, but could be used to
+	 * extend the
+	 *
+	 * @param string $callback_name
+	 * @param bool   $cascade       // If FALSE the formatting of a component ends here. If TRUE, will be passed to next formatter.
+	 * @return $this
+	 */
+	public function registerFormatter($callback_name='', $cascade=false);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Runs the text through the registered formatters.
-     *
-     * @param $str
-     * @return mixed
-     */
-    public function format($str);
+	/**
+	 * Runs the text through the registered formatters.
+	 *
+	 * @param $str
+	 * @return mixed
+	 */
+	public function format($str);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

myth/Docs/Search.php

Indentation +415 added lines, -415 removed lines

@@ -41,420 +41,420 @@
 class Search implements DocSearchInterface
 {
 
-    /**
-     * Minimum characters that can be submitted for a search.
-     *
-     * @var int
-     */
-    protected $min_chars = 3;
-
-    /**
-     * Maximum characters that can be submitted for a search.
-     *
-     * @var int
-     */
-    protected $max_chars = 30;
-
-    /**
-     * Valid file extensions we can search in.
-     *
-     * @var string
-     */
-    protected $allowed_file_types = 'html|htm|php|php4|php5|txt|md';
-
-    /**
-     * Which files should we skip over during our search?
-     *
-     * @var array
-     */
-    protected $skip_files = ['.', '..', '_404.md', '_toc.ini'];
-
-    /**
-     * How much of each file should we read.
-     * Use lower values for faster searches.
-     *
-     * @var int
-     */
-    protected $byte_size = 51200;
-
-    /**
-     * Number of words long (approximately)
-     * the result excerpt should be.
-     *
-     * @var int
-     */
-    protected $excerpt_length = 60;
-
-    /**
-     * The maximum number of results allowed from a single file.
-     *
-     * @var int
-     */
-    protected $max_per_file = 1;
-
-    protected $doc_folders = array();
-
-    protected $formatters = array();
-
-    //--------------------------------------------------------------------
-
-    /**
-     * The entry point for performing a search of the documentation.
-     *
-     * @param null $terms
-     * @param array $folders
-     *
-     * @return array|null
-     */
-    public function search($terms = null, $folders = [])
-    {
-        if (empty($terms) || empty($folders)) {
-            return null;
-        }
-
-        $results = [];
-        $this->doc_folders = $folders;
-
-        foreach ($folders as $group => $folder) {
-            $results = array_merge($results, $this->searchFolder($terms, $folder, $group));
-        }
-
-        return $results;
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Private Methods
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Searches a single directory worth of files.
-     *
-     * @param $term
-     * @param $folder
-     * @param $group_name
-     *
-     * @return array The results.
-     */
-    protected function searchFolder($term, $folder, $group_name)
-    {
-        $results = [];
-
-        $map = $this->directory_map($folder, 2);
-
-        $map = $this->flattenMap($map);
-
-        // Make sure we have something to work with.
-        if (! is_array($map) || (is_array($map) && ! count($map))) {
-            return [];
-        }
-
-        // Loop over each file and search the contents for our term.
-        foreach ($map as $dir => $file) {
-            $file_count = 0;
-
-            if (in_array($file, $this->skip_files)) {
-                continue;
-            }
-
-            // Is it a folder?
-            if (is_array($file) && count($file)) {
-                $results = array_merge($results, $this->searchFolder($term, $folder . '/' . $dir, $group_name));
-                continue;
-            }
-
-            // Make sure it's the right file type...
-            if (! preg_match("/({$this->allowed_file_types})/i", $file)) {
-                continue;
-            }
-
-            $path = is_string($dir) ? $folder . '/' . $dir . '/' . $file : $folder . '/' . $file;
-            $term_html = htmlentities($term);
-
-            // Read in the file text
-            $handle = fopen($path, 'r');
-            $text = fread($handle, $this->byte_size);
-
-            // Do we have a match in here somewhere?
-            $found = stristr($text, $term) || stristr($text, $term_html);
-
-            if (! $found) {
-                continue;
-            }
-
-            // Escape our terms to safely use in a preg_match
-            $excerpt = strip_tags($text);
-            $term = preg_quote($term);
-            $term = str_replace("/", "\/", "{$term}");
-            $term_html = preg_quote($term_html);
-            $term_html = str_replace("/", "\/", "{$term_html}");
-
-            // Add the item to our results with extracts.
-            if (preg_match_all(
-                "/((\s\S*){0,3})($term|$term_html)((\s?\S*){0,3})/i",
-                $excerpt,
-                $matches,
-                PREG_OFFSET_CAPTURE | PREG_SET_ORDER
-            )) {
-                foreach ($matches as $match) {
-                    if ($file_count >= $this->max_per_file) {
-                        continue;
-                    }
-                    $result_url = '/docs/' . $group_name . '/' . str_replace('.md', '', $file);
-
-                    foreach ($this->doc_folders as $alias => $folder) {
-                        $result_url = str_replace($folder, $alias, $result_url);
-                    }
-
-                    $results[] = [
-                        'title' => $this->extractTitle($excerpt, $file),
-                        'file' => $folder . '/' . $file,
-                        'url' => $result_url,
-                        'extract' => $this->buildExtract($excerpt, $term, $match[0][0])
-                    ];
-
-                    $file_count++;
-                }
-            }
-        }
-
-        return $results;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Stores the name of the callback method to run to convert the source
-     * files to viewable files. By default, this should be used to register
-     * a Mardown Extended formatter with the system, but could be used to
-     * extend the
-     *
-     * @param string $callback_name
-     * @param bool $cascade // If FALSE the formatting of a component ends here. If TRUE, will be passed to next formatter.
-     * @return $this
-     */
-    public function registerFormatter($callback_name = '', $cascade = false)
-    {
-        if (empty($callback_name)) return;
-
-        $this->formatters[] = array($callback_name => $cascade);
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Runs the text through the registered formatters.
-     *
-     * @param $str
-     * @return mixed
-     */
-    public function format($str)
-    {
-        if (! is_array($this->formatters)) return $str;
-
-        foreach ($this->formatters as $formatter) {
-            $method = key($formatter);
-            $cascade = $formatter[$method];
-
-            $str = call_user_func($method, $str);
-
-            if (! $cascade) return $str;
-        }
-
-        return $str;
-    }
-
-    //--------------------------------------------------------------------
-
-
-    //--------------------------------------------------------------------
-    // Protected Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Converts an array generated by directory_map into a flat array of
-     * folders, removing any nested folders and adding them to the path.
-     *
-     * @param $map
-     * @param $prefix   Used to recursively add the folder name...
-     * @return mixed
-     */
-    protected function flattenMap($map, $prefix = '')
-    {
-        if (! is_array($map) || ! count($map)) {
-            return $map;
-        }
-
-        $return = [];
-
-        foreach ($map as $folder => $files) {
-
-            // If it's a folder name and an array of files
-            // then call this method recursively to flatten it out.
-            if (is_array($files)) {
-                $return = array_merge($return, $this->flattenMap($files, $prefix . $folder));
-                continue;
-            }
-
-            // Else, add our prefix (if any) to the filename...
-            $return[] = $prefix . $files;
-        }
-
-        return $return;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Handles extracting the text surrounding our match and basic match formatting.
-     *
-     * @param $excerpt
-     * @param $term
-     * @param $match_string
-     *
-     * @return string
-     */
-    protected function buildExtract($excerpt, $term, $match_string)
-    {
-        // Find the character positions within the string that our match was found at.
-        // That way we'll know from what positions before and after this we want to grab it in.
-        $start_offset = stripos($excerpt, $match_string);
-
-        // Modify the start and end positions based on $this->excerpt_length / 2.
-        $buffer = floor($this->excerpt_length / 2);
-
-        // Adjust our start position
-        $start_offset = $start_offset - $buffer;
-        if ($start_offset < 0) {
-            $start_offset = 0;
-        }
-
-        $extract = substr($excerpt, $start_offset);
-
-        $extract = strip_tags($this->format($extract));
-
-        $extract = $this->firstXWords($extract, $this->excerpt_length);
-
-        // Wrap the search term in a span we can style.
-        $extract = str_ireplace($term, '<span class="term-hilight">' . $term . '</span>', $extract);
-
-        return $extract;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Extracts the title from a bit of markdown formatted text. If it doesn't
-     * have an h1 or h2, then it uses the filename.
-     *
-     * @param $excerpt
-     * @param $file
-     * @return string
-     */
-    protected function extractTitle($excerpt, $file)
-    {
-        $title = '';
-
-        // Easiest to work if this is split into lines.
-        $lines = explode("\n", $excerpt);
-
-        if (is_array($lines) && count($lines)) {
-            foreach ($lines as $line) {
-                if (strpos($line, '# ') === 0 || strpos($line, '## ') === 0) {
-                    $title = trim(str_replace('#', '', $line));
-                    break;
-                }
-            }
-        }
-
-        // If it's empty, we'll use the filename.
-        if (empty($title)) {
-            $title = str_replace('_', ' ', $file);
-            $title = str_replace('.md', ' ', $title);
-            $title = ucwords($title);
-        }
-
-        return $title;
-    }
-    //--------------------------------------------------------------------
-
-    /**
-     * Create a Directory Map
-     *
-     * Reads the specified directory and builds an array
-     * representation of it. Sub-folders contained with the
-     * directory will be mapped as well.
-     *
-     * @param    string $source_dir Path to source
-     * @param    int $directory_depth Depth of directories to traverse
-     *                        (0 = fully recursive, 1 = current dir, etc)
-     * @param    bool $hidden Whether to show hidden files
-     * @return    array
-     */
-    protected function directory_map($source_dir, $directory_depth = 0, $hidden = FALSE)
-    {
-        if ($fp = @opendir($source_dir)) {
-            $filedata = array();
-            $new_depth = $directory_depth - 1;
-            $source_dir = rtrim($source_dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
-
-            while (FALSE !== ($file = readdir($fp))) {
-                // Remove '.', '..', and hidden files [optional]
-                if ($file === '.' OR $file === '..' OR ($hidden === FALSE && $file[0] === '.')) {
-                    continue;
-                }
-
-                is_dir($source_dir . $file) && $file .= DIRECTORY_SEPARATOR;
-
-                if (($directory_depth < 1 OR $new_depth > 0) && is_dir($source_dir . $file))
-                {
-                    $filedata[$file] = $this->directory_map($source_dir . $file, $new_depth, $hidden);
-                } else
-                {
-                    // Replace the directory separator here with a forward slash since
-                    // Windows uses backward slashes and not all browsers will auto-replace
-                    // those slashes in URLs.
-                    $filedata[] = str_replace(DIRECTORY_SEPARATOR, '/', $file);
-                }
-            }
-
-            closedir($fp);
-            return $filedata;
-        }
-
-        return FALSE;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Gets the first 'X' words of a string.
-     *
-     * @param $str
-     * @param int $wordCount
-     * @return string
-     */
-    protected function firstXWords($str, $wordCount = 10)
-    {
-        return implode(
-            '',
-            array_slice(
-                preg_split(
-                    '/([\s,\.;\?\!]+)/',
-                    $str,
-                    $wordCount * 2 + 1,
-                    PREG_SPLIT_DELIM_CAPTURE
-                ),
-                0,
-                $wordCount * 2 - 1
-            )
-        );
-    }
-
-    //--------------------------------------------------------------------
+	/**
+	 * Minimum characters that can be submitted for a search.
+	 *
+	 * @var int
+	 */
+	protected $min_chars = 3;
+
+	/**
+	 * Maximum characters that can be submitted for a search.
+	 *
+	 * @var int
+	 */
+	protected $max_chars = 30;
+
+	/**
+	 * Valid file extensions we can search in.
+	 *
+	 * @var string
+	 */
+	protected $allowed_file_types = 'html|htm|php|php4|php5|txt|md';
+
+	/**
+	 * Which files should we skip over during our search?
+	 *
+	 * @var array
+	 */
+	protected $skip_files = ['.', '..', '_404.md', '_toc.ini'];
+
+	/**
+	 * How much of each file should we read.
+	 * Use lower values for faster searches.
+	 *
+	 * @var int
+	 */
+	protected $byte_size = 51200;
+
+	/**
+	 * Number of words long (approximately)
+	 * the result excerpt should be.
+	 *
+	 * @var int
+	 */
+	protected $excerpt_length = 60;
+
+	/**
+	 * The maximum number of results allowed from a single file.
+	 *
+	 * @var int
+	 */
+	protected $max_per_file = 1;
+
+	protected $doc_folders = array();
+
+	protected $formatters = array();
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * The entry point for performing a search of the documentation.
+	 *
+	 * @param null $terms
+	 * @param array $folders
+	 *
+	 * @return array|null
+	 */
+	public function search($terms = null, $folders = [])
+	{
+		if (empty($terms) || empty($folders)) {
+			return null;
+		}
+
+		$results = [];
+		$this->doc_folders = $folders;
+
+		foreach ($folders as $group => $folder) {
+			$results = array_merge($results, $this->searchFolder($terms, $folder, $group));
+		}
+
+		return $results;
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Private Methods
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Searches a single directory worth of files.
+	 *
+	 * @param $term
+	 * @param $folder
+	 * @param $group_name
+	 *
+	 * @return array The results.
+	 */
+	protected function searchFolder($term, $folder, $group_name)
+	{
+		$results = [];
+
+		$map = $this->directory_map($folder, 2);
+
+		$map = $this->flattenMap($map);
+
+		// Make sure we have something to work with.
+		if (! is_array($map) || (is_array($map) && ! count($map))) {
+			return [];
+		}
+
+		// Loop over each file and search the contents for our term.
+		foreach ($map as $dir => $file) {
+			$file_count = 0;
+
+			if (in_array($file, $this->skip_files)) {
+				continue;
+			}
+
+			// Is it a folder?
+			if (is_array($file) && count($file)) {
+				$results = array_merge($results, $this->searchFolder($term, $folder . '/' . $dir, $group_name));
+				continue;
+			}
+
+			// Make sure it's the right file type...
+			if (! preg_match("/({$this->allowed_file_types})/i", $file)) {
+				continue;
+			}
+
+			$path = is_string($dir) ? $folder . '/' . $dir . '/' . $file : $folder . '/' . $file;
+			$term_html = htmlentities($term);
+
+			// Read in the file text
+			$handle = fopen($path, 'r');
+			$text = fread($handle, $this->byte_size);
+
+			// Do we have a match in here somewhere?
+			$found = stristr($text, $term) || stristr($text, $term_html);
+
+			if (! $found) {
+				continue;
+			}
+
+			// Escape our terms to safely use in a preg_match
+			$excerpt = strip_tags($text);
+			$term = preg_quote($term);
+			$term = str_replace("/", "\/", "{$term}");
+			$term_html = preg_quote($term_html);
+			$term_html = str_replace("/", "\/", "{$term_html}");
+
+			// Add the item to our results with extracts.
+			if (preg_match_all(
+				"/((\s\S*){0,3})($term|$term_html)((\s?\S*){0,3})/i",
+				$excerpt,
+				$matches,
+				PREG_OFFSET_CAPTURE | PREG_SET_ORDER
+			)) {
+				foreach ($matches as $match) {
+					if ($file_count >= $this->max_per_file) {
+						continue;
+					}
+					$result_url = '/docs/' . $group_name . '/' . str_replace('.md', '', $file);
+
+					foreach ($this->doc_folders as $alias => $folder) {
+						$result_url = str_replace($folder, $alias, $result_url);
+					}
+
+					$results[] = [
+						'title' => $this->extractTitle($excerpt, $file),
+						'file' => $folder . '/' . $file,
+						'url' => $result_url,
+						'extract' => $this->buildExtract($excerpt, $term, $match[0][0])
+					];
+
+					$file_count++;
+				}
+			}
+		}
+
+		return $results;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Stores the name of the callback method to run to convert the source
+	 * files to viewable files. By default, this should be used to register
+	 * a Mardown Extended formatter with the system, but could be used to
+	 * extend the
+	 *
+	 * @param string $callback_name
+	 * @param bool $cascade // If FALSE the formatting of a component ends here. If TRUE, will be passed to next formatter.
+	 * @return $this
+	 */
+	public function registerFormatter($callback_name = '', $cascade = false)
+	{
+		if (empty($callback_name)) return;
+
+		$this->formatters[] = array($callback_name => $cascade);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runs the text through the registered formatters.
+	 *
+	 * @param $str
+	 * @return mixed
+	 */
+	public function format($str)
+	{
+		if (! is_array($this->formatters)) return $str;
+
+		foreach ($this->formatters as $formatter) {
+			$method = key($formatter);
+			$cascade = $formatter[$method];
+
+			$str = call_user_func($method, $str);
+
+			if (! $cascade) return $str;
+		}
+
+		return $str;
+	}
+
+	//--------------------------------------------------------------------
+
+
+	//--------------------------------------------------------------------
+	// Protected Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Converts an array generated by directory_map into a flat array of
+	 * folders, removing any nested folders and adding them to the path.
+	 *
+	 * @param $map
+	 * @param $prefix   Used to recursively add the folder name...
+	 * @return mixed
+	 */
+	protected function flattenMap($map, $prefix = '')
+	{
+		if (! is_array($map) || ! count($map)) {
+			return $map;
+		}
+
+		$return = [];
+
+		foreach ($map as $folder => $files) {
+
+			// If it's a folder name and an array of files
+			// then call this method recursively to flatten it out.
+			if (is_array($files)) {
+				$return = array_merge($return, $this->flattenMap($files, $prefix . $folder));
+				continue;
+			}
+
+			// Else, add our prefix (if any) to the filename...
+			$return[] = $prefix . $files;
+		}
+
+		return $return;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Handles extracting the text surrounding our match and basic match formatting.
+	 *
+	 * @param $excerpt
+	 * @param $term
+	 * @param $match_string
+	 *
+	 * @return string
+	 */
+	protected function buildExtract($excerpt, $term, $match_string)
+	{
+		// Find the character positions within the string that our match was found at.
+		// That way we'll know from what positions before and after this we want to grab it in.
+		$start_offset = stripos($excerpt, $match_string);
+
+		// Modify the start and end positions based on $this->excerpt_length / 2.
+		$buffer = floor($this->excerpt_length / 2);
+
+		// Adjust our start position
+		$start_offset = $start_offset - $buffer;
+		if ($start_offset < 0) {
+			$start_offset = 0;
+		}
+
+		$extract = substr($excerpt, $start_offset);
+
+		$extract = strip_tags($this->format($extract));
+
+		$extract = $this->firstXWords($extract, $this->excerpt_length);
+
+		// Wrap the search term in a span we can style.
+		$extract = str_ireplace($term, '<span class="term-hilight">' . $term . '</span>', $extract);
+
+		return $extract;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Extracts the title from a bit of markdown formatted text. If it doesn't
+	 * have an h1 or h2, then it uses the filename.
+	 *
+	 * @param $excerpt
+	 * @param $file
+	 * @return string
+	 */
+	protected function extractTitle($excerpt, $file)
+	{
+		$title = '';
+
+		// Easiest to work if this is split into lines.
+		$lines = explode("\n", $excerpt);
+
+		if (is_array($lines) && count($lines)) {
+			foreach ($lines as $line) {
+				if (strpos($line, '# ') === 0 || strpos($line, '## ') === 0) {
+					$title = trim(str_replace('#', '', $line));
+					break;
+				}
+			}
+		}
+
+		// If it's empty, we'll use the filename.
+		if (empty($title)) {
+			$title = str_replace('_', ' ', $file);
+			$title = str_replace('.md', ' ', $title);
+			$title = ucwords($title);
+		}
+
+		return $title;
+	}
+	//--------------------------------------------------------------------
+
+	/**
+	 * Create a Directory Map
+	 *
+	 * Reads the specified directory and builds an array
+	 * representation of it. Sub-folders contained with the
+	 * directory will be mapped as well.
+	 *
+	 * @param    string $source_dir Path to source
+	 * @param    int $directory_depth Depth of directories to traverse
+	 *                        (0 = fully recursive, 1 = current dir, etc)
+	 * @param    bool $hidden Whether to show hidden files
+	 * @return    array
+	 */
+	protected function directory_map($source_dir, $directory_depth = 0, $hidden = FALSE)
+	{
+		if ($fp = @opendir($source_dir)) {
+			$filedata = array();
+			$new_depth = $directory_depth - 1;
+			$source_dir = rtrim($source_dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+
+			while (FALSE !== ($file = readdir($fp))) {
+				// Remove '.', '..', and hidden files [optional]
+				if ($file === '.' OR $file === '..' OR ($hidden === FALSE && $file[0] === '.')) {
+					continue;
+				}
+
+				is_dir($source_dir . $file) && $file .= DIRECTORY_SEPARATOR;
+
+				if (($directory_depth < 1 OR $new_depth > 0) && is_dir($source_dir . $file))
+				{
+					$filedata[$file] = $this->directory_map($source_dir . $file, $new_depth, $hidden);
+				} else
+				{
+					// Replace the directory separator here with a forward slash since
+					// Windows uses backward slashes and not all browsers will auto-replace
+					// those slashes in URLs.
+					$filedata[] = str_replace(DIRECTORY_SEPARATOR, '/', $file);
+				}
+			}
+
+			closedir($fp);
+			return $filedata;
+		}
+
+		return FALSE;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Gets the first 'X' words of a string.
+	 *
+	 * @param $str
+	 * @param int $wordCount
+	 * @return string
+	 */
+	protected function firstXWords($str, $wordCount = 10)
+	{
+		return implode(
+			'',
+			array_slice(
+				preg_split(
+					'/([\s,\.;\?\!]+)/',
+					$str,
+					$wordCount * 2 + 1,
+					PREG_SPLIT_DELIM_CAPTURE
+				),
+				0,
+				$wordCount * 2 - 1
+			)
+		);
+	}
+
+	//--------------------------------------------------------------------
 
 }

myth/Events/Events.php

Indentation +169 added lines, -169 removed lines

@@ -36,176 +36,176 @@
 
 class Events {
 
-    /**
-     * The list of listeners.
-     *
-     * @var array
-     */
-    protected static $listeners = [];
-
-    /**
-     * Flag to let us know if we've read from the config file
-     * and have all of the defined events.
-     *
-     * @var bool
-     */
-    protected static $have_read_from_file = false;
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Registers an action to happen on an event. The action can be any sort
-     * of callable:
-     *
-     *  Events::on('create', 'myFunction');               // procedural function
-     *  Events::on('create', ['myClass', 'myMethod']);    // Class::method
-     *  Events::on('create', [$myInstance, 'myMethod']);  // Method on an existing instance
-     *  Events::on('create', function() {});              // Closure
-     *
-     * @param $event_name
-     * @param callable $callback
-     * @param int $priority
-     */
-    public static function on($event_name, callable $callback, $priority=EVENTS_PRIORITY_NORMAL)
-    {
-        if (! isset(self::$listeners[$event_name]))
-        {
-            self::$listeners[$event_name] = [
-                true,   // If there's only 1 item, it's sorted.
-                [$priority],
-                [$callback]
-            ];
-        }
-        else
-        {
-            self::$listeners[$event_name][0] = false; // Not sorted
-            self::$listeners[$event_name][1][] = $priority;
-            self::$listeners[$event_name][2][] = $callback;
-        }
-    }
+	/**
+	 * The list of listeners.
+	 *
+	 * @var array
+	 */
+	protected static $listeners = [];
+
+	/**
+	 * Flag to let us know if we've read from the config file
+	 * and have all of the defined events.
+	 *
+	 * @var bool
+	 */
+	protected static $have_read_from_file = false;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Registers an action to happen on an event. The action can be any sort
+	 * of callable:
+	 *
+	 *  Events::on('create', 'myFunction');               // procedural function
+	 *  Events::on('create', ['myClass', 'myMethod']);    // Class::method
+	 *  Events::on('create', [$myInstance, 'myMethod']);  // Method on an existing instance
+	 *  Events::on('create', function() {});              // Closure
+	 *
+	 * @param $event_name
+	 * @param callable $callback
+	 * @param int $priority
+	 */
+	public static function on($event_name, callable $callback, $priority=EVENTS_PRIORITY_NORMAL)
+	{
+		if (! isset(self::$listeners[$event_name]))
+		{
+			self::$listeners[$event_name] = [
+				true,   // If there's only 1 item, it's sorted.
+				[$priority],
+				[$callback]
+			];
+		}
+		else
+		{
+			self::$listeners[$event_name][0] = false; // Not sorted
+			self::$listeners[$event_name][1][] = $priority;
+			self::$listeners[$event_name][2][] = $callback;
+		}
+	}
     
-    //--------------------------------------------------------------------
-
-    /**
-     * Runs through all subscribed methods running them one at a time,
-     * until either:
-     *  a) All subscribers have finished or
-     *  b) a method returns false, at which point execution of subscribers stops.
-     *
-     * @param $event_name
-     * @return bool
-     */
-    public static function trigger($event_name, array $arguments = [])
-    {
-        // Read in our config/events file so that we have them all!
-        if (! self::$have_read_from_file)
-        {
-            if (is_file(APPPATH .'config/events.php'))
-            {
-                include APPPATH .'config/events.php';
-            }
-            self::$have_read_from_file = true;
-        }
-
-        foreach (self::listeners($event_name) as $listener)
-        {
-            $result = call_user_func_array($listener, $arguments);
-
-            if ($result === false)
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
+	//--------------------------------------------------------------------
+
+	/**
+	 * Runs through all subscribed methods running them one at a time,
+	 * until either:
+	 *  a) All subscribers have finished or
+	 *  b) a method returns false, at which point execution of subscribers stops.
+	 *
+	 * @param $event_name
+	 * @return bool
+	 */
+	public static function trigger($event_name, array $arguments = [])
+	{
+		// Read in our config/events file so that we have them all!
+		if (! self::$have_read_from_file)
+		{
+			if (is_file(APPPATH .'config/events.php'))
+			{
+				include APPPATH .'config/events.php';
+			}
+			self::$have_read_from_file = true;
+		}
+
+		foreach (self::listeners($event_name) as $listener)
+		{
+			$result = call_user_func_array($listener, $arguments);
+
+			if ($result === false)
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
     
-    //--------------------------------------------------------------------
-
-    /**
-     * Returns an array of listeners for a single event. They are
-     * sorted by priority.
-     *
-     * If the listener could not be found, returns FALSE, or TRUE if
-     * it was removed.
-     *
-     * @param $event_name
-     * @return array
-     */
-    public static function listeners($event_name)
-    {
-        if (! isset(self::$listeners[$event_name]))
-        {
-            return [];
-        }
-
-        // The list is not sorted
-        if (! self::$listeners[$event_name][0])
-        {
-            // Sort it!
-            array_multisort(self::$listeners[$event_name][1], SORT_NUMERIC, self::$listeners[$event_name][2]);
-
-            // Mark it as sorted already!
-            self::$listeners[$event_name][0] = true;
-        }
-
-        return self::$listeners[$event_name][2];
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Removes a single listener from an event.
-     *
-     * If the listener couldn't be found, returns FALSE, else TRUE if
-     * it was removed.
-     *
-     * @param $event_name
-     * @param callable $listener
-     * @return bool
-     */
-    public static function removeListener($event_name, callable $listener)
-    {
-        if (! isset(self::$listeners[$event_name]))
-        {
-            return false;
-        }
-
-        foreach (self::$listeners[$event_name][2] as $index => $check)
-        {
-            if ($check === $listener)
-            {
-                unset(self::$listeners[$event_name][1][$index]);
-                unset(self::$listeners[$event_name][2][$index]);
-
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Removes all listeners.
-     *
-     * If the event_name is specified, only listeners for that event will be
-     * removed, otherwise all listeners for all events are removed.
-     *
-     * @param null $event_name
-     */
-    public static function removeAllListeners($event_name=null)
-    {
-        if (! is_null($event_name))
-        {
-            unset(self::$listeners[$event_name]);
-        }
-        else {
-            self::$listeners = [];
-        }
-    }
-
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array of listeners for a single event. They are
+	 * sorted by priority.
+	 *
+	 * If the listener could not be found, returns FALSE, or TRUE if
+	 * it was removed.
+	 *
+	 * @param $event_name
+	 * @return array
+	 */
+	public static function listeners($event_name)
+	{
+		if (! isset(self::$listeners[$event_name]))
+		{
+			return [];
+		}
+
+		// The list is not sorted
+		if (! self::$listeners[$event_name][0])
+		{
+			// Sort it!
+			array_multisort(self::$listeners[$event_name][1], SORT_NUMERIC, self::$listeners[$event_name][2]);
+
+			// Mark it as sorted already!
+			self::$listeners[$event_name][0] = true;
+		}
+
+		return self::$listeners[$event_name][2];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a single listener from an event.
+	 *
+	 * If the listener couldn't be found, returns FALSE, else TRUE if
+	 * it was removed.
+	 *
+	 * @param $event_name
+	 * @param callable $listener
+	 * @return bool
+	 */
+	public static function removeListener($event_name, callable $listener)
+	{
+		if (! isset(self::$listeners[$event_name]))
+		{
+			return false;
+		}
+
+		foreach (self::$listeners[$event_name][2] as $index => $check)
+		{
+			if ($check === $listener)
+			{
+				unset(self::$listeners[$event_name][1][$index]);
+				unset(self::$listeners[$event_name][2][$index]);
+
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes all listeners.
+	 *
+	 * If the event_name is specified, only listeners for that event will be
+	 * removed, otherwise all listeners for all events are removed.
+	 *
+	 * @param null $event_name
+	 */
+	public static function removeAllListeners($event_name=null)
+	{
+		if (! is_null($event_name))
+		{
+			unset(self::$listeners[$event_name]);
+		}
+		else {
+			self::$listeners = [];
+		}
+	}
+
+	//--------------------------------------------------------------------
 
 }

myth/Forensics/Console.php

Indentation +5 added lines, -5 removed lines

@@ -167,11 +167,11 @@
 
 	public function reset()
 	{
-	    self::$logs = array(
-		    'console'		=> array(),
-		    'log_count'		=> 0,
-		    'memory_count'	=> 0,
-	    );
+		self::$logs = array(
+			'console'		=> array(),
+			'log_count'		=> 0,
+			'memory_count'	=> 0,
+		);
 	}
 
 	//--------------------------------------------------------------------

myth/Forensics/Profiler.php

Indentation +5 added lines, -5 removed lines

@@ -531,16 +531,16 @@
 
 
 	public static function get_file_size($size, $retstring = null) {
-        // adapted from code at http://aidanlister.com/repos/v/function.size_readable.php
-	    $sizes = array('bytes', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
+		// adapted from code at http://aidanlister.com/repos/v/function.size_readable.php
+		$sizes = array('bytes', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
 
-	    if ($retstring === null) { $retstring = '%01.2f %s'; }
+		if ($retstring === null) { $retstring = '%01.2f %s'; }
 
 		$lastsizestring = end($sizes);
 
 		foreach ($sizes as $sizestring) {
-	       	if ($size < 1024) { break; }
-	           if ($sizestring != $lastsizestring) { $size /= 1024; }
+		   	if ($size < 1024) { break; }
+			   if ($sizestring != $lastsizestring) { $size /= 1024; }
 		}
 
 		if ($sizestring == $sizes[0]) { $retstring = '%01d %s'; } // Bytes aren't normally fractional

myth/Forge/BaseGenerator.php

Indentation +441 added lines, -441 removed lines

@@ -1,34 +1,34 @@ 
 <?php namespace Myth\Forge;
 /**
- * Sprint
- *
- * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package     Sprint
- * @author      Lonnie Ezell
- * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
- * @license     http://opensource.org/licenses/MIT  (MIT)
- * @link        http://sprintphp.com
- * @since       Version 1.0
- */
+	 * Sprint
+	 *
+	 * A set of power tools to enhance the CodeIgniter framework and provide consistent workflow.
+	 *
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
+	 * of this software and associated documentation files (the "Software"), to deal
+	 * in the Software without restriction, including without limitation the rights
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the Software is
+	 * furnished to do so, subject to the following conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be included in
+	 * all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	 * THE SOFTWARE.
+	 *
+	 * @package     Sprint
+	 * @author      Lonnie Ezell
+	 * @copyright   Copyright 2014-2015, New Myth Media, LLC (http://newmythmedia.com)
+	 * @license     http://opensource.org/licenses/MIT  (MIT)
+	 * @link        http://sprintphp.com
+	 * @since       Version 1.0
+	 */
 
 use Myth\Controllers\CLIController;
 use Myth\CLI;
@@ -43,13 +43,13 @@ 
  */
 abstract class BaseGenerator extends CLIController {
 
-    /**
-     * Instance of the active themer.
-     * @var null
-     */
-    protected $themer = null;
+	/**
+	 * Instance of the active themer.
+	 * @var null
+	 */
+	protected $themer = null;
 
-    protected $gen_path = null;
+	protected $gen_path = null;
 
 	/**
 	 * The name of the module being used, if any.
@@ -62,254 +62,254 @@ 
 
 	protected $overwrite = false;
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    public function __construct()
-    {
-        parent::__construct();
+	public function __construct()
+	{
+		parent::__construct();
 
-        $this->load->config('forge');
+		$this->load->config('forge');
 
-	    // Detect if we're genning in a module
-	    if ($module = CLI::option('module'))
-	    {
-		    $this->module = $module;
+		// Detect if we're genning in a module
+		if ($module = CLI::option('module'))
+		{
+			$this->module = $module;
 
-		    $folders = config_item('modules_locations');
+			$folders = config_item('modules_locations');
 
-		    if (is_array($folders))
-		    {
-			    $this->module_path = $folders[0] . strtolower($module) .'/';
-		    }
+			if (is_array($folders))
+			{
+				$this->module_path = $folders[0] . strtolower($module) .'/';
+			}
 		}
 
-	    // Should we overwrite files?
-	    if (CLI::option('overwrite'))
-	    {
-		    $this->overwrite = true;
-	    }
-    }
+		// Should we overwrite files?
+		if (CLI::option('overwrite'))
+		{
+			$this->overwrite = true;
+		}
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 
-    /**
-     * The method called by the main generator script. This must be
-     * overridden by child classes to implement the actual logic used.
-     *
-     * @param array $segments
-     * @param bool  $quiet      If true, models should accept default values.
-     * @return mixed
-     */
-    abstract function run($segments=[], $quiet=false);
+	/**
+	 * The method called by the main generator script. This must be
+	 * overridden by child classes to implement the actual logic used.
+	 *
+	 * @param array $segments
+	 * @param bool  $quiet      If true, models should accept default values.
+	 * @return mixed
+	 */
+	abstract function run($segments=[], $quiet=false);
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 
-    /**
-     * Creates a file at the specified path with the given contents.
-     *
-     * @param $path
-     * @param null $contents
-     *
-     * @return bool
-     */
-    public function createFile($path, $contents=null, $overwrite=false, $perms=0644)
-    {
-	    $path = $this->sandbox($path);
+	/**
+	 * Creates a file at the specified path with the given contents.
+	 *
+	 * @param $path
+	 * @param null $contents
+	 *
+	 * @return bool
+	 */
+	public function createFile($path, $contents=null, $overwrite=false, $perms=0644)
+	{
+		$path = $this->sandbox($path);
 
-	    $file_exists = is_file($path);
+		$file_exists = is_file($path);
 
-        // Does file already exist?
-        if ($file_exists)
-        {
-	        if (! $overwrite) {
-		        CLI::write( CLI::color("\t". strtolower(lang('exists')) .": ", 'blue') . str_replace(APPPATH, '', $path ) );
-		        return true;
-	        }
+		// Does file already exist?
+		if ($file_exists)
+		{
+			if (! $overwrite) {
+				CLI::write( CLI::color("\t". strtolower(lang('exists')) .": ", 'blue') . str_replace(APPPATH, '', $path ) );
+				return true;
+			}
 
-	        unlink($path);
-        }
+			unlink($path);
+		}
 
-	    // Do we need to create the directory?
-	    $segments = explode('/', $path);
+		// Do we need to create the directory?
+		$segments = explode('/', $path);
 		array_pop($segments);
 		$folder = implode('/', $segments);
 
-	    if (! is_dir($folder))
-	    {
-		    $this->createDirectory($folder);
-	    }
+		if (! is_dir($folder))
+		{
+			$this->createDirectory($folder);
+		}
 
-        get_instance()->load->helper('file');
+		get_instance()->load->helper('file');
 
-        if (! write_file($path, $contents))
-        {
-            throw new \RuntimeException( sprintf( lang('errors.writing_file'),  $path) );
-        }
+		if (! write_file($path, $contents))
+		{
+			throw new \RuntimeException( sprintf( lang('errors.writing_file'),  $path) );
+		}
 
-        chmod($path, $perms);
+		chmod($path, $perms);
 
-	    if ($overwrite && $file_exists)
-	    {
-		    CLI::write( CLI::color("\t". strtolower( lang('overwrote') ) ." ", 'light_red') . str_replace(APPPATH, '', $path ) );
-	    }
-	    else
-	    {
-		    CLI::write( CLI::color("\t". strtolower( lang('created') ) ." ", 'yellow') . str_replace(APPPATH, '', $path ) );
-	    }
+		if ($overwrite && $file_exists)
+		{
+			CLI::write( CLI::color("\t". strtolower( lang('overwrote') ) ." ", 'light_red') . str_replace(APPPATH, '', $path ) );
+		}
+		else
+		{
+			CLI::write( CLI::color("\t". strtolower( lang('created') ) ." ", 'yellow') . str_replace(APPPATH, '', $path ) );
+		}
 
-        return $this;
-    }
+		return $this;
+	}
     
-    //--------------------------------------------------------------------
-
-    /**
-     * Creates a new directory at the specified path.
-     *
-     * @param $path
-     * @param int|string $perms
-     *
-     * @return bool
-     */
-    public function createDirectory($path, $perms=0755)
-    {
-	    $path = $this->sandbox($path);
-
-        if (is_dir($path))
-        {
-            return $this;
-        }
-
-        if (! mkdir($path, $perms, true) )
-        {
-            throw new \RuntimeException( sprintf( lang('errors.creating_dir'), $path) );
-        }
-
-        return $this;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Copies a file from the current template group to the destination.
-     *
-     * @param $source
-     * @param $destination
-     * @param bool $overwrite
-     *
-     * @return bool
-     */
-    public function copyFile($source, $destination, $overwrite=false)
-    {
-	    $source = $this->sandbox($source);
-
-	    if (! file_exists($source))
-	    {
-		    return null;
-	    }
-
-	    $content = file_get_contents($source);
-
-	    return $this->createFile($destination, $content, $overwrite);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Attempts to locate a template within the current template group,
-     * parses it with the passed in data, and writes to the new location.
-     *
-     * @param $template
-     * @param $destination
-     * @param array $data
-     * @param bool $overwrite
-     *
-     * @return $this
-     */
-    public function copyTemplate($template, $destination, $data=[], $overwrite=false)
-    {
-	    if (! is_array($data))
-	    {
-		    $data = array($data);
-	    }
-
-        $content = $this->render($template, $data);
-
-        return $this->createFile($destination, $content, $overwrite);
-    }
-
-    //--------------------------------------------------------------------
-
-
-    /**
-     * Injects a block of code into an existing file. Using options
-     * you can specify where the code should be inserted. Available options
-     * are:
-     *      prepend         - Place at beginning of file
-     *      append          - Place at end of file
-     *      before  => ''   - Insert just prior to this line of text (don't forget the line ending "\n")
-     *      after   => ''   - Insert just after this line of text (don't forget the line ending "\n")
-     *      replace => ''   - a simple string to be replaced. All locations will be replaced.
-     *      regex   => ''   - a pregex pattern to use to replace all locations.
-     *
-     * @param $path
-     * @param $content
-     * @param array $options
-     *
-     * @return $this
-     */
-    public function injectIntoFile($path, $content, $options='append')
-    {
-        $kit = new FileKit();
-
-        if (is_string($options))
-        {
-            $action = $options;
-        }
-        else if (is_array($options) && count($options))
-        {
-            $keys = array_keys($options);
-            $action = array_shift( $keys );
-            $param = $options[$action];
-        }
-
-        switch ( strtolower($action) )
-        {
-            case 'prepend':
-                $success = $kit->prepend($path, $content);
-                break;
-            case 'before':
-                $success = $kit->before($path, $param, $content);
-                break;
-            case 'after':
-                $success = $kit->after($path, $param, $content);
-                break;
-            case 'replace':
-                $success = $kit->replaceIn($path, $param, $content);
-                break;
-            case 'regex':
-                $success = $kit->replaceWithRegex($path, $param, $content);
-                break;
-            case 'append':
-            default:
-                $success = $kit->append($path, $content);
-                break;
-        }
-
-        if ($success)
-        {
-            CLI::write( CLI::color("\t". strtolower( lang('modified') ) ." ", 'cyan') . str_replace(APPPATH, '', $path ) );
-        }
-        else
-        {
-            CLI::write( CLI::color("\t". strtolower( lang('error') ) ." ", 'light_red') . str_replace(APPPATH, '', $path ) );
-        }
-
-        return $this;
-    }
+	//--------------------------------------------------------------------
+
+	/**
+	 * Creates a new directory at the specified path.
+	 *
+	 * @param $path
+	 * @param int|string $perms
+	 *
+	 * @return bool
+	 */
+	public function createDirectory($path, $perms=0755)
+	{
+		$path = $this->sandbox($path);
+
+		if (is_dir($path))
+		{
+			return $this;
+		}
+
+		if (! mkdir($path, $perms, true) )
+		{
+			throw new \RuntimeException( sprintf( lang('errors.creating_dir'), $path) );
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Copies a file from the current template group to the destination.
+	 *
+	 * @param $source
+	 * @param $destination
+	 * @param bool $overwrite
+	 *
+	 * @return bool
+	 */
+	public function copyFile($source, $destination, $overwrite=false)
+	{
+		$source = $this->sandbox($source);
+
+		if (! file_exists($source))
+		{
+			return null;
+		}
+
+		$content = file_get_contents($source);
+
+		return $this->createFile($destination, $content, $overwrite);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Attempts to locate a template within the current template group,
+	 * parses it with the passed in data, and writes to the new location.
+	 *
+	 * @param $template
+	 * @param $destination
+	 * @param array $data
+	 * @param bool $overwrite
+	 *
+	 * @return $this
+	 */
+	public function copyTemplate($template, $destination, $data=[], $overwrite=false)
+	{
+		if (! is_array($data))
+		{
+			$data = array($data);
+		}
+
+		$content = $this->render($template, $data);
+
+		return $this->createFile($destination, $content, $overwrite);
+	}
+
+	//--------------------------------------------------------------------
+
+
+	/**
+	 * Injects a block of code into an existing file. Using options
+	 * you can specify where the code should be inserted. Available options
+	 * are:
+	 *      prepend         - Place at beginning of file
+	 *      append          - Place at end of file
+	 *      before  => ''   - Insert just prior to this line of text (don't forget the line ending "\n")
+	 *      after   => ''   - Insert just after this line of text (don't forget the line ending "\n")
+	 *      replace => ''   - a simple string to be replaced. All locations will be replaced.
+	 *      regex   => ''   - a pregex pattern to use to replace all locations.
+	 *
+	 * @param $path
+	 * @param $content
+	 * @param array $options
+	 *
+	 * @return $this
+	 */
+	public function injectIntoFile($path, $content, $options='append')
+	{
+		$kit = new FileKit();
+
+		if (is_string($options))
+		{
+			$action = $options;
+		}
+		else if (is_array($options) && count($options))
+		{
+			$keys = array_keys($options);
+			$action = array_shift( $keys );
+			$param = $options[$action];
+		}
+
+		switch ( strtolower($action) )
+		{
+			case 'prepend':
+				$success = $kit->prepend($path, $content);
+				break;
+			case 'before':
+				$success = $kit->before($path, $param, $content);
+				break;
+			case 'after':
+				$success = $kit->after($path, $param, $content);
+				break;
+			case 'replace':
+				$success = $kit->replaceIn($path, $param, $content);
+				break;
+			case 'regex':
+				$success = $kit->replaceWithRegex($path, $param, $content);
+				break;
+			case 'append':
+			default:
+				$success = $kit->append($path, $content);
+				break;
+		}
+
+		if ($success)
+		{
+			CLI::write( CLI::color("\t". strtolower( lang('modified') ) ." ", 'cyan') . str_replace(APPPATH, '', $path ) );
+		}
+		else
+		{
+			CLI::write( CLI::color("\t". strtolower( lang('error') ) ." ", 'light_red') . str_replace(APPPATH, '', $path ) );
+		}
+
+		return $this;
+	}
     
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 	/**
 	 * Runs another generator. The first parameter is the name of the
@@ -320,130 +320,130 @@ 
 	 * @param $command
 	 * @param null $options
 	 */
-    public function generate($command, $options = '', $quiet=false)
-    {
+	public function generate($command, $options = '', $quiet=false)
+	{
 		$orig_options = CLI::optionString();
-	    $options = $orig_options .' '. $options;
-
-	    if ($quiet === true)
-	    {
-		    $options .= ' -quiet';
-	    }
-
-	    if ($this->overwrite === true)
-	    {
-		    $options .= ' -overwrite';
-	    }
-
-	    passthru( "php sprint forge {$command} {$options}" );
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds a new route to the application's route file.
-     *
-     * @param $left
-     * @param $right
-     *
-     * @return \Myth\Forge\BaseGenerator
-     */
-    public function route($left, $right, $options=[], $method='any')
-    {
-        $option_str = '[';
-
-        foreach ($options as $key => $value)
-        {
-            $option_str .= "";
-        }
-
-        $option_str .= ']';
-
-        $content = "\$routes->{$method}('{$left}', '{$right}', {$option_str});\n";
-
-        return $this->injectIntoFile(APPPATH .'config/routes.php', $content, ['after' => "// Auto-generated routes go here\n"]);
-    }
+		$options = $orig_options .' '. $options;
+
+		if ($quiet === true)
+		{
+			$options .= ' -quiet';
+		}
+
+		if ($this->overwrite === true)
+		{
+			$options .= ' -overwrite';
+		}
+
+		passthru( "php sprint forge {$command} {$options}" );
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds a new route to the application's route file.
+	 *
+	 * @param $left
+	 * @param $right
+	 *
+	 * @return \Myth\Forge\BaseGenerator
+	 */
+	public function route($left, $right, $options=[], $method='any')
+	{
+		$option_str = '[';
+
+		foreach ($options as $key => $value)
+		{
+			$option_str .= "";
+		}
+
+		$option_str .= ']';
+
+		$content = "\$routes->{$method}('{$left}', '{$right}', {$option_str});\n";
+
+		return $this->injectIntoFile(APPPATH .'config/routes.php', $content, ['after' => "// Auto-generated routes go here\n"]);
+	}
     
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Outputs the contents of the file in the template's source path.
-     */
-    public function readme($file='readme.txt')
-    {
-	    $name = str_replace('Generator', '', get_class($this));
+	/**
+	 * Outputs the contents of the file in the template's source path.
+	 */
+	public function readme($file='readme.txt')
+	{
+		$name = str_replace('Generator', '', get_class($this));
 
-	    $path = $this->locateGenerator($name);
+		$path = $this->locateGenerator($name);
 
-        if (! file_exists($path . $file))
-        {
-            CLI::error(sprintf( lang('forge.cant_find_readme'), $file) );
-        }
+		if (! file_exists($path . $file))
+		{
+			CLI::error(sprintf( lang('forge.cant_find_readme'), $file) );
+		}
 
-	    $contents = file_get_contents($path . $file);
+		$contents = file_get_contents($path . $file);
 
-        CLI::new_line(2);
-        CLI::write( CLI::wrap($contents), 'green' );
-        CLI::new_line();
-    }
+		CLI::new_line(2);
+		CLI::write( CLI::wrap($contents), 'green' );
+		CLI::new_line();
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
-    /**
-     * Renders a single generator template. The file must be in a folder
-     * under the template group named the same as $this->generator_name.
-     * The file must have a '.tpl.php' file extension.
-     *
-     * @param $template_name
-     * @param array $data
-     *
-     * @return string The rendered template
-     */
-    public function render($template_name, $data=[], $folder=null)
-    {
-        if (empty($this->themer))
-        {
-            $this->setupThemer();
-        }
+	/**
+	 * Renders a single generator template. The file must be in a folder
+	 * under the template group named the same as $this->generator_name.
+	 * The file must have a '.tpl.php' file extension.
+	 *
+	 * @param $template_name
+	 * @param array $data
+	 *
+	 * @return string The rendered template
+	 */
+	public function render($template_name, $data=[], $folder=null)
+	{
+		if (empty($this->themer))
+		{
+			$this->setupThemer();
+		}
 
-	    $data['uikit'] = $this->loadUIKit();
+		$data['uikit'] = $this->loadUIKit();
 
-        $output = null;
+		$output = null;
 
-	    $view = $template_name .'.tpl';
+		$view = $template_name .'.tpl';
 
-        $groups = config_item('forge.collections');
+		$groups = config_item('forge.collections');
 
-	    $name = str_replace('Generator', '', get_class($this) );
+		$name = str_replace('Generator', '', get_class($this) );
 
-        foreach ($groups as $group => $path)
-        {
-	        $path = rtrim($path, '/ ') .'/';
-	        $folders = scandir($path);
+		foreach ($groups as $group => $path)
+		{
+			$path = rtrim($path, '/ ') .'/';
+			$folders = scandir($path);
 
-	        if (! $i = array_search(ucfirst($name), $folders))
-	        {
-		        continue;
-	        }
+			if (! $i = array_search(ucfirst($name), $folders))
+			{
+				continue;
+			}
 
-	        $view = $folders[$i] . '/'. $view;
+			$view = $folders[$i] . '/'. $view;
 
-            if (realpath($path . $view .'.php'))
-            {
-                $output = $this->themer->display($group .':'. $view, $data);
-                break;
-            }
-        }
+			if (realpath($path . $view .'.php'))
+			{
+				$output = $this->themer->display($group .':'. $view, $data);
+				break;
+			}
+		}
 
-	    // To allow for including any PHP code in the templates,
-	    // replace any '@php' and '@=' tags with their correct PHP syntax.
-	    $output = str_replace('@php', '<?php', $output);
-	    $output = str_replace('@=', '<?=', $output);
+		// To allow for including any PHP code in the templates,
+		// replace any '@php' and '@=' tags with their correct PHP syntax.
+		$output = str_replace('@php', '<?php', $output);
+		$output = str_replace('@=', '<?=', $output);
 
-        return $output;
-    }
+		return $output;
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 	/**
 	 * Forces a path to exist within the current application's folder.
@@ -458,7 +458,7 @@ 
 	 */
 	public function sandbox($path)
 	{
-        $path = $this->normalizePath($path);
+		$path = $this->normalizePath($path);
 
 		// If it's writing to BASEPATH - FIX IT
 		if (strpos($path, $this->normalizePath(BASEPATH) ) === 0)
@@ -478,37 +478,37 @@ 
 			return $path;
 		}
 
-	    return APPPATH . $path;
+		return APPPATH . $path;
 	}
 
 	//--------------------------------------------------------------------
 
 
 
-    //--------------------------------------------------------------------
-    // Private Methods
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
+	// Private Methods
+	//--------------------------------------------------------------------
 
-    protected function setupThemer()
-    {
-        $themer_name = config_item('forge.themer');
+	protected function setupThemer()
+	{
+		$themer_name = config_item('forge.themer');
 
-        if (! $themer_name)
-        {
-            throw new \RuntimeException( lang('forge.no_themer') );
-        }
+		if (! $themer_name)
+		{
+			throw new \RuntimeException( lang('forge.no_themer') );
+		}
 
-        $this->themer = new $themer_name( get_instance() );
+		$this->themer = new $themer_name( get_instance() );
 
-        // Register our paths with the themer
-        $paths = config_item('forge.collections');
+		// Register our paths with the themer
+		$paths = config_item('forge.collections');
 
-        foreach ($paths as $key => $path) {
-            $this->themer->addThemePath($key, $path);
-        }
-    }
+		foreach ($paths as $key => $path) {
+			$this->themer->addThemePath($key, $path);
+		}
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 	public function loadUIKit()
 	{
@@ -521,7 +521,7 @@ 
 
 		$uikit = new $kit_name();
 
-	    return $uikit;
+		return $uikit;
 	}
 
 	//--------------------------------------------------------------------
@@ -639,66 +639,66 @@ 
 
 	//--------------------------------------------------------------------
 
-    /**
-     * Normalizes a path and cleans it up for healthy use within
-     * realpath() and helps to mitigate changes between Windows and *nix
-     * operating systems.
-     *
-     * Found at http://php.net/manual/en/function.realpath.php#112367
-     *
-     * @param $path
-     *
-     * @return string
-     */
-    protected function normalizePath($path)
-    {
-        // Array to build a new path from the good parts
-        $parts = array();
-
-        // Replace backslashes with forward slashes
-        $path = str_replace('\\', '/', $path);
-
-        // Combine multiple slashes into a single slash
-        $path = preg_replace('/\/+/', '/', $path);
-
-        // Collect path segments
-        $segments = explode('/', $path);
-
-        // Initialize testing variable
-        $test = '';
-
-        foreach($segments as $segment)
-        {
-            if($segment != '.')
-            {
-                $test = array_pop($parts);
-
-                if(is_null($test))
-                {
-                    $parts[] = $segment;
-                }
-                else if ($segment == '..')
-                {
-                    if ($test == '..')
-                    {
-                        $parts[] = $test;
-                    }
-
-                    if ($test == '..' || $test == '')
-                    {
-                        $parts[] = $segment;
-                    }
-                }
-                else
-                {
-                    $parts[] = $test;
-                    $parts[] = $segment;
-                }
-            }
-        }
-        return implode('/', $parts);
-    }
-
-    //--------------------------------------------------------------------
+	/**
+	 * Normalizes a path and cleans it up for healthy use within
+	 * realpath() and helps to mitigate changes between Windows and *nix
+	 * operating systems.
+	 *
+	 * Found at http://php.net/manual/en/function.realpath.php#112367
+	 *
+	 * @param $path
+	 *
+	 * @return string
+	 */
+	protected function normalizePath($path)
+	{
+		// Array to build a new path from the good parts
+		$parts = array();
+
+		// Replace backslashes with forward slashes
+		$path = str_replace('\\', '/', $path);
+
+		// Combine multiple slashes into a single slash
+		$path = preg_replace('/\/+/', '/', $path);
+
+		// Collect path segments
+		$segments = explode('/', $path);
+
+		// Initialize testing variable
+		$test = '';
+
+		foreach($segments as $segment)
+		{
+			if($segment != '.')
+			{
+				$test = array_pop($parts);
+
+				if(is_null($test))
+				{
+					$parts[] = $segment;
+				}
+				else if ($segment == '..')
+				{
+					if ($test == '..')
+					{
+						$parts[] = $test;
+					}
+
+					if ($test == '..' || $test == '')
+					{
+						$parts[] = $segment;
+					}
+				}
+				else
+				{
+					$parts[] = $test;
+					$parts[] = $segment;
+				}
+			}
+		}
+		return implode('/', $parts);
+	}
+
+	//--------------------------------------------------------------------
 
 }

myth/Forge/FileKit.php

Indentation +197 added lines, -197 removed lines

@@ -32,206 +32,206 @@
 
 class FileKit {
 
-    /**
-     * Appends data to the end of a file.
-     *
-     * @param $file
-     * @param $content
-     * @return bool|int
-     */
-    public function append($file, $content)
-    {
-        if (empty($content))
-        {
-            return true;
-        }
-
-        // Ensure that $content has a newline at the end
-        $content = rtrim($content) ."\n";
-
-        $fh = fopen($file, 'a');
-        $result = fwrite($fh, $content);
-        fclose($fh);
-
-        return $result;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Prepends string content to a file. For very large files
-     * this method could have memory issues, but the primary usage
-     * of source files shouldn't ever get large enough to cause issues.
-     *
-     * @param $file
-     * @param $content
-     * @return bool|int
-     */
-    public function prepend($file, $content)
-    {
-        if (empty($content))
-        {
-            return true;
-        }
-
-        // Ensure that $content has a newline at the end
-        $content = rtrim($content) ."\n";
-
-        $file_contents = file_get_contents($file);
-
-        if ($file_contents === false)
-        {
-            throw new \RuntimeException( sprintf(lang('errors.reading_file'), $file));
-        }
-
-        $result = file_put_contents($file, $content . $file_contents);
-
-        return (bool)$result;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Inserts $content before the line that matches $before. NOT case-
-     * sensitive.
-     *
-     * @param $file
-     * @param $before
-     * @param $content
-     * @return int
-     */
-    public function before($file, $before, $content)
-    {
-        if (empty($content))
-        {
-            return true;
-        }
-
-        // Ensure that $content has a newline at the end
-        $content = rtrim($content) ."\n";
-
-        $lines = file($file);
-
-        if ($lines === false)
-        {
-            throw new \RuntimeException( sprintf( lang('errors.file_not_found'), $file ));
-        }
-
-        // Where to insert the row.
-        $location = null;
-
-        foreach ($lines as $index => $line)
-        {
-            if (strtolower($line) == strtolower($before) )
-            {
-                $location = $index;
-                break;
-            }
-        }
-
-        array_splice($lines, $location, 0, $content);
-
-        $result = file_put_contents($file, $lines);
-
-        return (bool)$result;
-    }
-
-    //--------------------------------------------------------------------
-
-    public function after($file, $after, $content)
-    {
-        if (empty($content))
-        {
-            return true;
-        }
-
-        // Ensure that $content has a newline at the end
-        $content = rtrim($content) ."\n";
-
-        $lines = file($file);
-
-        if ($lines === false)
-        {
-            throw new \RuntimeException( sprintf( lang('errors.file_not_found'), $file ) );
-        }
-
-        // Where to insert the row.
-        $location = null;
-
-        foreach ($lines as $index => $line)
-        {
-            if (strtolower($line) == strtolower($after) )
-            {
-                $location = $index;
-                break;
-            }
-        }
-
-        array_splice($lines, $location +1, 0, $content);
-
-        $result = file_put_contents($file, $lines);
-
-        return (bool)$result;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Replaces all instances of $search in the file with $replace.
-     *
-     * @param $file
-     * @param $search
-     * @param $replace
-     * @return int
-     */
-    public function replaceIn($file, $search, $replace)
-    {
-        $file_contents = file_get_contents($file);
-
-        if ($file_contents === false)
-        {
-            throw new \RuntimeException( sprintf( lang('errors.reading_file'), $file ) );
-        }
-
-        $file_contents = str_replace($search, $replace, $file_contents);
-
-        $result = file_put_contents($file, $file_contents);
-
-        return (bool)$result;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Uses preg_replace to replace content within the file.
-     *
-     * @param $file
-     * @param $pattern
-     * @param $replace
-     * @return int
-     */
-    public function replaceWithRegex($file, $pattern, $replace)
-    {
-        $file_contents = file_get_contents($file);
-
-        if ($file_contents === false)
-        {
-            throw new \RuntimeException( sprintf( lang('errors.reading_file'), $file ) );
-        }
+	/**
+	 * Appends data to the end of a file.
+	 *
+	 * @param $file
+	 * @param $content
+	 * @return bool|int
+	 */
+	public function append($file, $content)
+	{
+		if (empty($content))
+		{
+			return true;
+		}
+
+		// Ensure that $content has a newline at the end
+		$content = rtrim($content) ."\n";
+
+		$fh = fopen($file, 'a');
+		$result = fwrite($fh, $content);
+		fclose($fh);
+
+		return $result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prepends string content to a file. For very large files
+	 * this method could have memory issues, but the primary usage
+	 * of source files shouldn't ever get large enough to cause issues.
+	 *
+	 * @param $file
+	 * @param $content
+	 * @return bool|int
+	 */
+	public function prepend($file, $content)
+	{
+		if (empty($content))
+		{
+			return true;
+		}
+
+		// Ensure that $content has a newline at the end
+		$content = rtrim($content) ."\n";
+
+		$file_contents = file_get_contents($file);
+
+		if ($file_contents === false)
+		{
+			throw new \RuntimeException( sprintf(lang('errors.reading_file'), $file));
+		}
+
+		$result = file_put_contents($file, $content . $file_contents);
+
+		return (bool)$result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Inserts $content before the line that matches $before. NOT case-
+	 * sensitive.
+	 *
+	 * @param $file
+	 * @param $before
+	 * @param $content
+	 * @return int
+	 */
+	public function before($file, $before, $content)
+	{
+		if (empty($content))
+		{
+			return true;
+		}
+
+		// Ensure that $content has a newline at the end
+		$content = rtrim($content) ."\n";
+
+		$lines = file($file);
+
+		if ($lines === false)
+		{
+			throw new \RuntimeException( sprintf( lang('errors.file_not_found'), $file ));
+		}
+
+		// Where to insert the row.
+		$location = null;
+
+		foreach ($lines as $index => $line)
+		{
+			if (strtolower($line) == strtolower($before) )
+			{
+				$location = $index;
+				break;
+			}
+		}
+
+		array_splice($lines, $location, 0, $content);
+
+		$result = file_put_contents($file, $lines);
+
+		return (bool)$result;
+	}
+
+	//--------------------------------------------------------------------
+
+	public function after($file, $after, $content)
+	{
+		if (empty($content))
+		{
+			return true;
+		}
+
+		// Ensure that $content has a newline at the end
+		$content = rtrim($content) ."\n";
+
+		$lines = file($file);
+
+		if ($lines === false)
+		{
+			throw new \RuntimeException( sprintf( lang('errors.file_not_found'), $file ) );
+		}
+
+		// Where to insert the row.
+		$location = null;
+
+		foreach ($lines as $index => $line)
+		{
+			if (strtolower($line) == strtolower($after) )
+			{
+				$location = $index;
+				break;
+			}
+		}
+
+		array_splice($lines, $location +1, 0, $content);
+
+		$result = file_put_contents($file, $lines);
+
+		return (bool)$result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Replaces all instances of $search in the file with $replace.
+	 *
+	 * @param $file
+	 * @param $search
+	 * @param $replace
+	 * @return int
+	 */
+	public function replaceIn($file, $search, $replace)
+	{
+		$file_contents = file_get_contents($file);
+
+		if ($file_contents === false)
+		{
+			throw new \RuntimeException( sprintf( lang('errors.reading_file'), $file ) );
+		}
+
+		$file_contents = str_replace($search, $replace, $file_contents);
+
+		$result = file_put_contents($file, $file_contents);
+
+		return (bool)$result;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Uses preg_replace to replace content within the file.
+	 *
+	 * @param $file
+	 * @param $pattern
+	 * @param $replace
+	 * @return int
+	 */
+	public function replaceWithRegex($file, $pattern, $replace)
+	{
+		$file_contents = file_get_contents($file);
+
+		if ($file_contents === false)
+		{
+			throw new \RuntimeException( sprintf( lang('errors.reading_file'), $file ) );
+		}
 
-        $file_contents = preg_replace($pattern, $replace, $file_contents);
-
-        $result = false;
+		$file_contents = preg_replace($pattern, $replace, $file_contents);
+
+		$result = false;
 
-        // Don't let us erase a file!
-        if (! empty($file_contents))
-        {
-            $result = file_put_contents( $file, $file_contents );
-        }
+		// Don't let us erase a file!
+		if (! empty($file_contents))
+		{
+			$result = file_put_contents( $file, $file_contents );
+		}
 
-        return (bool)$result;
-    }
+		return (bool)$result;
+	}
 
-    //--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 
 }

myth/Mail/BaseMailer.php

Indentation +283 added lines, -283 removed lines

@@ -40,290 +40,290 @@
  */
 class BaseMailer {
 
-    /**
-     * How the email is delivered.
-     * Either 'send' or 'queue'.
-     * @var string
-     */
-    protected $action = 'send';
-
-    protected $from     = null;
-    protected $to       = null;
-    protected $reply_to = null;
-    protected $cc       = null;
-    protected $bcc      = null;
-
-    protected $message  = null;
-
-    protected $theme    = 'email';
-    protected $layout   = 'index';
-    protected $view     = null;
-
-    /**
-     * The MailService to use. If NULL
-     * will use the system default.
-     * @var null
-     */
-    protected $service_name  = null;
-
-    protected $service = null;
-
-    /**
-     * Used for theming the email messages.
-     * @var null
-     */
-    protected $themer = null;
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Constructor
-     *
-     * Simply allows us to override the default settings for this mailer.
-     *
-     * @param null $options
-     */
-    public function __construct($options=null)
-    {
-        if (! empty($options))
-        {
-            $this->setOptions($options);
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Sets the basic options available to the mailer, like 'from', 'to',
-     * 'cc', 'bcc', etc.
-     *
-     * @param $options
-     */
-    public function setOptions($options)
-    {
-        if (is_array($options))
-        {
-            foreach ($options as $key => $value)
-            {
-                if ($key == 'service')
-                {
-                    $this->service =& $value;
-                    continue;
-                }
-
-                if (property_exists($this, $key))
-                {
-                    $this->$key = $value;
-                }
-            }
-        }
-    }
-
-    //--------------------------------------------------------------------
-
-
-
-    /**
-     * Sends an email immediately using the system-defined MailService.
-     *
-     * @param string $to // Who the email is being sent to.
-     * @param string $subject // The subject line for the email
-     * @param strign $data // the key/value pairs to send to the views.
-     * @param string $view // You can override the view used for the email here.
-     *                          // You can change themes by prepending theme name
-     *                          // like: 'newtheme:newview'
-     *
-     * @return bool
-     */
-    public function send($to, $subject, $data=[], $view=null)
-    {
-        // Are we pretending to send?
-        if (config_item('mail.pretend') === true)
-        {
-            return true;
-        }
-
-        $this->startMailService();
-
-        $this->service->to($to);
-        $this->service->subject($subject);
-
-        if (is_array($this->from)) {
-            $this->service->from($this->from[0], $this->from[1]);
-        }
-        else
-        {
-            $this->service->from($this->from);
-        }
-
-        if (! empty($this->cc))         $this->service->cc($this->cc);
-        if (! empty($this->bcc))        $this->service->bcc($this->bcc);
-
-        if (is_array($this->reply_to)) {
-            $this->service->reply_to($this->reply_to[0], $this->reply_to[1]);
-        }
-        else
-        {
-            $this->service->reply_to($this->reply_to);
-        }
-
-
-        // Determine the view to use. We have to hack this a bit with
-        // the debug_backtrace, though, to make it all function in the background.
-        list(, $method) = debug_backtrace(false);
-
-        $view = 'emails/'. strtolower( (new \ReflectionClass($this))->getShortName() ) .'/'. $method['function'];
-
-        // Get our message's text and html versions based on which files exist...
-        $basepath = APPPATH .'views/'. $view;
-
-        // Is a text version available?
-        if (file_exists($basepath .'.text.php'))
-        {
-            $text = $this->load->view($view .'.text.php', $data, true);
-            $this->service->text_message($text);
-        }
-
-        // If an html version is around, we need to theme it out
-        if (file_exists($basepath .'.html.php'))
-        {
-            $this->startThemer();
-
-            $this->themer->setTheme($this->theme);
-
-            // Determine the correct layout to use
-            $layout = ! empty($this->layout) ? $this->layout : NULL;
-            $this->themer->setLayout($layout);
-
-            $this->themer->set($data);
-
-            // Render the view into a var we can pass to the layout.
-            $content = $this->themer->display($view .'.html.php');
-
-            $this->themer->set('content', $content);
-
-            $this->service->html_message( $this->themer->display($this->theme .':'. $layout) );
-        }
-
-        if (! $this->service->send() )
-        {
-            // todo do something here
-            return false;
-        }
-
-        return true;
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Allows you to customize the headers sent with the email. You can
-     * do them one at a time by passing $field and $value, or pass an array
-     * of $field => $value pairs as the first parameter.
-     *
-     * @param string|array  $field
-     * @param string        $value
-     */
-    public function header($field, $value=null)
-    {
-        $this->startMailService();
-
-        $this->service->setHeader($field, $value);
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Adds an attachment to the current email that is being built.
-     *
-     * @param string    $filename
-     * @param string    $disposition    like 'inline'. Default is 'attachment'
-     * @param string    $newname        If you'd like to rename the file for delivery
-     * @param string    $mime           Custom defined mime type.
-     */
-    public function attach($filename, $disposition=null, $newname=null, $mime=null)
-    {
-        $this->startMailService();
-
-        $this->service->attach($filename, $disposition, $newname, $mime);
-    }
-
-    //--------------------------------------------------------------------
-
-    //--------------------------------------------------------------------
-    // Private Methods
-    //--------------------------------------------------------------------
-
-    /**
-     * Starts up the service name specified in $service_name.
-     *
-     * @param $service_name
-     */
-    protected function startMailService()
-    {
-        // Only once!
-        if (! empty($this->service) && is_object($this->service))
-        {
-            return;
-        }
-
-        $service_name = ! empty($this->service_name) ? $this->service_name : config_item('mail.default_service');
-
-        if (! class_exists($service_name))
-        {
-            throw new \RuntimeException( sprintf( lang('mail.invalid_service'), $service_name) );
-        }
-
-        $this->service = new $service_name();
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * Fires up the default themer so we can use it to theme our HTML messages.
-     */
-    protected function startThemer()
-    {
-        /*
+	/**
+	 * How the email is delivered.
+	 * Either 'send' or 'queue'.
+	 * @var string
+	 */
+	protected $action = 'send';
+
+	protected $from     = null;
+	protected $to       = null;
+	protected $reply_to = null;
+	protected $cc       = null;
+	protected $bcc      = null;
+
+	protected $message  = null;
+
+	protected $theme    = 'email';
+	protected $layout   = 'index';
+	protected $view     = null;
+
+	/**
+	 * The MailService to use. If NULL
+	 * will use the system default.
+	 * @var null
+	 */
+	protected $service_name  = null;
+
+	protected $service = null;
+
+	/**
+	 * Used for theming the email messages.
+	 * @var null
+	 */
+	protected $themer = null;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Constructor
+	 *
+	 * Simply allows us to override the default settings for this mailer.
+	 *
+	 * @param null $options
+	 */
+	public function __construct($options=null)
+	{
+		if (! empty($options))
+		{
+			$this->setOptions($options);
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Sets the basic options available to the mailer, like 'from', 'to',
+	 * 'cc', 'bcc', etc.
+	 *
+	 * @param $options
+	 */
+	public function setOptions($options)
+	{
+		if (is_array($options))
+		{
+			foreach ($options as $key => $value)
+			{
+				if ($key == 'service')
+				{
+					$this->service =& $value;
+					continue;
+				}
+
+				if (property_exists($this, $key))
+				{
+					$this->$key = $value;
+				}
+			}
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+
+
+	/**
+	 * Sends an email immediately using the system-defined MailService.
+	 *
+	 * @param string $to // Who the email is being sent to.
+	 * @param string $subject // The subject line for the email
+	 * @param strign $data // the key/value pairs to send to the views.
+	 * @param string $view // You can override the view used for the email here.
+	 *                          // You can change themes by prepending theme name
+	 *                          // like: 'newtheme:newview'
+	 *
+	 * @return bool
+	 */
+	public function send($to, $subject, $data=[], $view=null)
+	{
+		// Are we pretending to send?
+		if (config_item('mail.pretend') === true)
+		{
+			return true;
+		}
+
+		$this->startMailService();
+
+		$this->service->to($to);
+		$this->service->subject($subject);
+
+		if (is_array($this->from)) {
+			$this->service->from($this->from[0], $this->from[1]);
+		}
+		else
+		{
+			$this->service->from($this->from);
+		}
+
+		if (! empty($this->cc))         $this->service->cc($this->cc);
+		if (! empty($this->bcc))        $this->service->bcc($this->bcc);
+
+		if (is_array($this->reply_to)) {
+			$this->service->reply_to($this->reply_to[0], $this->reply_to[1]);
+		}
+		else
+		{
+			$this->service->reply_to($this->reply_to);
+		}
+
+
+		// Determine the view to use. We have to hack this a bit with
+		// the debug_backtrace, though, to make it all function in the background.
+		list(, $method) = debug_backtrace(false);
+
+		$view = 'emails/'. strtolower( (new \ReflectionClass($this))->getShortName() ) .'/'. $method['function'];
+
+		// Get our message's text and html versions based on which files exist...
+		$basepath = APPPATH .'views/'. $view;
+
+		// Is a text version available?
+		if (file_exists($basepath .'.text.php'))
+		{
+			$text = $this->load->view($view .'.text.php', $data, true);
+			$this->service->text_message($text);
+		}
+
+		// If an html version is around, we need to theme it out
+		if (file_exists($basepath .'.html.php'))
+		{
+			$this->startThemer();
+
+			$this->themer->setTheme($this->theme);
+
+			// Determine the correct layout to use
+			$layout = ! empty($this->layout) ? $this->layout : NULL;
+			$this->themer->setLayout($layout);
+
+			$this->themer->set($data);
+
+			// Render the view into a var we can pass to the layout.
+			$content = $this->themer->display($view .'.html.php');
+
+			$this->themer->set('content', $content);
+
+			$this->service->html_message( $this->themer->display($this->theme .':'. $layout) );
+		}
+
+		if (! $this->service->send() )
+		{
+			// todo do something here
+			return false;
+		}
+
+		return true;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Allows you to customize the headers sent with the email. You can
+	 * do them one at a time by passing $field and $value, or pass an array
+	 * of $field => $value pairs as the first parameter.
+	 *
+	 * @param string|array  $field
+	 * @param string        $value
+	 */
+	public function header($field, $value=null)
+	{
+		$this->startMailService();
+
+		$this->service->setHeader($field, $value);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Adds an attachment to the current email that is being built.
+	 *
+	 * @param string    $filename
+	 * @param string    $disposition    like 'inline'. Default is 'attachment'
+	 * @param string    $newname        If you'd like to rename the file for delivery
+	 * @param string    $mime           Custom defined mime type.
+	 */
+	public function attach($filename, $disposition=null, $newname=null, $mime=null)
+	{
+		$this->startMailService();
+
+		$this->service->attach($filename, $disposition, $newname, $mime);
+	}
+
+	//--------------------------------------------------------------------
+
+	//--------------------------------------------------------------------
+	// Private Methods
+	//--------------------------------------------------------------------
+
+	/**
+	 * Starts up the service name specified in $service_name.
+	 *
+	 * @param $service_name
+	 */
+	protected function startMailService()
+	{
+		// Only once!
+		if (! empty($this->service) && is_object($this->service))
+		{
+			return;
+		}
+
+		$service_name = ! empty($this->service_name) ? $this->service_name : config_item('mail.default_service');
+
+		if (! class_exists($service_name))
+		{
+			throw new \RuntimeException( sprintf( lang('mail.invalid_service'), $service_name) );
+		}
+
+		$this->service = new $service_name();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Fires up the default themer so we can use it to theme our HTML messages.
+	 */
+	protected function startThemer()
+	{
+		/*
          * Setup our Template Engine
          */
-        $themer = config_item('active_themer');
-
-        if (empty($themer)) {
-            throw new \RuntimeException( lang('no_themer') );
-        }
-
-        if (empty($this->themer))
-        {
-            $this->themer = new $themer( get_instance() );
-        }
-
-        // Register our paths with the themer
-        $paths = config_item('theme.paths');
-
-        foreach ($paths as $key => $path) {
-            $this->themer->addThemePath($key, $path);
-        }
-
-        // Set our default theme.
-        $this->themer->setDefaultTheme( 'email' );
-    }
-
-    //--------------------------------------------------------------------
-
-    /**
-     * __get magic
-     *
-     * Allows models to access CI's loaded classes using the same
-     * syntax as controllers.
-     *
-     * @param	string	$key
-     */
-    public function __get($key)
-    {
-        return get_instance()->$key;
-    }
-
-    //--------------------------------------------------------------------
+		$themer = config_item('active_themer');
+
+		if (empty($themer)) {
+			throw new \RuntimeException( lang('no_themer') );
+		}
+
+		if (empty($this->themer))
+		{
+			$this->themer = new $themer( get_instance() );
+		}
+
+		// Register our paths with the themer
+		$paths = config_item('theme.paths');
+
+		foreach ($paths as $key => $path) {
+			$this->themer->addThemePath($key, $path);
+		}
+
+		// Set our default theme.
+		$this->themer->setDefaultTheme( 'email' );
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * __get magic
+	 *
+	 * Allows models to access CI's loaded classes using the same
+	 * syntax as controllers.
+	 *
+	 * @param	string	$key
+	 */
+	public function __get($key)
+	{
+		return get_instance()->$key;
+	}
+
+	//--------------------------------------------------------------------
 
 }