Permalink
Browse files

Unit tests working, CodeIgniter tests added

  • Loading branch information...
1 parent 14a09a3 commit 3ae52e6dcbfd43735be2802680636843d030e4fc @dchill42 committed Sep 3, 2012
View
@@ -1,132 +0,0 @@
-index.php:
- define paths
- include CodeIgniter.php
-
-CodeIgniter.php:
- declare app core
- define version
- include Common.php
-
- assign subclass_prefix (load config)
- declare instance function
- create instance
- load subclass
- set exception handler
- kill magic quotes
- load Config
- get constants
- load Loader
- load Benchmark
- mark starts
- assign config
- load Hooks
- pre_system hook
- load UTF-8
- load Output
- load URI
- load Router
- set routing
- set overrides
- cache_override hook
- display cache
- load Security
- load Input
- load Lang
- Autoloader
- mark base_classes_end
-
- pre_controller hook
- route request
- mark controller_start
- load Controller
- post_controll_ctor hook
- call Controller
- mark controller_end
- post_controller hook
- display_override hook
- display output
- post_system hook
-
-
-REFACTOR
---------
-index.php:
- define paths
- include CodeIgniter.php
- create instance (pass APPPATH)
- run instance
-
-CodeIgniter.php:
- define version
- declare app core
- declare instance function
- include Common.php
-
- CodeIgniter::instance():
- load config.php (from path param if given)
- assign config (from assign param if given)
- load subclass
- instantiate class
-
- CodeIgniter::__construct()
- set exception handler
- kill magic quotes
- set path arrays (from constants)
-
- CodeIgniter::run()
- Flag running
- _load_core()
- _load_controller()
- Clear flag
-
- CodeIgniter::_load_core_class()
- Check if name exists
- Load class from library path
- Load extension from mvc paths
- exit if not found
- Add new object under name
-
- CodeIgniter::_load_core()
- load Config
- get constants
- load Loader
- load Benchmark
- mark starts
- load Hooks
- pre_system hook
- load UTF-8
- load Output
- load URI
- load Router
- set routing
- set overrides
- cache_override hook
- display cache
- load Security
- load Input
- load Lang
- Autoloader
- mark base_classes_end
-
- CodeIgniter::_load_controller()
- pre_controller hook
- route request
- mark controller_start
- load Controller
- post_controll_ctor hook
- call Controller
-
- CodeIgniter::_destruct()
- mark controller_end
- post_controller hook
- display_override hook
- display output
- post_system hook
-
- CodeIgniter::log_message()
- CodeIgniter::_exception_handler()
-
-DEPRECATE:
- html_escape
- _stringify_attributes
-
View
@@ -275,31 +275,13 @@
/*
* --------------------------------------------------------------------
- * Set empty override arguments if not defined above
- * --------------------------------------------------------------------
- */
- // Check config overrides
- if ( ! isset($assign_to_config))
- {
- $assign_to_config = array();
- }
-
- // Check routing overrides
- if ( ! isset($routing))
- {
- $routing = array();
- }
-
-/*
- * --------------------------------------------------------------------
* LOAD THE BOOTSTRAP FILE
* --------------------------------------------------------------------
*
* And away we go...
*/
require_once BASEPATH.'core/CodeIgniter.php';
-$CI =& CodeIgniter::instance($assign_to_config);
-$CI->run($routing);
+CodeIgniter::instance()->run();
/* End of file index.php */
/* Location: ./index.php */
Oops, something went wrong.

0 comments on commit 3ae52e6

Please sign in to comment.