Merge branch 'master-v5' into instance/fid

module/finc/sql/migrations/mysql/migrateData_Vufind1ToVufind5_Common.sql

@@ -194,14 +194,6 @@ ALTER TABLE session
   MODIFY COLUMN data mediumtext,
   MODIFY COLUMN created datetime NOT NULL DEFAULT '2000-01-01 00:00:00';
   
--- Apply constraint modifications  
-
-ALTER TABLE session
-   DROP INDEX last_used;
-   
-ALTER TABLE session
-  ADD UNIQUE(last_used); 
-  
 -- Set chracter set to utf8  
 
 ALTER TABLE session

module/finc/src/finc/Resolver/Driver/Redi.php

@@ -9,6 +9,7 @@
  * @category VuFind
  * @package  Resolver_Drivers
  * @author   Robert Lange <lange@ub.uni-leipzig.de>
+ * @author   Gregor Gawol <gawol@ub.uni-leipzig.de>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development:plugins:link_resolver_drivers Wiki
  */
@@ -22,6 +23,7 @@ use \VuFind\Resolver\Driver\Redi as RediBase;
  * @category VuFind
  * @package  Resolver_Drivers
  * @author   Robert Lange <lange@ub.uni-leipzig.de>
+ * @author   Gregor Gawol <gawol@ub.uni-leipzig.de>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development:plugins:link_resolver_drivers Wiki
  */
@@ -29,6 +31,18 @@ class Redi extends RediBase
 {
     use ResolverTrait;
 
+    /**
+     * Constructor
+     *
+     * @param string            $config     redi configuration
+     * @param \Zend\Http\Client $httpClient HTTP client
+     */
+    public function __construct($config, \Zend\Http\Client $httpClient)
+    {
+        $this->baseUrl = $config->url;
+        $this->httpClient = $httpClient;
+    }
+
     /**
      * Fetch Links
      *