Merge branch '4.0' into 4

DEP Use the canonical repository for proxy-db (#342 )
Remedy deprecated dynamic variable declaration (#354 )
2024-10-22 14:05:29 +02:00 · 2024-03-26 18:48:19 +13:00 · 2024-03-20 12:06:39 +13:00 · 2024-01-15 15:24:13 +13:00
3 changed files with 27 additions and 1 deletions
--- 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": {
--- 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'];
--- 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();
Author	SHA1	Message	Date
Steve Boyd	1dc17a7e75	Merge branch '4.0' into 4	2024-03-26 18:48:19 +13:00
Guy Sartorelli	e50b75c8ae	DEP Use the canonical repository for proxy-db (#342 )	2024-03-20 12:06:39 +13:00
Alex Saelens	49a829f7c9	Remedy deprecated dynamic variable declaration (#354 ) Co-authored-by: Michal Kleiner <mk@011.nz>	2024-01-15 15:24:13 +13:00