From e492d953383cf1ecf76a866fecb9e561e9c8d9bd Mon Sep 17 00:00:00 2001
From: David Maus <dmaus@ictsoc.de>
Date: Sun, 30 Jun 2013 10:20:37 +0200
Subject: [PATCH] Remove deprecated functionality
The Service is setup in VuFind main module, the module does nothing
special except providing the classes and an autoloader configuration.
---
module/VuFindHttp/Module.php | 54 --------------------------
module/VuFindHttp/config/http.conf.php | 11 ------
2 files changed, 65 deletions(-)
delete mode 100644 module/VuFindHttp/config/http.conf.php
diff --git a/module/VuFindHttp/Module.php b/module/VuFindHttp/Module.php
index e906daa34bd..c690efc56a3 100644
--- a/module/VuFindHttp/Module.php
+++ b/module/VuFindHttp/Module.php
@@ -42,13 +42,6 @@ namespace VuFindHttp;
class Module
{
- /**
- * Relative path to search service configuration.
- *
- * @var string
- */
- protected $configPath = 'config/http.conf.php';
-
/**
* Return autoloader configuration.
*
@@ -65,51 +58,4 @@ class Module
);
}
- /**
- * Return module configuration.
- *
- * @return array
- */
- public function getConfig()
- {
- return array();
- }
-
- /**
- * Initialize module.
- *
- * @return void
- */
- public function init()
- {
- }
-
- /**
- * Return service configuration.
- *
- * @return array
- */
- public function getServiceConfig()
- {
- return array(
- 'factories' => array(
- 'VuFind\Http' => array($this, 'setup'),
- )
- );
- }
-
- /**
- * Return configured http service to superior service manager.
- *
- * @return \VuFind\Service\Search
- */
- public function setup()
- {
- $config = include realpath(__DIR__ . '/' . $this->configPath);
-
- $di = new \Zend\Di\Di();
- $di->configure(new \Zend\Di\Config($config));
- return $di->get('VuFindHttp\HttpService');
- }
-
}
\ No newline at end of file
diff --git a/module/VuFindHttp/config/http.conf.php b/module/VuFindHttp/config/http.conf.php
deleted file mode 100644
index 4e539c30e99..00000000000
--- a/module/VuFindHttp/config/http.conf.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-return array(
- 'instance' => array(
- 'VuFindHttp\HttpService' => array(
- 'parameters' => array(
- 'proxyConfig' => array(),
- )
- )
- )
-);
--
GitLab