From 49a829f7c9f2dd6a2e7212ed43ac0460d96e19ef Mon Sep 17 00:00:00 2001
From: Alex Saelens <alexandre.saelens@dna.co.nz>
Date: Mon, 15 Jan 2024 15:24:13 +1300
Subject: [PATCH 1/2] Remedy deprecated dynamic variable declaration (#354)

Co-authored-by: Michal Kleiner <mk@011.nz>
---
 src/Solr/Stores/SolrConfigStore_File.php   | 13 +++++++++++++
 src/Solr/Stores/SolrConfigStore_WebDAV.php | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/src/Solr/Stores/SolrConfigStore_File.php b/src/Solr/Stores/SolrConfigStore_File.php
index beecc38..0d76460 100644
--- a/src/Solr/Stores/SolrConfigStore_File.php
+++ b/src/Solr/Stores/SolrConfigStore_File.php
@@ -10,6 +10,19 @@ namespace SilverStripe\FullTextSearch\Solr\Stores;
  */
 class SolrConfigStore_File implements SolrConfigStore
 {
+    /**
+     * @var string
+     */
+    public $remote;
+
+    /**
+     * @var string
+     */
+    public $local;
+
+    /**
+     * @param array $config
+     */
     public function __construct($config)
     {
         $this->local = $config['path'];
diff --git a/src/Solr/Stores/SolrConfigStore_WebDAV.php b/src/Solr/Stores/SolrConfigStore_WebDAV.php
index 272913f..dff94b0 100644
--- a/src/Solr/Stores/SolrConfigStore_WebDAV.php
+++ b/src/Solr/Stores/SolrConfigStore_WebDAV.php
@@ -12,6 +12,19 @@ use SilverStripe\FullTextSearch\Utils\WebDAV;
  */
 class SolrConfigStore_WebDAV implements SolrConfigStore
 {
+    /**
+     * @var string
+     */
+    public $remote;
+
+    /**
+     * @var string
+     */
+    public $url;
+
+    /**
+     * @param array $config
+     */
     public function __construct($config)
     {
         $options = Solr::solr_options();

From e50b75c8ae5005a9cb85309eb87fea0fb3957526 Mon Sep 17 00:00:00 2001
From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com>
Date: Wed, 20 Mar 2024 12:06:39 +1300
Subject: [PATCH 2/2] DEP Use the canonical repository for proxy-db (#342)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 697a5b5..af290e6 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
         "monolog/monolog": "^3.2",
         "silverstripe/solr-php-client": "^1",
         "symfony/process": "^6.2",
-        "silverstripe/silverstripe-proxy-db": "^2",
+        "tractorcow/silverstripe-proxy-db": "^2",
         "ext-curl": "*"
     },
     "require-dev": {