[Wact-cvs] wact/framework/di di.inc.php,1.5,1.6

[Jeff M. <jef...@us...>]

Update of /cvsroot/wact/wact/framework/di
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8302/framework/di

Modified Files:
	di.inc.php 
Log Message:
Added WactRegisterClassLoader to simulate autoload in PHP 4 and to manage
multiple autoload functions in PHP 5 and 4.
Changed event.inc.php to use the new WACT class registry, introducing a new
dependency for that package.
Changed di.inc.php to also use the new WACT class registry, replacing
a dependency on event.inc.php.
Removed __autoload functions in favor of the new mechanisms declared in 
wact.inc.php.
Copied the class registry stuff from wact.inc.php to common.inc.php to keep
everything working.


Index: di.inc.php
===================================================================
RCS file: /cvsroot/wact/wact/framework/di/di.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** di.inc.php	24 Oct 2005 09:09:24 -0000	1.5
--- di.inc.php	31 Oct 2005 04:15:35 -0000	1.6
***************
*** 9,15 ****
  */
  
- require_once WACT_ROOT . '/event/event.inc.php';
- 
- 
  // We should probably call method_exists on a factory before calling acceptRegistry
  
--- 9,12 ----
***************
*** 132,136 ****
      */
      function &_createObject() {
!         ensureClassAvailable($this->class, $this->file);
  
          $args = $this->args;
--- 129,133 ----
      */
      function &_createObject() {
!         WactRequireClass($this->class, $this->file);
  
          $args = $this->args;