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

diff --git a/public/index.php b/public/index.php
index 5d7a3d7..49cb018 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,36 +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__));
 
-// Composer autoloading
-if (file_exists('vendor/autoload.php')) {
-    $loader = include 'vendor/autoload.php';
-}
-
-// Support for ZF2_PATH environment variable or git submodule
-if ($zf2Path = getenv('ZF2_PATH') ?: (is_dir('vendor/ZF2/library') ? 'vendor/ZF2/library' : false)) {
-    if (isset($loader)) {
-        $loader->add('Zend', $zf2Path . '/Zend');
-    } else {
-        include $zf2Path . '/Zend/Loader/AutoloaderFactory.php';
-        AutoloaderFactory::factory();
-    }
-}
-
-if (!class_exists('Zend\Loader\AutoloaderFactory')) {
-    throw new RuntimeException('Unable to load ZF2. Run `php composer.phar install` or define a ZF2_PATH environment variable.');
-}
-
-// 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();