From: Kyle Spraggs <theman@spiffyjr.me>
Date: Fri, 18 May 2012 18:17:15 +0000 (-0500)
Subject: Removing merge files of index.php that snuck in.
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=81c165f105184cb6ab0d24f8ebafa744115fcb23;hp=d03f9a076b5ce119d1d02e20fe206a542387510c;p=zf2.biz%2Fgalerie.git

Removing merge files of index.php that snuck in.
---

diff --git a/public/index.php.BACKUP.6047.php b/public/index.php.BACKUP.6047.php
deleted file mode 100644
index 4307ece..0000000
--- a/public/index.php.BACKUP.6047.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-chdir(dirname(__DIR__));
-<<<<<<< HEAD
-require_once (getenv('ZF2_PATH') ?: 'vendor/ZendFramework/library') . '/Zend/Loader/AutoloaderFactory.php';
-Zend\Loader\AutoloaderFactory::factory();
-
-use Zend\Loader\AutoloaderFactory,
-Zend\ServiceManager\ServiceManager,
-Zend\Mvc\Service\ServiceManagerConfiguration;
-
-// setup autoloader
-AutoloaderFactory::factory();
-=======
-require_once('vendor/autoload.php');
-
-$appConfig        = include 'config/application.config.php';
-$sharedEvents     = new Zend\EventManager\SharedEventManager();
-$listenerOptions  = new Zend\Module\Listener\ListenerOptions($appConfig['module_listener_options']);
-$defaultListeners = new Zend\Module\Listener\DefaultListenerAggregate($listenerOptions);
-$defaultListeners->getConfigListener()->addConfigGlobPath("config/autoload/*.php");
->>>>>>> c994772... Added composer.lock to git.
-
-// 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();
-
-// run application
-$serviceManager->get('Application')->bootstrap()->run()->send();
diff --git a/public/index.php.BASE.6047.php b/public/index.php.BASE.6047.php
deleted file mode 100644
index 1738321..0000000
--- a/public/index.php.BASE.6047.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-chdir(dirname(__DIR__));
-require_once('vendor/autoload.php');
-Zend\Loader\AutoloaderFactory::factory();
-
-$appConfig = include 'config/application.config.php';
-
-$sharedEvents     = new Zend\EventManager\SharedEventManager();
-$listenerOptions  = new Zend\Module\Listener\ListenerOptions($appConfig['module_listener_options']);
-$defaultListeners = new Zend\Module\Listener\DefaultListenerAggregate($listenerOptions);
-$defaultListeners->getConfigListener()->addConfigGlobPath("config/autoload/*.php");
-    
-
-$moduleManager = new Zend\Module\Manager($appConfig['modules']);
-$events        = $moduleManager->events();
-$events->setSharedManager($sharedEvents);
-$events->attach($defaultListeners);
-$moduleManager->loadModules();
-
-// Create application, bootstrap, and run
-$bootstrap   = new Zend\Mvc\Bootstrap($defaultListeners->getConfigListener()->getMergedConfig());
-$bootstrap->events()->setSharedManager($sharedEvents);
-$application = new Zend\Mvc\Application;
-$bootstrap->bootstrap($application);
-$application->run()->send();
diff --git a/public/index.php.LOCAL.6047.php b/public/index.php.LOCAL.6047.php
deleted file mode 100644
index 79cd64f..0000000
--- a/public/index.php.LOCAL.6047.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-chdir(dirname(__DIR__));
-require_once (getenv('ZF2_PATH') ?: 'vendor/ZendFramework/library') . '/Zend/Loader/AutoloaderFactory.php';
-Zend\Loader\AutoloaderFactory::factory();
-
-use Zend\Loader\AutoloaderFactory,
-Zend\ServiceManager\ServiceManager,
-Zend\Mvc\Service\ServiceManagerConfiguration;
-
-// setup autoloader
-AutoloaderFactory::factory();
-
-// 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();
-
-// run application
-$serviceManager->get('Application')->bootstrap()->run()->send();
diff --git a/public/index.php.REMOTE.6047.php b/public/index.php.REMOTE.6047.php
deleted file mode 100644
index 05f5332..0000000
--- a/public/index.php.REMOTE.6047.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-chdir(dirname(__DIR__));
-require_once('vendor/autoload.php');
-
-$appConfig        = include 'config/application.config.php';
-$sharedEvents     = new Zend\EventManager\SharedEventManager();
-$listenerOptions  = new Zend\Module\Listener\ListenerOptions($appConfig['module_listener_options']);
-$defaultListeners = new Zend\Module\Listener\DefaultListenerAggregate($listenerOptions);
-$defaultListeners->getConfigListener()->addConfigGlobPath("config/autoload/*.php");
-
-$moduleManager = new Zend\Module\Manager($appConfig['modules']);
-$events        = $moduleManager->events();
-$events->setSharedManager($sharedEvents);
-$events->attach($defaultListeners);
-$moduleManager->loadModules();
-
-// Create application, bootstrap, and run
-$bootstrap   = new Zend\Mvc\Bootstrap($defaultListeners->getConfigListener()->getMergedConfig());
-$bootstrap->events()->setSharedManager($sharedEvents);
-$application = new Zend\Mvc\Application;
-$bootstrap->bootstrap($application);
-$application->run()->send();
diff --git a/public/index.php.orig b/public/index.php.orig
deleted file mode 100644
index a19b2e4..0000000
--- a/public/index.php.orig
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-chdir(dirname(__DIR__));
-<<<<<<< HEAD
-require_once('vendor/autoload.php');
-
-$appConfig        = include 'config/application.config.php';
-$sharedEvents     = new Zend\EventManager\SharedEventManager();
-$listenerOptions  = new Zend\Module\Listener\ListenerOptions($appConfig['module_listener_options']);
-$defaultListeners = new Zend\Module\Listener\DefaultListenerAggregate($listenerOptions);
-$defaultListeners->getConfigListener()->addConfigGlobPath("config/autoload/*.php");
-=======
-require_once (getenv('ZF2_PATH') ?: 'vendor/ZendFramework/library') . '/Zend/Loader/AutoloaderFactory.php';
-
-use Zend\Loader\AutoloaderFactory,
-Zend\ServiceManager\ServiceManager,
-Zend\Mvc\Service\ServiceManagerConfiguration;
-
-// setup autoloader
-AutoloaderFactory::factory();
->>>>>>> master
-
-// 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();
-
-// run application
-$serviceManager->get('Application')->bootstrap()->run()->send();