From c54f683e953a87d9adf0bf889be0e86affe44676 Mon Sep 17 00:00:00 2001
From: Garion Herman <garion@silverstripe.com>
Date: Thu, 18 Jul 2019 14:52:45 +1200
Subject: [PATCH 1/2] FIX Make remotepath optional to restore compatibility
 with CWP

---
 src/Solr/Stores/SolrConfigStore_Post.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Solr/Stores/SolrConfigStore_Post.php b/src/Solr/Stores/SolrConfigStore_Post.php
index 7d40f68..6f90b62 100644
--- a/src/Solr/Stores/SolrConfigStore_Post.php
+++ b/src/Solr/Stores/SolrConfigStore_Post.php
@@ -30,7 +30,10 @@ class SolrConfigStore_Post implements SolrConfigStore
             $options['host'] . ':' . $options['port'],
             $config['path']
         ]);
-        $this->remote = $config['remotepath'];
+
+        if (isset($config['remotepath'])) {
+            $this->remote = $config['remotepath'];
+        }
     }
 
     /**

From 1fb7830ff16b7ccb66f450f9057d885bb23fb341 Mon Sep 17 00:00:00 2001
From: Garion Herman <garion@silverstripe.com>
Date: Thu, 18 Jul 2019 15:38:06 +1200
Subject: [PATCH 2/2] Update core releases tested against in Travis config

---
 .travis.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6f10070..d3aa51f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,13 +7,13 @@ env:
 matrix:
   include:
     - php: 5.6
-      env: DB=MYSQL INSTALLER_VERSION=4.0.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
+      env: DB=MYSQL INSTALLER_VERSION=4.2.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
     - php: 7.0
-      env: DB=PGSQL INSTALLER_VERSION=4.1.x-dev PHPUNIT_TEST=1
+      env: DB=PGSQL INSTALLER_VERSION=4.3.x-dev PHPUNIT_TEST=1
     - php: 7.1
-      env: DB=MYSQL INSTALLER_VERSION=4.1.x-dev PHPUNIT_COVERAGE_TEST=1
+      env: DB=MYSQL INSTALLER_VERSION=4.3.x-dev PHPUNIT_COVERAGE_TEST=1
     - php: 7.1
-      env: DB=MYSQL INSTALLER_VERSION=4.2.x-dev PHPUNIT_TEST=1 SUBSITES=1
+      env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1 SUBSITES=1
     - php: 7.2
       env: DB=MYSQL INSTALLER_VERSION=4.x-dev PHPUNIT_TEST=1
 
@@ -24,8 +24,8 @@ before_script:
 
   - composer validate
   - composer require --no-update symbiote/silverstripe-queuedjobs ^4.0
-  - if [[ $SUBSITES ]]; then composer require --no-update silverstripe/subsites 2.0.x-dev; fi
-  - if [[ $DB == "PGSQL" ]]; then composer require --no-update silverstripe/postgresql 2.0.x-dev; fi
+  - if [[ $SUBSITES ]]; then composer require --no-update silverstripe/subsites 2.3.x-dev; fi
+  - if [[ $DB == "PGSQL" ]]; then composer require --no-update silverstripe/postgresql 2.3.x-dev; fi
   - composer require --no-update silverstripe/installer "$INSTALLER_VERSION"
   - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile