Merge pull request #1288 from creative-commoners/pulls/7/protect-hooks

API Set extension hook implementation visibility to protected
silverstripe · May 21, 2024 · 6564981 · 6564981
2 parents be04ef4 + 1417d90
commit 6564981
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/code/Extension/UserFormFieldEditorExtension.php b/code/Extension/UserFormFieldEditorExtension.php
@@ -54,7 +54,7 @@ class UserFormFieldEditorExtension extends DataExtension
      *
      * @return FieldList
      */
-    public function updateCMSFields(FieldList $fields)
+    protected function updateCMSFields(FieldList $fields)
     {
         $fieldEditor = $this->getFieldEditorGrid();
 
@@ -178,15 +178,15 @@ public function createInitialFormStep($force = false)
     /**
      * Ensure that at least one page exists at the start
      */
-    public function onAfterWrite()
+    protected function onAfterWrite()
     {
         $this->createInitialFormStep();
     }
 
     /**
      * Remove any orphaned child records on publish
      */
-    public function onAfterPublish()
+    protected function onAfterPublish()
     {
         // store IDs of fields we've published
         $seenIDs = [];
@@ -220,7 +220,7 @@ public function onAfterPublish()
     /**
      * Remove all fields from the live stage when unpublishing the page
      */
-    public function onAfterUnpublish()
+    protected function onAfterUnpublish()
     {
         foreach ($this->owner->Fields() as $field) {
             $field->deleteFromStage(Versioned::LIVE);
@@ -236,7 +236,7 @@ public function onAfterUnpublish()
      * @param string $manyMany
      * @return DataObject
      */
-    public function onAfterDuplicate($oldPage, $doWrite, $manyMany)
+    protected function onAfterDuplicate($oldPage, $doWrite, $manyMany)
     {
         // List of EditableFieldGroups, where the key of the array is the ID of the old end group
         $fieldGroups = [];
@@ -289,7 +289,7 @@ public function isModifiedOnDraft()
     /**
      * @see Versioned::doRevertToLive
      */
-    public function onAfterRevertToLive()
+    protected function onAfterRevertToLive()
     {
         foreach ($this->owner->Fields() as $field) {
             $field->copyVersionToStage(Versioned::LIVE, Versioned::DRAFT);

diff --git a/code/Extension/UserFormFileExtension.php b/code/Extension/UserFormFileExtension.php
@@ -44,7 +44,7 @@ class UserFormFileExtension extends DataExtension
      * @param bool $value
      * @see File::isTrackedFormUpload(), UserDefinedFormController::process()
      */
-    public function updateTrackedFormUpload(&$value): void
+    protected function updateTrackedFormUpload(&$value): void
     {
         $file = $this->owner;
         if ($file->UserFormUpload != self::USER_FORM_UPLOAD_UNKNOWN) {

diff --git a/code/Extensions/UsedOnTableExtension.php b/code/Extensions/UsedOnTableExtension.php
@@ -23,7 +23,7 @@ class UsedOnTableExtension extends Extension
      * @param array $ancestorDataObjects
      * @param DataObject $dataObject|null
      */
-    public function updateUsageDataObject(?DataObject &$dataObject)
+    protected function updateUsageDataObject(?DataObject &$dataObject)
     {
         if (!($dataObject instanceof SubmittedFileField)) {
             return;
@@ -41,7 +41,7 @@ public function updateUsageDataObject(?DataObject &$dataObject)
      * @param array $ancestorDataObjects
      * @param DataObject $dataObject
      */
-    public function updateUsageAncestorDataObjects(array &$ancestorDataObjects, DataObject $dataObject)
+    protected function updateUsageAncestorDataObjects(array &$ancestorDataObjects, DataObject $dataObject)
     {
         // SubmittedFileField was changed to a Submitted Form in updateUsageModifyOrExcludeDataObject()
         if (!($dataObject instanceof SubmittedForm)) {

diff --git a/code/Model/EditableFormField.php b/code/Model/EditableFormField.php
@@ -421,7 +421,7 @@ protected function getDisplayRuleFields()
         );
     }
 
-    public function onBeforeWrite()
+    protected function onBeforeWrite()
     {
         parent::onBeforeWrite();
 

diff --git a/code/Model/EditableFormField/EditableFieldGroupEnd.php b/code/Model/EditableFormField/EditableFieldGroupEnd.php
@@ -77,7 +77,7 @@ public function showInReports()
         return false;
     }
 
-    public function onAfterWrite()
+    protected function onAfterWrite()
     {
         parent::onAfterWrite();
 

diff --git a/code/Model/EditableFormField/EditableFileField.php b/code/Model/EditableFormField/EditableFileField.php
@@ -275,7 +275,7 @@ public function getPHPMaxFileSizeMB()
         return round(static::get_php_max_file_size() / 1024 / 1024, 1);
     }
 
-    public function onBeforeWrite()
+    protected function onBeforeWrite()
     {
         parent::onBeforeWrite();
 

diff --git a/code/Model/Recipient/EmailRecipient.php b/code/Model/Recipient/EmailRecipient.php
@@ -137,7 +137,7 @@ public function requireDefaultRecords()
         DB::query("UPDATE \"UserDefinedForm_EmailRecipient\" SET \"FormClass\" = 'Page' WHERE \"FormClass\" IS NULL");
     }
 
-    public function onBeforeWrite()
+    protected function onBeforeWrite()
     {
         parent::onBeforeWrite();