diff --git a/app/config/config.php b/app/config/config.php index 56c63a8..e64c123 100644 --- a/app/config/config.php +++ b/app/config/config.php @@ -8,7 +8,7 @@ * @author Timothy J. Warren * @copyright Copyright (c) 2011 - 2012 * @link https://github.com/aviat4ion/miniMVC - * @license http://philsturgeon.co.uk/code/dbad-license + * @license http://philsturgeon.co.uk/code/dbad-license */ // -------------------------------------------------------------------------- @@ -19,8 +19,8 @@ * @package miniMVC * @subpackage App */ - -// -------------------------------------------------------------------------- + +// -------------------------------------------------------------------------- /* |-------------------------------------------------------------------------- diff --git a/app/config/db.php b/app/config/db.php index 751b9ad..7296388 100644 --- a/app/config/db.php +++ b/app/config/db.php @@ -8,7 +8,7 @@ * @author Timothy J. Warren * @copyright Copyright (c) 2011 - 2012 * @link https://github.com/aviat4ion/miniMVC - * @license http://philsturgeon.co.uk/code/dbad-license + * @license http://philsturgeon.co.uk/code/dbad-license */ // -------------------------------------------------------------------------- @@ -19,7 +19,7 @@ * @package miniMVC * @subpackage App */ - + // -------------------------------------------------------------------------- $db_conf = array( diff --git a/app/config/routes.php b/app/config/routes.php index efe86dd..7763cf4 100644 --- a/app/config/routes.php +++ b/app/config/routes.php @@ -8,7 +8,7 @@ * @author Timothy J. Warren * @copyright Copyright (c) 2011 - 2012 * @link https://github.com/aviat4ion/miniMVC - * @license http://philsturgeon.co.uk/code/dbad-license + * @license http://philsturgeon.co.uk/code/dbad-license */ // -------------------------------------------------------------------------- @@ -16,7 +16,7 @@ /** * File to configure routes * - * Routes work on simple/regex matching. + * Routes work on simple/regex matching. * * For a route mapping http://example.com/blog to the blog controller in the blog module: * 'blog' => 'blog/blog/index' @@ -26,7 +26,7 @@ * @package miniMVC * @subpackage App */ - + // -------------------------------------------------------------------------- return array( diff --git a/app/modules/welcome/controllers/welcome.php b/app/modules/welcome/controllers/welcome.php index 17062cd..d7ffba8 100644 --- a/app/modules/welcome/controllers/welcome.php +++ b/app/modules/welcome/controllers/welcome.php @@ -8,7 +8,7 @@ * @author Timothy J. Warren * @copyright Copyright (c) 2011 - 2012 * @link https://github.com/aviat4ion/miniMVC - * @license http://philsturgeon.co.uk/code/dbad-license + * @license http://philsturgeon.co.uk/code/dbad-license */ // -------------------------------------------------------------------------- @@ -16,7 +16,7 @@ /** * Example Controller Class */ -class Welcome extends miniMVC\Controller { +class welcome extends miniMVC\Controller { /** * Initialize the constructor @@ -27,7 +27,7 @@ class Welcome extends miniMVC\Controller { { parent::__construct(); } - + /** * Default route for the controller * @@ -39,7 +39,7 @@ class Welcome extends miniMVC\Controller { $output = $this->page->set_message('info', "This is just a test message"); $this->page->build_footer(); } - + /** * welcome/php route * @@ -51,7 +51,7 @@ class Welcome extends miniMVC\Controller { phpinfo(); $output = ob_get_contents(); ob_end_clean(); - + $this->page->set_output($output); } } diff --git a/app/modules/welcome/models/welcome_model.php b/app/modules/welcome/models/welcome_model.php index 7a4e70b..4b8460b 100644 --- a/app/modules/welcome/models/welcome_model.php +++ b/app/modules/welcome/models/welcome_model.php @@ -8,7 +8,7 @@ * @author Timothy J. Warren * @copyright Copyright (c) 2011 - 2012 * @link https://github.com/aviat4ion/miniMVC - * @license http://philsturgeon.co.uk/code/dbad-license + * @license http://philsturgeon.co.uk/code/dbad-license */ // -------------------------------------------------------------------------- @@ -23,7 +23,7 @@ class Welcome_Model extends miniMVC\Model{ * * @return void */ - function __construct() + public function __construct() { parent::__construct(); } diff --git a/app/views/errors/error_404.php b/app/views/errors/error_404.php index e210433..b82ebbb 100644 --- a/app/views/errors/error_404.php +++ b/app/views/errors/error_404.php @@ -11,9 +11,9 @@

- + - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/views/errors/error_db.php b/app/views/errors/error_db.php index bab8d6d..2a85f38 100644 --- a/app/views/errors/error_db.php +++ b/app/views/errors/error_db.php @@ -1,6 +1,6 @@

A Database Error was encountered

- +

Code:

Driver Code:

Message:

diff --git a/app/views/errors/error_general.php b/app/views/errors/error_general.php index e210433..b82ebbb 100644 --- a/app/views/errors/error_general.php +++ b/app/views/errors/error_general.php @@ -11,9 +11,9 @@

- + - +
- \ No newline at end of file + \ No newline at end of file diff --git a/app/views/errors/error_php_exception.php b/app/views/errors/error_php_exception.php index e69e9ce..689c056 100755 --- a/app/views/errors/error_php_exception.php +++ b/app/views/errors/error_php_exception.php @@ -1,13 +1,13 @@

An uncaught exception was thrown.

- +

Message:

- + - +

Backtrace:

getTrace() as $error): ?> - +

File:
@@ -15,8 +15,8 @@ Function:

- +

- +
\ No newline at end of file diff --git a/assets/config/config.php b/assets/config/config.php index 05bdf7e..235397d 100755 --- a/assets/config/config.php +++ b/assets/config/config.php @@ -8,7 +8,7 @@ * @author Timothy J. Warren * @copyright Copyright (c) 2011 - 2012 * @link https://github.com/aviat4ion/miniMVC - * @license http://philsturgeon.co.uk/code/dbad-license + * @license http://philsturgeon.co.uk/code/dbad-license */ // -------------------------------------------------------------------------- @@ -25,11 +25,11 @@ | Document Root |-------------------------------------------------------------------------- | -| The folder where the index of the website exists. In most situations, -| this will not need to be changed. +| The folder where the index of the website exists. In most situations, +| this will not need to be changed. | | If the website is in a folder off of the domain name, like: -| http://example.com/website/ +| http://example.com/website/ | you will need to add that folder to the document root. | */ diff --git a/assets/config/css_groups.php b/assets/config/css_groups.php index e2cc3b8..087207e 100644 --- a/assets/config/css_groups.php +++ b/assets/config/css_groups.php @@ -8,7 +8,7 @@ * @author Timothy J. Warren * @copyright Copyright (c) 2011 - 2012 * @link https://github.com/aviat4ion/miniMVC - * @license http://philsturgeon.co.uk/code/dbad-license + * @license http://philsturgeon.co.uk/code/dbad-license */ // -------------------------------------------------------------------------- @@ -18,15 +18,15 @@ */ return array( /*----- - Css + Css -----*/ 'css' => array( 'message.css' ), - + /* For each group create an array like so - + 'my_group' => [ 'path/to/css/file1.css', 'path/to/css/file2.css' diff --git a/assets/config/js_groups.php b/assets/config/js_groups.php index f1b33b7..7836649 100755 --- a/assets/config/js_groups.php +++ b/assets/config/js_groups.php @@ -8,7 +8,7 @@ * @author Timothy J. Warren * @copyright Copyright (c) 2011 - 2012 * @link https://github.com/aviat4ion/miniMVC - * @license http://philsturgeon.co.uk/code/dbad-license + * @license http://philsturgeon.co.uk/code/dbad-license */ // -------------------------------------------------------------------------- @@ -16,10 +16,10 @@ /** * This is the config array for javascript files to concatenate and minify */ -return [ +return [ /* For each group create an array like so - + 'my_group' => array( 'path/to/css/file1.css', 'path/to/css/file2.css' diff --git a/assets/css.php b/assets/css.php index ff017e7..cba53ec 100644 --- a/assets/css.php +++ b/assets/css.php @@ -8,12 +8,12 @@ * @author Timothy J. Warren * @copyright Copyright (c) 2011 - 2012 * @link https://github.com/aviat4ion/miniMVC - * @license http://philsturgeon.co.uk/code/dbad-license + * @license http://philsturgeon.co.uk/code/dbad-license */ // -------------------------------------------------------------------------- -/** +/** * CSS Minifier and Cacher * * @package miniMVC @@ -21,10 +21,10 @@ */ //Get config files -require('./config/config.php'); +require './config/config.php'; //Include the css groups -$groups = require("./config/css_groups.php"); +$groups = require './config/css_groups.php'; //The name of this file $this_file = __FILE__; @@ -38,10 +38,10 @@ $this_file = __FILE__; * @return string */ function compress($buffer) { - + //Remove CSS comments $buffer = preg_replace('!/\*[^*]*\*+([^/][^*]*\*+)*/!', '', $buffer); - + //Remove tabs, spaces, newlines, etc. $buffer = preg_replace('`\s+`', ' ', $buffer); $replace = array( @@ -55,12 +55,12 @@ function compress($buffer) { ': ' => ':', '; ' => ';', ); - + //Eradicate every last space! $buffer = trim(strtr($buffer, $replace)); $buffer = str_replace('{ ', '{', $buffer); $buffer = str_replace('} ', '}', $buffer); - + return $buffer; } @@ -77,9 +77,9 @@ while($i < $pia_len) { $j = $i+1; $j = (isset($pia[$j])) ? $j : $i; - + $_GET[$pia[$i]] = $pia[$j]; - + $i = $j + 1; }; @@ -103,8 +103,8 @@ $modified[] = filemtime($this_file); rsort($modified); $last_modified = $modified[0]; -$requested_time= (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) - ? strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) +$requested_time= (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) + ? strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) : time(); if ($last_modified === $requested_time) diff --git a/assets/js.php b/assets/js.php index 57ba8d8..b26e04b 100755 --- a/assets/js.php +++ b/assets/js.php @@ -8,7 +8,7 @@ * @author Timothy J. Warren * @copyright Copyright (c) 2011 - 2012 * @link https://github.com/aviat4ion/miniMVC - * @license http://philsturgeon.co.uk/code/dbad-license + * @license http://philsturgeon.co.uk/code/dbad-license */ // -------------------------------------------------------------------------- @@ -21,7 +21,7 @@ */ //Get config files -require('./config/config.php'); +require './config/config.php'; //Include the js groups $groups_file = "./config/js_groups.php"; @@ -34,7 +34,7 @@ $this_file = __FILE__; /** * Get Files - * + * * Concatenates the javascript files for the current * group as a string * @return string @@ -44,13 +44,13 @@ function get_files() global $groups, $js_root; $js = ''; - + foreach ($groups[$_GET['g']] as &$file) { $new_file = realpath($js_root.$file); $js .= file_get_contents($new_file); } - + return $js; } @@ -71,7 +71,7 @@ function google_min($new_file) curl_setopt($ch, CURLOPT_POST, 1); curl_setopt($ch, CURLOPT_POSTFIELDS, 'output_info=compiled_code&output_format=text&compilation_level=SIMPLE_OPTIMIZATIONS&js_code=' . urlencode($new_file)); $output = curl_exec($ch); - curl_close($ch); + curl_close($ch); return $output; } @@ -88,9 +88,9 @@ while ($i < $pia_len) { $j = $i+1; $j = (isset($pia[$j])) ? $j : $i; - + $_GET[$pia[$i]] = $pia[$j]; - + $i = $j + 1; }; @@ -103,19 +103,19 @@ $modified = []; if (isset($groups[$_GET['g']])) { $cache_file = $js_root.'cache/'.$_GET['g']; - + foreach ($groups[$_GET['g']] as &$file) { $new_file = realpath($js_root.$file); $modified[] = filemtime($new_file); } - + //Add this page too, as well as the groups file $modified[] = filemtime($this_file); $modified[] = filemtime($groups_file); - + $cache_modified = 0; - + //Add the cache file if (is_file($cache_file)) { @@ -133,11 +133,11 @@ else //Nothing to display? Just exit rsort($modified); $last_modified = $modified[0]; -$requested_time=(isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) - ? strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) +$requested_time=(isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) + ? strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) : time(); -// If the browser's cached version is up to date, +// If the browser's cached version is up to date, // don't resend the file if ($last_modified === $requested_time) { @@ -152,7 +152,7 @@ if ($cache_modified < $last_modified) { $js = google_min(get_files()); $cs = file_put_contents($cache_file, $js); - + //Make sure cache file gets created/updated if ($cs === FALSE) { @@ -164,7 +164,7 @@ elseif (isset($_GET['debug'])) $js = get_files(); } else -{ +{ $len = filesize($cache_file); header("Content-Length: {$len}"); $js = file_get_contents($cache_file); diff --git a/index.php b/index.php index 7e564e9..e668f16 100644 --- a/index.php +++ b/index.php @@ -8,7 +8,7 @@ * @author Timothy J. Warren * @copyright Copyright (c) 2011 - 2012 * @link https://github.com/aviat4ion/miniMVC - * @license http://philsturgeon.co.uk/code/dbad-license + * @license http://philsturgeon.co.uk/code/dbad-license */ // -------------------------------------------------------------------------- @@ -19,11 +19,11 @@ * @package miniMVC * @subpackage App */ - + // -------------------------------------------------------------------------- namespace miniMVC; - + // Set as either DEVELOPMENT or PRODUCTION // DEVELOPMENT enables error reporting // PRODUCTION disables error reporting @@ -53,4 +53,4 @@ require(MM_SYS_PATH . 'common.php'); // And away we go! init(); -// End of index.php \ No newline at end of file +// End of index.php \ No newline at end of file diff --git a/sys/core/db.php b/sys/core/db.php index 8037f16..7cc281a 100644 --- a/sys/core/db.php +++ b/sys/core/db.php @@ -8,20 +8,20 @@ * @author Timothy J. Warren * @copyright Copyright (c) 2011 - 2012 * @link https://github.com/aviat4ion/miniMVC - * @license http://philsturgeon.co.uk/code/dbad-license + * @license http://philsturgeon.co.uk/code/dbad-license */ - + // -------------------------------------------------------------------------- namespace miniMVC; - + /** * Extend PHP's PDO class to add some more functionality * * @package miniMVC * @subpackage System */ -class DB extends \Query_Builder { +class db extends \Query_Builder { /** * DB connection instances @@ -29,9 +29,9 @@ class DB extends \Query_Builder { * @var array */ private static $instance = array(); - + // -------------------------------------------------------------------------- - + /** * Indexed singleton method * @@ -45,7 +45,7 @@ class DB extends \Query_Builder { { // Include the database config file require_once(MM_APP_PATH.'config/db.php'); - + // Get the correct database in the config file if ( ! is_like_array($db_conf[$dbname])) { @@ -54,16 +54,16 @@ class DB extends \Query_Builder { trigger_error("Database does not exist", E_USER_ERROR); die(); } - + //echo 'Creating new instance of db class.'; self::$instance[$dbname] = new DB($db_conf[$dbname]); } return self::$instance[$dbname]; } - + // -------------------------------------------------------------------------- - + /** * Returns the last error from the database * diff --git a/sys/libraries/Data_Store.php b/sys/libraries/Data_Store.php index 02ab68a..d873e80 100644 --- a/sys/libraries/Data_Store.php +++ b/sys/libraries/Data_Store.php @@ -8,7 +8,7 @@ * @author Timothy J. Warren * @copyright Copyright (c) 2011 - 2012 * @link https://github.com/aviat4ion/miniMVC - * @license http://philsturgeon.co.uk/code/dbad-license + * @license http://philsturgeon.co.uk/code/dbad-license */ // -------------------------------------------------------------------------- @@ -22,24 +22,24 @@ namespace miniMVC; * @subpackage Libraries */ class Data_Store { - + /** * Settings object represented by the currently loaded JSON file */ private $current; - + /** * Singleton instance */ private static $instance; - + /** * Create and/or load json file */ protected function __construct() { $path = MM_APP_PATH .'config/data_store.json'; - + if ( ! is_file($path)) { touch($path); @@ -49,12 +49,12 @@ class Data_Store { { // Load the file $json = file_get_contents($path); - + // Load the object into the class $this->current = json_decode($json); } } - + // -------------------------------------------------------------------------- /** @@ -66,9 +66,9 @@ class Data_Store { file_put_contents(MM_APP_PATH . 'config/data_store.json', $file_string); } - + // -------------------------------------------------------------------------- - + /** * Magic function called when cloning an object */ @@ -76,7 +76,7 @@ class Data_Store { { trigger_error('Clone is not allowed.', E_USER_ERROR); } - + // -------------------------------------------------------------------------- /** @@ -104,9 +104,9 @@ class Data_Store { { return $this->current->{$key} = $val; } - + // -------------------------------------------------------------------------- - + /** * Static method to retreive current instance * of the singleton @@ -123,9 +123,9 @@ class Data_Store { return self::$instance; } - + // -------------------------------------------------------------------------- - + /** * Removes a key from the data store * @@ -136,9 +136,9 @@ class Data_Store { { unset($this->current->{$key}); } - + // -------------------------------------------------------------------------- - + /** * Return the entire data store object * diff --git a/sys/libraries/Session.php b/sys/libraries/Session.php index b7b2d55..8903c3d 100644 --- a/sys/libraries/Session.php +++ b/sys/libraries/Session.php @@ -29,7 +29,7 @@ class Session { * @var array */ protected $sess = array(); - + /** * Reference to current instance * diff --git a/tests/commonTest.php b/tests/commonTest.php index a34ecbf..517fd55 100644 --- a/tests/commonTest.php +++ b/tests/commonTest.php @@ -5,32 +5,32 @@ */ class commonTest extends UnitTestCase { - function __construct() + public function __construct() { parent::__construct('Common.php Tests'); } - - function setUp() + + public function setUp() { $this->empty = array(); $this->object = new stdClass(); $this->array_like = new stdClass(array('foo' => 'bar')); } - - function tearDown() + + public function tearDown() { unset($this->empty); unset($this->object); unset($this->array_like); } - - function testEmptyArrayNotLikeArray() + + public function testEmptyArrayNotLikeArray() { // Empty is not array like $this->assertFalse(miniMVC\is_like_array($this->empty)); } - - function testEmptyObjectIsLikeArray() + + public function testEmptyObjectIsLikeArray() { // Empty object is array like - because objects are truthy $this->assertTrue(miniMVC\is_like_array($this->object)); diff --git a/tests/index.php b/tests/index.php index def129e..6aa316f 100644 --- a/tests/index.php +++ b/tests/index.php @@ -4,7 +4,7 @@ define('ENVIRONMENT', 'DEVELOPMENT'); //Include simpletest -require_once('simpletest/autorun.php'); +require_once 'simpletest/autorun.php'; // Set the default paths define('MM_SYS_PATH', '../sys/'); @@ -21,5 +21,5 @@ require_once(MM_SYS_PATH . 'db/tests/index.php'); require_once(MM_SYS_PATH . 'common.php'); //Include test files -require_once('commonTest.php'); +require_once 'commonTest.php';