Merge branch '4.0' into 4

silverstripe · Mar 26, 2024 · 1dc17a7 · 1dc17a7
2 parents 0f62997 + e50b75c
commit 1dc17a7
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git 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": {

diff --git 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
+     */
+    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
@@ -12,6 +12,19 @@
  */
 class SolrConfigStore_WebDAV implements SolrConfigStore
 {
+    /**
+     * @var string
+     */
+    public $remote;
+
+    /**
+     * @var string
+     */
+    public $url;
+
+    /**
+     * @param array $config
+     */
     public function __construct($config)
     {
         $options = Solr::solr_options();