diff --git a/docs/classes/DB.html b/docs/classes/DB.html index 94c171e..d784e86 100644 --- a/docs/classes/DB.html +++ b/docs/classes/DB.html @@ -58,10 +58,7 @@
  •  Methods
  • Override __call in trait to call __call in Query Builder...lol
    __call()
    • -
  • PHP magic methods to call non-static methods statically
    __callStatic()
    • -
  • Constructor to override PDO constructor - Quercus doesn't seem to override -the parent constructor unless the arguments match.
    __construct()
    • +
  • Constructor to override JSObject trait
    __construct()
  • Retreive the number of rows in the selected table
    count_all()
  • Retrieve the number of results for the generated query - used @@ -179,26 +176,8 @@ for complex select queries
    $query_map
    • mixed
    -
    -

    PHP magic methods to call non-static methods statically

    -
    __callStatic(string $name, array $args) 
    -
    -
    -

    -

    Parameters

    -
    -

    $name

    -string -
    -
    -

    $args

    -array -
    -
    -
    -

    Constructor to override PDO constructor - Quercus doesn't seem to override -the parent constructor unless the arguments match.

    +

    Constructor to override JSObject trait

    __construct(array $params) 
    @@ -1604,7 +1583,7 @@ for complex select queries
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/DB_PDO.html b/docs/classes/DB_PDO.html index 6a3c342..9f96802 100644 --- a/docs/classes/DB_PDO.html +++ b/docs/classes/DB_PDO.html @@ -679,7 +679,7 @@ the connection/database
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/DB_Reg.html b/docs/classes/DB_Reg.html index a2ec244..94e5cbb 100644 --- a/docs/classes/DB_Reg.html +++ b/docs/classes/DB_Reg.html @@ -152,7 +152,7 @@ and organizes database connections

    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/DB_SQL.html b/docs/classes/DB_SQL.html index 1cf4890..eef5fb8 100644 --- a/docs/classes/DB_SQL.html +++ b/docs/classes/DB_SQL.html @@ -269,7 +269,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/DB_Util.html b/docs/classes/DB_Util.html index 5747504..be04eb8 100644 --- a/docs/classes/DB_Util.html +++ b/docs/classes/DB_Util.html @@ -209,7 +209,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/Firebird.html b/docs/classes/Firebird.html index 64af4b0..710d93b 100644 --- a/docs/classes/Firebird.html +++ b/docs/classes/Firebird.html @@ -833,7 +833,7 @@ the last query executed
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/Firebird_Result.html b/docs/classes/Firebird_Result.html index 7f131bc..75798cf 100644 --- a/docs/classes/Firebird_Result.html +++ b/docs/classes/Firebird_Result.html @@ -504,7 +504,7 @@ the query
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/Firebird_SQL.html b/docs/classes/Firebird_SQL.html index 62a4149..8561bfe 100644 --- a/docs/classes/Firebird_SQL.html +++ b/docs/classes/Firebird_SQL.html @@ -297,7 +297,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/Firebird_Util.html b/docs/classes/Firebird_Util.html index 843b517..fd02a56 100644 --- a/docs/classes/Firebird_Util.html +++ b/docs/classes/Firebird_Util.html @@ -212,7 +212,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/MM.html b/docs/classes/MM.html index b7fa0f3..7323100 100644 --- a/docs/classes/MM.html +++ b/docs/classes/MM.html @@ -434,7 +434,7 @@ dynamic methods
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/MM_Controller.html b/docs/classes/MM_Controller.html index c8a95b7..639945b 100644 --- a/docs/classes/MM_Controller.html +++ b/docs/classes/MM_Controller.html @@ -108,9 +108,9 @@ 
    unserialize()
  •  Properties
    • -
  • Name of the current module
    $module
  • Reference to output class
    $output
    • -
  • Instance of Page class
    $page
    • +
  • » Protected
    • +
  • Instance of Page class
    $page
    • @@ -739,12 +739,6 @@

     Properties

    - 
    -

    Name of the current module

    -
    $module : string
    -
    -

    -
     

    Reference to output class

    $output : \MM_Output
    @@ -757,7 +751,7 @@
    - 
    + 

    Instance of Page class

    $page : \Page
    @@ -770,7 +764,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/MM_Model.html b/docs/classes/MM_Model.html index 09e722d..f6f61f9 100644 --- a/docs/classes/MM_Model.html +++ b/docs/classes/MM_Model.html @@ -728,7 +728,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/MM_Output.html b/docs/classes/MM_Output.html index 9cac4e6..75eef04 100644 --- a/docs/classes/MM_Output.html +++ b/docs/classes/MM_Output.html @@ -640,7 +640,7 @@ Used for outputing HTML
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/MM_Page.html b/docs/classes/MM_Page.html index c716c7b..0db936b 100644 --- a/docs/classes/MM_Page.html +++ b/docs/classes/MM_Page.html @@ -972,7 +972,7 @@ supports

    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/MySQL.html b/docs/classes/MySQL.html index 1e3d7ba..7ad8c63 100644 --- a/docs/classes/MySQL.html +++ b/docs/classes/MySQL.html @@ -869,7 +869,7 @@ the connection/database
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/MySQL_SQL.html b/docs/classes/MySQL_SQL.html index 1c1d4a0..606673e 100644 --- a/docs/classes/MySQL_SQL.html +++ b/docs/classes/MySQL_SQL.html @@ -281,7 +281,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/MySQL_Util.html b/docs/classes/MySQL_Util.html index b3c6f0b..23bdec8 100644 --- a/docs/classes/MySQL_Util.html +++ b/docs/classes/MySQL_Util.html @@ -208,7 +208,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/ODBC.html b/docs/classes/ODBC.html index 06f41a8..f47ba9e 100644 --- a/docs/classes/ODBC.html +++ b/docs/classes/ODBC.html @@ -871,7 +871,7 @@ the connection/database
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/ODBC_SQL.html b/docs/classes/ODBC_SQL.html index 1011d69..a768ec5 100644 --- a/docs/classes/ODBC_SQL.html +++ b/docs/classes/ODBC_SQL.html @@ -281,7 +281,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/ODBC_Util.html b/docs/classes/ODBC_Util.html index 3be31bf..2db109f 100644 --- a/docs/classes/ODBC_Util.html +++ b/docs/classes/ODBC_Util.html @@ -203,7 +203,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/PgSQL.html b/docs/classes/PgSQL.html index 4fd78ee..a64b9e4 100644 --- a/docs/classes/PgSQL.html +++ b/docs/classes/PgSQL.html @@ -871,7 +871,7 @@ the connection/database
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/PgSQL_SQL.html b/docs/classes/PgSQL_SQL.html index 06e8dd5..ba2331a 100644 --- a/docs/classes/PgSQL_SQL.html +++ b/docs/classes/PgSQL_SQL.html @@ -297,7 +297,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/PgSQL_Util.html b/docs/classes/PgSQL_Util.html index d25e102..f8cc97d 100644 --- a/docs/classes/PgSQL_Util.html +++ b/docs/classes/PgSQL_Util.html @@ -208,7 +208,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/Query_Builder.html b/docs/classes/Query_Builder.html index febe99e..0ab6a10 100644 --- a/docs/classes/Query_Builder.html +++ b/docs/classes/Query_Builder.html @@ -1222,7 +1222,7 @@ for complex select queries
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/SQLite.html b/docs/classes/SQLite.html index 80ea2bc..695d1aa 100644 --- a/docs/classes/SQLite.html +++ b/docs/classes/SQLite.html @@ -886,7 +886,7 @@ method if the database does not support 'TRUNCATE';
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/SQLite_SQL.html b/docs/classes/SQLite_SQL.html index 86138bd..0e83946 100644 --- a/docs/classes/SQLite_SQL.html +++ b/docs/classes/SQLite_SQL.html @@ -281,7 +281,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/SQLite_Util.html b/docs/classes/SQLite_Util.html index 5f6730b..53bfd26 100644 --- a/docs/classes/SQLite_Util.html +++ b/docs/classes/SQLite_Util.html @@ -208,7 +208,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/Settings.html b/docs/classes/Settings.html index 852d87a..833c7cd 100644 --- a/docs/classes/Settings.html +++ b/docs/classes/Settings.html @@ -244,7 +244,7 @@ directly - the settings should be safe!
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/Welcome.html b/docs/classes/Welcome.html index 9da3312..0d8495d 100644 --- a/docs/classes/Welcome.html +++ b/docs/classes/Welcome.html @@ -110,9 +110,9 @@ 
    unserialize()
  •  Properties
    • -
  • Name of the current module
    $module
  • Reference to output class
    $output
    • -
  • Instance of Page class
    $page
    • +
  • » Protected
    • +
  • Instance of Page class
    $page
    • @@ -869,18 +869,6 @@

     Properties

    - 
    -

    Name of the current module

    -
    $module : string
    -
    Inherited
    -
    -

    - - - -
    inherited_from\MM_Controller::$$module
    -
    -
     

    Reference to output class

    $output : \MM_Output
    @@ -899,7 +887,7 @@
    - 
    + 

    Instance of Page class

    $page : \Page
    Inherited
    @@ -918,7 +906,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/Welcome_Model.html b/docs/classes/Welcome_Model.html index 22e7d11..a010c33 100644 --- a/docs/classes/Welcome_Model.html +++ b/docs/classes/Welcome_Model.html @@ -846,7 +846,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/classes/miniMVC.html b/docs/classes/miniMVC.html index 0ce298e..0a96754 100644 --- a/docs/classes/miniMVC.html +++ b/docs/classes/miniMVC.html @@ -615,7 +615,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/deprecated.html b/docs/deprecated.html index 1dcc3bc..682a071 100644 --- a/docs/deprecated.html +++ b/docs/deprecated.html @@ -67,7 +67,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/errors.html b/docs/errors.html index 737a9ef..7ed242f 100644 --- a/docs/errors.html +++ b/docs/errors.html @@ -106,7 +106,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/graph_class.html b/docs/graph_class.html index ef5bccf..77f7217 100644 --- a/docs/graph_class.html +++ b/docs/graph_class.html @@ -64,7 +64,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/index.html b/docs/index.html index 38d9a7b..c2aedb1 100644 --- a/docs/index.html +++ b/docs/index.html @@ -80,7 +80,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/markers.html b/docs/markers.html index 7923db7..e8406e3 100644 --- a/docs/markers.html +++ b/docs/markers.html @@ -69,7 +69,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/namespaces/default.html b/docs/namespaces/default.html index 827408f..fb00058 100644 --- a/docs/namespaces/default.html +++ b/docs/namespaces/default.html @@ -89,23 +89,6 @@ -
    -

    PHP magic method to facilitate dynamically set static methods

    -
    __callStatic(string $name, array $args) 
    -
    -
    -

    -

    Parameters

    -
    -

    $name

    -string -
    -
    -

    $args

    -array -
    -
    -

    Magic function called when cloning an object

    __clone() 
    @@ -719,7 +702,7 @@ instantiates the specific db driver

    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/packages/.html b/docs/packages/.html index 7f3009a..b63005c 100644 --- a/docs/packages/.html +++ b/docs/packages/.html @@ -67,7 +67,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/packages/Default.html b/docs/packages/Default.html index 5ff4316..8e57b99 100644 --- a/docs/packages/Default.html +++ b/docs/packages/Default.html @@ -185,7 +185,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/packages/Query.Drivers.html b/docs/packages/Query.Drivers.html index 5acbad9..e23025d 100644 --- a/docs/packages/Query.Drivers.html +++ b/docs/packages/Query.Drivers.html @@ -211,7 +211,7 @@ data-fetching methods

    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/packages/Query.Helper Classes.html b/docs/packages/Query.Helper Classes.html index 7ca8f74..42d91f8 100644 --- a/docs/packages/Query.Helper Classes.html +++ b/docs/packages/Query.Helper Classes.html @@ -97,7 +97,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/packages/Query.Query.html b/docs/packages/Query.Query.html index 5e5f107..369ac09 100644 --- a/docs/packages/Query.Query.html +++ b/docs/packages/Query.Query.html @@ -115,7 +115,7 @@ instantiates the specific db driver

    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/packages/Query.html b/docs/packages/Query.html index 7b8c3e5..e88e694 100644 --- a/docs/packages/Query.html +++ b/docs/packages/Query.html @@ -316,7 +316,7 @@ instantiates the specific db driver

    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/packages/miniMVC.App.html b/docs/packages/miniMVC.App.html index b335eaa..b3634a1 100644 --- a/docs/packages/miniMVC.App.html +++ b/docs/packages/miniMVC.App.html @@ -139,7 +139,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/packages/miniMVC.System.html b/docs/packages/miniMVC.System.html index 21958e7..eea59ec 100644 --- a/docs/packages/miniMVC.System.html +++ b/docs/packages/miniMVC.System.html @@ -137,7 +137,7 @@
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/packages/miniMVC.html b/docs/packages/miniMVC.html index 0a9624a..11c48c4 100644 --- a/docs/packages/miniMVC.html +++ b/docs/packages/miniMVC.html @@ -70,7 +70,6 @@
  • Functions
  • PHP magic method to facilitate dynamic methods
    __call
    • -
  • PHP magic method to facilitate dynamically set static methods
    __callStatic
  • Magic function called when cloning an object
    __clone
  • Constructor for creating the objects
    __construct
  • PHP magic method that is called when an object is treated as a function
    __invoke
    • @@ -121,23 +120,6 @@ display them cleanly
    shutdown
    -
    -

    PHP magic method to facilitate dynamically set static methods

    -
    __callStatic(string $name, array $args) 
    -
    -
    -

    -

    Parameters

    -
    -

    $name

    -string -
    -
    -

    $args

    -array -
    -
    -

    Magic function called when cloning an object

    __clone() 
    @@ -492,7 +474,7 @@ display them cleanly
    + generated on 2012-05-01T16:39:04-04:00.
    diff --git a/docs/structure.xml b/docs/structure.xml index b56f1c4..9fc2bc6 100644 --- a/docs/structure.xml +++ b/docs/structure.xml @@ -5271,7 +5271,7 @@ the last query executed]]> - + Convention-based micro-framework for PHP

    ]]>     @@ -5539,7 +5539,7 @@ display them cleanly]]>     - + Convention-based micro-framework for PHP

    ]]>     @@ -5597,88 +5597,63 @@ display them cleanly]]> array - + __construct function - + array - + $params array - + __call function - + - + string - + array - + mixed - + $name - + $params - - __callStatic - function - - - - - string - - - array - - - - $name - - - - - $args - - array - - - + get_last_error function - + - + string     - + Convention-based micro-framework for PHP

    ]]>     @@ -5731,247 +5706,223 @@ the parent constructor unless the arguments match.]]> - - __callStatic - function - - - - - string - - - array - - - - $name - - - - - $args - - - - - + __toString function - + - + string - + __invoke function - + - + array - + \self - + $params - + get_instance function - + - + \self - + __clone function - + - + MM \MM \ArrayObject - + - - + + - + __construct function - + - + - + $members - + __call function - + - + string - + array - + mixed - + $name - + $params - + miniMVC \miniMVC \MM - + - - + + - + $output - + - + \MM_Output - + __construct function - + - + array - + $members - + __call function - + - + string - + array - + $name - + $args - + load_class function - + - + string - + string - + void - + $name - + $type - + unload function - + - + string - + $name - + load_config function - + - + string - + $name @@ -6546,7 +6497,7 @@ page.

    ]]>     - + Convention-based micro-framework for PHP

    ]]>     @@ -6566,7 +6517,7 @@ page.

    ]]>     - + $page @@ -6577,85 +6528,74 @@ page.

    ]]>     - - $module - - - - - - string - - - - + __construct function - + - + void - + load_model function - + - + string - + array - + void - + $file - + $args - + load_view function - + - + string - + array - + bool - + mixed - + $file - + $data array - + $return @@ -6663,7 +6603,7 @@ page.

    ]]>     - + Convention-based micro-framework for PHP

    ]]>     diff --git a/sys/common.php b/sys/common.php index 86f24ef..1cf5a14 100644 --- a/sys/common.php +++ b/sys/common.php @@ -316,10 +316,10 @@ function route() if(in_array($func, $methods)) { - $class = new $controller; - $class->module = $module; - - return call_user_func(array($class, $func)); + define('MM_MOD', $module); + + $class = new $controller(); + return call_user_func_array([&$class, $func], []); } // Function doesn't exist...404 diff --git a/sys/controller.php b/sys/controller.php index 223eb05..4112fdd 100644 --- a/sys/controller.php +++ b/sys/controller.php @@ -26,14 +26,7 @@ class MM_Controller extends miniMVC { * * @var Page */ - public $page; - - /** - * Name of the current module - * - * @var string - */ - public $module; + protected $page; /** * Create the controller object @@ -60,15 +53,15 @@ class MM_Controller extends miniMVC { public function load_model($file, $args=array()) { // The module is set via the router - $module = strtolower($this->module); + $module = strtolower(MM_MOD); $path = MM_MOD_PATH . "{$module}/models/{$file}.php"; - if(is_file($path)) + if (is_file($path)) { require_once($path); } - if( ! empty($args)) + if ( ! empty($args)) { $this->$file = new $file($args); @@ -93,18 +86,9 @@ class MM_Controller extends miniMVC { { $path = ""; - // The module is the lower of the class name - // need to figure out a way to allow multiple controllers - // in one module - $module = strtolower(get_class($this)); - - $not_modules = array('miniMVC', 'page', 'db', 'output'); - - // If it's a module, look in the module view folder - if( ! in_array($module, $not_modules)) - { - $path = MM_MOD_PATH . "{$module}/views/{$file}.php"; - } + // The module is set via the router + $module = strtolower(MM_MOD); + $path = MM_MOD_PATH . "{$module}/views/{$file}.php"; // If it's not a module, or doesn't exist in the module view folder // look in the app view folder @@ -133,7 +117,6 @@ class MM_Controller extends miniMVC { { $this->output->append_output($buffer); } - } } // End of controller.php \ No newline at end of file diff --git a/sys/db.php b/sys/db.php index 8b0d6e4..0211377 100644 --- a/sys/db.php +++ b/sys/db.php @@ -63,8 +63,7 @@ class DB extends Query_Builder { // -------------------------------------------------------------------------- /** - * Constructor to override PDO constructor - Quercus doesn't seem to override - * the parent constructor unless the arguments match. + * Constructor to override JSObject trait * * @param array $params */ @@ -88,22 +87,6 @@ class DB extends Query_Builder { { return parent::__call($name, $params); } - - // -------------------------------------------------------------------------- - - /** - * PHP magic methods to call non-static methods statically - * - * @param string $name - * @param array $args - */ - public static function __callStatic($name, array $args) - { - if(is_callable(parent::$name)) - { - return call_user_func_array(parent::$name, $args); - } - } // -------------------------------------------------------------------------- diff --git a/sys/miniMVC.php b/sys/miniMVC.php index e010327..266dff6 100644 --- a/sys/miniMVC.php +++ b/sys/miniMVC.php @@ -55,22 +55,6 @@ trait JSObject { } } - // -------------------------------------------------------------------------- - - /** - * PHP magic method to facilitate dynamically set static methods - * - * @param string $name - * @param array $args - */ - public static function __callStatic($name, $args) - { - if(is_callable(self::$name)) - { - return call_user_func_array(self::$name, $args); - } - } - // -------------------------------------------------------------------------- /** @@ -149,7 +133,7 @@ trait Singleton { * * @var self */ - private static $instance; + protected static $instance; /** * PHP magic method that is called when an object is treated as a function @@ -402,7 +386,6 @@ class miniMVC extends MM { require_once($path); } } - } // End of miniMVC.php \ No newline at end of file diff --git a/sys/output.php b/sys/output.php index a33190d..36a1585 100644 --- a/sys/output.php +++ b/sys/output.php @@ -131,7 +131,7 @@ class MM_Output extends MM { } else { - @header("$key: $val"); + @header("{$key}: {$val}"); } }