From c6f613686720c0c3eeebbb22000a19f1f03328f0 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 29 Sep 2014 10:07:47 -0400
Subject: [PATCH] Eliminated unused parameters.
---
.../src/VuFind/Controller/QRCodeController.php | 4 +---
module/VuFind/src/VuFind/QRCode/Loader.php | 14 +-------------
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/module/VuFind/src/VuFind/Controller/QRCodeController.php b/module/VuFind/src/VuFind/Controller/QRCodeController.php
index ba6e7055c3b..1064045555d 100644
--- a/module/VuFind/src/VuFind/Controller/QRCodeController.php
+++ b/module/VuFind/src/VuFind/Controller/QRCodeController.php
@@ -59,9 +59,7 @@ class QRCodeController extends AbstractBase
if (!$this->loader) {
$this->loader = new Loader(
$this->getConfig(),
- $this->getServiceLocator()->get('VuFindTheme\ThemeInfo'),
- $this->getServiceLocator()->get('VuFind\Http')->createClient(),
- $this->getServiceLocator()->get('VuFind\CacheManager')->getCacheDir()
+ $this->getServiceLocator()->get('VuFindTheme\ThemeInfo')
);
\VuFind\ServiceManager\Initializer::initInstance(
$this->loader, $this->getServiceLocator()
diff --git a/module/VuFind/src/VuFind/QRCode/Loader.php b/module/VuFind/src/VuFind/QRCode/Loader.php
index 9c87de894e1..2bf41a2c275 100644
--- a/module/VuFind/src/VuFind/QRCode/Loader.php
+++ b/module/VuFind/src/VuFind/QRCode/Loader.php
@@ -43,7 +43,6 @@ use \PHPQRCode, Zend\Log\LoggerInterface;
*/
class Loader implements \Zend\Log\LoggerAwareInterface
{
-
/**
* property to hold VuFind configuration settings
*
@@ -51,13 +50,6 @@ class Loader implements \Zend\Log\LoggerAwareInterface
*/
protected $config;
- /**
- * HTTP client
- *
- * @var \Zend\Http\Client
- */
- protected $client;
-
/**
* Property for storing raw qrcode data; may be null if image is unavailable
*
@@ -107,14 +99,10 @@ class Loader implements \Zend\Log\LoggerAwareInterface
*
* @param \Zend\Config\Config $config VuFind configuration
* @param \VuFindTheme\ThemeInfo $theme VuFind theme tools
- * @param \Zend\Http\Client $client HTTP client
*/
- public function __construct($config, \VuFindTheme\ThemeInfo $theme,
- \Zend\Http\Client $client
- ) {
+ public function __construct($config, \VuFindTheme\ThemeInfo $theme) {
$this->config = $config;
$this->themeTools = $theme;
- $this->client = $client;
}
/**
--
GitLab