Skip to content
Browse files

ZF-10650: ensure zf.php works with new autoloader system

- s/Autoloader/StandardAutoloader/
- Also, use appropriately -- must call register(), not a singleton, etc.
  • Loading branch information...
1 parent d4ec1fd commit bf40461ac0ba2cf7a7f901abb536919d4b4f9d23 @weierophinney weierophinney committed Nov 8, 2010
Showing with 5 additions and 4 deletions.
  1. +5 −4 bin/zf.php
View
9 bin/zf.php
@@ -383,14 +383,14 @@ protected function _setupToolRuntime()
protected function _tryClientLoad()
{
$this->_clientLoaded = false;
- $fh = @fopen('Zend/Loader/Autoloader.php', 'r', true);
+ $fh = @fopen('Zend/Loader/StandardAutoloader.php', 'r', true);
if (!$fh) {
return $this->_clientLoaded; // false
} else {
fclose($fh);
unset($fh);
- include 'Zend/Loader/Autoloader.php';
- $this->_clientLoaded = class_exists('Zend\Loader\Autoloader', false);
+ include 'Zend/Loader/StandardAutoloader.php';
+ $this->_clientLoaded = class_exists('Zend\Loader\StandardAutoloader', false);
}
return $this->_clientLoaded;
@@ -604,7 +604,8 @@ protected function _runTool()
// ensure that zf.php loads the Zend_Tool_Project features
$configOptions['classesToLoad'] = 'Zend\Tool\Project\Provider\Manifest';
- Zend\Loader\Autoloader::getInstance();
+ $autoloader = new Zend\Loader\StandardAutoloader();
+ $autoloader->register();
$console = new Zend\Tool\Framework\Client\Console\Console($configOptions);
$console->dispatch();

0 comments on commit bf40461

Please sign in to comment.
Something went wrong with that request. Please try again.