X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=public%2Findex.php;h=49cb018c3ac40b606b0ef9ae18db768f4608c177;hb=5cf2f2cb85b2fbb82cab5eb9ab34acdbb55238e5;hp=6685f6f62c64b43a48ab341c7343b84f46d54348;hpb=a530a988873f4c5d6eb7bf36601b9a42d3908428;p=zf2.biz%2Fgalerie.git

diff --git a/public/index.php b/public/index.php
index 6685f6f..49cb018 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,28 +1,12 @@
 <?php
-use Zend\Loader\AutoloaderFactory;
-use Zend\ServiceManager\ServiceManager;
-use Zend\Mvc\Service\ServiceManagerConfiguration;
-
+/**
+ * This makes our life easier when dealing with paths. Everything is relative
+ * to the application root now.
+ */
 chdir(dirname(__DIR__));
 
-// Allow using an alternative copy of ZF2
-if (getenv('ZF2_PATH')) {
-    require_once getenv('ZF2_PATH') . '/Zend/Loader/AutoloaderFactory.php';
-    AutoloaderFactory::factory();
-}
-
-// Composer autoloading
-if (!include_once('vendor/autoload.php')) {
-    throw new RuntimeException('vendor/autoload.php could not be found. Did you run `php composer.phar install`?');
-}
-
-// Get application stack configuration
-$configuration = include 'config/application.config.php';
-
-// Setup service manager
-$serviceManager = new ServiceManager(new ServiceManagerConfiguration($configuration['service_manager']));
-$serviceManager->setService('ApplicationConfiguration', $configuration);
-$serviceManager->get('ModuleManager')->loadModules();
+// Setup autoloading
+require 'init_autoloader.php';
 
-// Run application
-$serviceManager->get('Application')->bootstrap()->run()->send();
+// Run the application!
+Zend\Mvc\Application::init(require 'config/application.config.php')->run();