Merge branch 'fix/4--duplicate-page-type' into signify

src/Extensions/DataObjectExtension.php

@@ -243,14 +243,14 @@ private function removeItem(DataObject $item = null)
     }
 
     /**
-     * Push the item to Solr after publishing
+     * Clear old page type from Solr before publishing if required
      *
      * @throws ValidationException
      * @throws HTTPException
      * @throws ReflectionException
      * @throws InvalidArgumentException
      */
-    public function onAfterPublish()
+    public function onBeforePublish()
     {
         // Check for changed classname and delete old record before pushing new if required.
         if ($this->owner instanceof SiteTree) {
@@ -259,6 +259,18 @@ public function onAfterPublish()
                 $this->removeItem($lastPublished);
             }
         }
+    }
+
+    /**
+     * Push the item to Solr after publishing
+     *
+     * @throws ValidationException
+     * @throws HTTPException
+     * @throws ReflectionException
+     * @throws InvalidArgumentException
+     */
+    public function onAfterPublish()
+    {
         if ($this->shouldPush()) {
             /** @var DataObject $owner */
             $owner = $this->owner;