Merge branch 'master' into feature/composer

Conflicts:
	public/index.php
	vendor/ZendFramework

diff --cc public/index.php
index 05f5332,2868a5c..adaa631
--- 1/public/index.php
--- 2/public/index.php
+++ b/public/index.php
@@@ -1,22 -1,21 +1,19 @@@
  <?php
 -chdir(dirname(__DIR__));
 -require_once (getenv('ZF2_PATH') ?: 'vendor/ZendFramework/library') . '/Zend/Loader/AutoloaderFactory.php';
++use Zend\ServiceManager\ServiceManager,
++    Zend\Mvc\Service\ServiceManagerConfiguration;
+ 
 -use Zend\Loader\AutoloaderFactory,
 -Zend\ServiceManager\ServiceManager,
 -Zend\Mvc\Service\ServiceManagerConfiguration;
 +chdir(dirname(__DIR__));
+ 
 -// setup autoloader
 -AutoloaderFactory::factory();
++// Composer autoloading
 +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");
 -// get application stack configuration
++// Get application stack configuration.
+ $configuration = include 'config/application.config.php';
  
- $moduleManager = new Zend\Module\Manager($appConfig['modules']);
- $events        = $moduleManager->events();
- $events->setSharedManager($sharedEvents);
- $events->attach($defaultListeners);
- $moduleManager->loadModules();
 -// setup service manager
++// Setup service manager.
+ $serviceManager = new ServiceManager(new ServiceManagerConfiguration($configuration['service_manager']));
+ $serviceManager->setService('ApplicationConfiguration', $configuration);
+ $serviceManager->get('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();
 -// run application
 -$serviceManager->get('Application')->bootstrap()->run()->send();
++// Run application.
++$serviceManager->get('Application')->bootstrap()->run()->send();

diff --cc public/index.php.BACKUP.6047.php
index 0000000,0000000..4307ece
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/public/index.php.BACKUP.6047.php
@@@ -1,0 -1,0 +1,32 @@@
++<?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 --cc public/index.php.BASE.6047.php
index 0000000,0000000..1738321
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/public/index.php.BASE.6047.php
@@@ -1,0 -1,0 +1,25 @@@
++<?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 --cc public/index.php.LOCAL.6047.php
index 0000000,0000000..79cd64f
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/public/index.php.LOCAL.6047.php
@@@ -1,0 -1,0 +1,22 @@@
++<?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 --cc public/index.php.REMOTE.6047.php
index 0000000,0000000..05f5332
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/public/index.php.REMOTE.6047.php
@@@ -1,0 -1,0 +1,22 @@@
++<?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 --cc public/index.php.orig
index 0000000,0000000..a19b2e4
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/public/index.php.orig
@@@ -1,0 -1,0 +1,31 @@@
++<?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();