From 76353450545f9493653eb7ff5c77282b82c7549f Mon Sep 17 00:00:00 2001 From: Alexandre Saelens Date: Thu, 21 Dec 2023 09:06:15 +1300 Subject: [PATCH 1/4] Remedy deprecated dynamic variable declaration --- src/Solr/Stores/SolrConfigStore_File.php | 15 ++++++++++++++- src/Solr/Stores/SolrConfigStore_WebDAV.php | 13 +++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/Solr/Stores/SolrConfigStore_File.php b/src/Solr/Stores/SolrConfigStore_File.php index beecc38c..dc099d53 100644 --- a/src/Solr/Stores/SolrConfigStore_File.php +++ b/src/Solr/Stores/SolrConfigStore_File.php @@ -10,6 +10,19 @@ */ class SolrConfigStore_File implements SolrConfigStore { + /** + * @var string + */ + protected $remote = ''; + + /** + * @var string + */ + protected $local = ''; + + /** + * @param array $config + */ public function __construct($config) { $this->local = $config['path']; @@ -49,4 +62,4 @@ public function instanceDir($index) { return $this->remote . '/' . $index; } -} +} \ No newline at end of file diff --git a/src/Solr/Stores/SolrConfigStore_WebDAV.php b/src/Solr/Stores/SolrConfigStore_WebDAV.php index 272913f7..5d056c03 100644 --- a/src/Solr/Stores/SolrConfigStore_WebDAV.php +++ b/src/Solr/Stores/SolrConfigStore_WebDAV.php @@ -12,6 +12,19 @@ */ class SolrConfigStore_WebDAV implements SolrConfigStore { + /** + * @var string + */ + protected $remote = ''; + + /** + * @var string + */ + protected $url = ''; + + /** + * @param array $config + */ public function __construct($config) { $options = Solr::solr_options(); From 9ae64b44458578e3584a5dd90cd91760c295ac97 Mon Sep 17 00:00:00 2001 From: Alex Saelens Date: Thu, 21 Dec 2023 10:00:13 +1300 Subject: [PATCH 2/4] Update SolrConfigStore_File.php --- src/Solr/Stores/SolrConfigStore_File.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Solr/Stores/SolrConfigStore_File.php b/src/Solr/Stores/SolrConfigStore_File.php index dc099d53..87fd9d69 100644 --- a/src/Solr/Stores/SolrConfigStore_File.php +++ b/src/Solr/Stores/SolrConfigStore_File.php @@ -62,4 +62,4 @@ public function instanceDir($index) { return $this->remote . '/' . $index; } -} \ No newline at end of file +} From f4d3272c64a2599dad4533ed4c10973a21f52c50 Mon Sep 17 00:00:00 2001 From: Alex Saelens Date: Mon, 15 Jan 2024 15:05:15 +1300 Subject: [PATCH 3/4] Update src/Solr/Stores/SolrConfigStore_File.php Co-authored-by: Michal Kleiner --- src/Solr/Stores/SolrConfigStore_File.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Solr/Stores/SolrConfigStore_File.php b/src/Solr/Stores/SolrConfigStore_File.php index 87fd9d69..0d764606 100644 --- a/src/Solr/Stores/SolrConfigStore_File.php +++ b/src/Solr/Stores/SolrConfigStore_File.php @@ -13,12 +13,12 @@ class SolrConfigStore_File implements SolrConfigStore /** * @var string */ - protected $remote = ''; + public $remote; /** * @var string */ - protected $local = ''; + public $local; /** * @param array $config From 9aaf67ea0d31fe5fc2ce9850b0898f3994287b50 Mon Sep 17 00:00:00 2001 From: Alex Saelens Date: Mon, 15 Jan 2024 15:05:22 +1300 Subject: [PATCH 4/4] Update src/Solr/Stores/SolrConfigStore_WebDAV.php Co-authored-by: Michal Kleiner --- src/Solr/Stores/SolrConfigStore_WebDAV.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Solr/Stores/SolrConfigStore_WebDAV.php b/src/Solr/Stores/SolrConfigStore_WebDAV.php index 5d056c03..dff94b0a 100644 --- a/src/Solr/Stores/SolrConfigStore_WebDAV.php +++ b/src/Solr/Stores/SolrConfigStore_WebDAV.php @@ -15,12 +15,12 @@ class SolrConfigStore_WebDAV implements SolrConfigStore /** * @var string */ - protected $remote = ''; + public $remote; /** * @var string */ - protected $url = ''; + public $url; /** * @param array $config