Skip to content
Snippets Groups Projects
Commit eb6f89db authored by Demian Katz's avatar Demian Katz
Browse files

Hooked up VuFindHttp module.

parent 24c963ba
No related merge requests found
<?php
$config = array(
'modules' => array(
'VuFind',
'VuFindHttp', 'VuFind',
),
'module_listener_options' => array(
'config_glob_paths' => array(
......
......@@ -409,6 +409,17 @@ $config = array(
'VuFind\DbAdapter' => function ($sm) {
return \VuFind\Db\AdapterFactory::getAdapter();
},
'VuFind\Http' => function ($sm) {
$config = \VuFind\Config\Reader::getConfig();
$options = array();
if (isset($config->Proxy->host)) {
$options['proxy_host'] = $config->Proxy->host;
if (isset($config->Proxy->port)) {
$options['proxy_port'] = $config->Proxy->port;
}
}
return new \VuFindHttp\HttpService($options);
},
'VuFind\ILSConnection' => function ($sm) {
$catalog = new \VuFind\ILS\Connection();
return $catalog
......@@ -498,6 +509,11 @@ $config = array(
),
),
'translator' => array(),
'view_helpers' => array(
'initializers' => array(
array('VuFind\ServiceManager\Initializer', 'initZendPlugin'),
),
),
'view_manager' => array(
'display_not_found_reason' => APPLICATION_ENV == 'development',
'display_exceptions' => APPLICATION_ENV == 'development',
......
......@@ -58,6 +58,28 @@ class Initializer
if ($instance instanceof \VuFind\I18n\Translator\TranslatorAwareInterface) {
$instance->setTranslator($sm->get('VuFind\Translator'));
}
if ($instance instanceof \VuFindHttp\HttpServiceAwareInterface) {
$instance->setHttpService($sm->get('VuFind\Http'));
}
return $instance;
}
/**
* Given a Zend Framework Plugin Manager, initialize the instance.
*
* @param object $instance Instance to
* initialize
* @param \Zend\ServiceManager\AbstractPluginManager $manager Plugin manager
*
* @return object
*/
public static function initZendPlugin($instance,
\Zend\ServiceManager\AbstractPluginManager $manager
) {
$sm = $manager->getServiceLocator();
if (null !== $sm) {
static::initInstance($instance, $sm);
}
return $instance;
}
......@@ -71,10 +93,7 @@ class Initializer
*/
public static function initPlugin($instance, AbstractPluginManager $manager)
{
$sm = $manager->getServiceLocator();
if (null !== $sm) {
static::initInstance($instance, $sm);
}
static::initZendPlugin($instance, $manager);
if (method_exists($instance, 'setPluginManager')) {
$instance->setPluginManager($manager);
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment