Hans/no subsites (#124)

* Remove subsites as a part of the code

* Remove subsites from circleci and extensions

* Add suggestion

* Add subsite to the docs

* Can return null for current state

.circleci/config.yml

@@ -60,7 +60,6 @@ jobs:
           command: |
             cp .circleci/.env.test ./.env
             cp .circleci/CircleCITestIndex.phpsrc app/src/CircleCITestIndex.php
-            cp .circleci/Subsite.phpsrc app/src/Subsite.php
             cp .circleci/TestIndexTwo.yml app/_config/search.yml
       - run: vendor/bin/sake dev/build flush=all skipannotation=true
       - run:
@@ -184,7 +183,6 @@ jobs:
           command: |
             cp .circleci/.env.test ./.env
             cp .circleci/CircleCITestIndex.phpsrc app/src/CircleCITestIndex.php
-            cp .circleci/Subsite.phpsrc app/src/Subsite.php
             cp .circleci/TestIndexTwo.yml app/_config/search.yml
       - run: git clone [email protected]:silverstripe-archive/silverstripe-fulltextsearch-localsolr.git localsolr
       - run:
@@ -240,6 +238,7 @@ jobs:
             case $CIRCLE_BRANCH in "master") git clone [email protected]:Firesphere/silverstripe-solr-compatibility.git compat -q ;; esac
             case $CIRCLE_BRANCH in "master") git clone [email protected]:Firesphere/silverstripe-solr-search.git search -q ;; esac
             case $CIRCLE_BRANCH in "master") git clone [email protected]:Firesphere/silverstripe-fluent-solr.git fluent -q ;; esac
+            case $CIRCLE_BRANCH in "master") git clone [email protected]:Firesphere/silverstripe-subsite-solr.git subsite -q ;; esac
       - run:
           name: Setup git
           command: |
@@ -250,7 +249,7 @@ jobs:
           name: Generate docs
           command: |
             rm -rf solr
-            case $CIRCLE_BRANCH in "master") php phpdoc.phar -d "compat/src","search/src","fluent/src" -t solr ;; esac
+            case $CIRCLE_BRANCH in "master") php phpdoc.phar -d "compat/src","search/src","fluent/src","subsite/src" -t solr ;; esac
       - run:
           name: Commit and upload
           command: |

_config/extensions.yml

@@ -1,9 +1,6 @@
 SilverStripe\ORM\DataObject:
   extensions:
     - Firesphere\SolrSearch\Extensions\DataObjectExtension
-Firesphere\SolrSearch\Indexes\BaseIndex:
-  extensions:
-    - Firesphere\SolrSearch\Compat\SubsitesExtension # Subsites compatibility
 SilverStripe\Forms\GridField\GridField:
   extensions:
     - Firesphere\SolrSearch\Extensions\GridFieldExtension

composer.json

@@ -58,7 +58,8 @@
     },
     "suggest": {
         "firesphere/fluent-solr-search": "For Fluent support",
-        "firesphere/fts-compat": "Migration support from Fulltext Search module"
+        "firesphere/fts-compat": "Migration support from Fulltext Search module",
+        "firesphere/subsite-solr-search": "Support for Subsites"
     },
     "minimum-stability": "dev",
     "prefer-stable": true

src/Interfaces/SiteStateInterface.php

@@ -34,9 +34,9 @@ public function setDefaultState($state = null);
     /**
      * Return the current state of the site
      *
-     * @return string
+     * @return string|null
      */
-    public function currentState(): string;
+    public function currentState(): ?string;
 
     /**
      * Activate a given state. This should only be done if the state is applicable

tests/fixtures/DataResolver.yml

@@ -56,13 +56,11 @@ Firesphere\SolrSearch\Tests\TestObject:
     ShowInSearch: 0
 Firesphere\SolrSearch\Tests\TestPage:
   pageOne:
-    SubsiteID: 0
     Title: Page One
     Content: This is page one content
     ShowInSearch: 1
     TestObject: =>Firesphere\SolrSearch\Tests\TestObject.objectOne
   pageTwo:
-    SubsiteID: 0
     Title: Page Two
     Content: This is page two content
     ShowInSearch: 1
@@ -73,4 +71,4 @@ Firesphere\SolrSearch\Tests\TestRelationObject:
     TestObject: =>Firesphere\SolrSearch\Tests\TestObject.objectOne
   relationTwo:
     Title: Relation Object Two
-    TestObject: =>Firesphere\SolrSearch\Tests\TestObject.objectOne
+    TestObject: =>Firesphere\SolrSearch\Tests\TestObject.objectOne

tests/unit/BaseIndexTest.php

@@ -4,7 +4,6 @@
 namespace Firesphere\SolrSearch\Tests;
 
 use CircleCITestIndex;
-use Firesphere\SolrSearch\Compat\SubsitesExtension;
 use Firesphere\SolrSearch\Extensions\DataObjectExtension;
 use Firesphere\SolrSearch\Helpers\Synonyms;
 use Firesphere\SolrSearch\Indexes\BaseIndex;
@@ -46,7 +45,6 @@ class BaseIndexTest extends SapphireTest
      */
     protected static $required_extensions = [
         DataObject::class => [DataObjectExtension::class],
-        BaseIndex::class  => [SubsitesExtension::class],
     ];
 
     /**
@@ -72,7 +70,6 @@ public function testInit()
             'Title',
             'Content',
             'ParentID',
-            'SubsiteID',
             'Created',
         ];
 
@@ -228,7 +225,6 @@ public function testGetFieldsForIndexing()
             'Title',
             'Content',
             'ParentID',
-            'SubsiteID',
             'Created',
         ];
         $this->assertEquals($expected, array_values($this->index->getFieldsForIndexing()));
@@ -333,11 +329,6 @@ public function testDoRetry()
         }
     }
 
-    public function testGetFieldsForSubsites()
-    {
-        $this->assertContains('SubsiteID', $this->index->getFilterFields());
-    }
-
     public function testSetFacets()
     {
         $this->index->addFacetField(Page::class, ['Title' => 'Title', 'Field' => 'Content']);

tests/unit/DocumentFactoryTest.php

@@ -3,7 +3,6 @@
 
 namespace Firesphere\SolrSearch\Tests;
 
-use Firesphere\SolrSearch\Compat\SubsitesExtension;
 use Firesphere\SolrSearch\Extensions\DataObjectExtension;
 use Firesphere\SolrSearch\Factories\DocumentFactory;
 use Firesphere\SolrSearch\Helpers\FieldResolver;
@@ -29,7 +28,6 @@ class DocumentFactoryTest extends SapphireTest
 
     protected static $required_extensions = [
         DataObject::class => [DataObjectExtension::class],
-        BaseIndex::class  => [SubsitesExtension::class],
     ];
     /**
      * We can't use the constant here for unknown reasons
@@ -177,7 +175,7 @@ public function testBuildItems()
             $this->assertInstanceOf(Document::class, $doc);
             $fields = $doc->getFields();
             $this->assertArrayHasKey('SiteTree_Created', $fields);
-            unset($fields['SiteTree_Created'], $fields['SiteTree_SubsiteID']); // Unset the Created, it changes per run
+            unset($fields['SiteTree_Created']); // Unset the Created, it changes per run
             foreach (static::$expected_docs as $expectedDoc) {
                 if ($expectedDoc['id'] === $doc['ItemID']) {
                     // Make sure any anomalies are ignored, we care about the doc being found

tests/unit/SolrIndexTaskTest.php

@@ -4,7 +4,6 @@
 namespace Firesphere\SolrSearch\Tests;
 
 use Firesphere\PartialUserforms\Tests\TestHelper;
-use Firesphere\SolrSearch\Compat\SubsitesExtension;
 use Firesphere\SolrSearch\Extensions\DataObjectExtension;
 use Firesphere\SolrSearch\Indexes\BaseIndex;
 use Firesphere\SolrSearch\Tasks\SolrIndexTask;
@@ -26,7 +25,6 @@ class SolrIndexTaskTest extends SapphireTest
 
     protected static $required_extensions = [
         DataObject::class => [DataObjectExtension::class],
-        BaseIndex::class  => [SubsitesExtension::class],
     ];
 
     public function setUp()