Updated autoloading

styxiak · Nov 3, 2010 · 1f244fb · 1f244fb
1 parent 8617622
commit 1f244fb
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/demos/Zend/Service/LiveDocx/Bootstrap.php b/demos/Zend/Service/LiveDocx/Bootstrap.php
@@ -1,23 +1,22 @@
 <?php
 
 // Set used namespaces
-use Zend\Loader\Autoloader;
 use Zend\Locale\Locale;
 use Zend\Registry;
 use Zend\Service\LiveDocx\Helper;
 
 // Turn up error reporting
 error_reporting(E_ALL | E_STRICT);
 
-// Set path to libraries
-set_include_path(
-    __DIR__ . DIRECTORY_SEPARATOR . 'library' . PATH_SEPARATOR .
-    dirname(dirname(dirname(dirname(__DIR__)))) . DIRECTORY_SEPARATOR . 'library'
-);
+// Set up autoloader
+$base = dirname(dirname(dirname(dirname(__DIR__))));
+require_once "{$base}/library/Zend/Loader/StandardAutoloader.php";
+$loader = new \Zend\Loader\StandardAutoloader();
+$loader->registerNamespace('Zend', "{$base}/library/Zend");
+$loader->register();
 
-// Set autoloader to autoload libraries
-require_once 'Zend/Loader/Autoloader.php';
-Autoloader::getInstance();
+// Include utility class
+require_once "{$base}/demos/Zend/Service/LiveDocx/library/Zend/Service/LiveDocx/Helper.php";
 
 // Set default locale
 Locale::setDefault(Helper::LOCALE);
@@ -29,3 +28,5 @@
     Helper::printLine(Helper::credentialsHowTo());
     exit();
 }
+
+unset($base);