Skip to content

Commit

Permalink
API Set extension hook implementation visibility to protected
Browse files Browse the repository at this point in the history
  • Loading branch information
emteknetnz committed May 16, 2024
1 parent 3517ae5 commit a9f9b63
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion src/Extensions/BaseElementSubsites.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class BaseElementSubsites extends DataExtension
* @param string|null $action
* @return string
*/
public function updatePreviewLink(&$link)
protected function updatePreviewLink(&$link)
{
// Get subsite ID from the element or from its page. Defaults to 0 automatically.
$subsiteID = $this->owner->SubsiteID;
Expand Down
2 changes: 1 addition & 1 deletion src/Extensions/CMSPageAddControllerExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/
class CMSPageAddControllerExtension extends Extension
{
public function updatePageOptions(FieldList $fields)
protected function updatePageOptions(FieldList $fields)
{
$fields->push(HiddenField::create('SubsiteID', 'SubsiteID', SubsiteState::singleton()->getSubsiteId()));
}
Expand Down
2 changes: 1 addition & 1 deletion src/Extensions/ErrorPageSubsite.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class ErrorPageSubsite extends DataExtension
* @param string $name
* @param int $statusCode
*/
public function updateErrorFilename(&$name, &$statusCode)
protected function updateErrorFilename(&$name, &$statusCode)
{
$static_filepath = Config::inst()->get($this->owner->ClassName, 'static_filepath');
$subdomainPart = '';
Expand Down
6 changes: 3 additions & 3 deletions src/Extensions/FileSubsites.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function alternateTreeTitle()
* @param SQLSelect $query
* @param DataQuery|null $dataQuery
*/
public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null)
protected function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null)
{
if (Subsite::$disable_subsite_filter) {
return;
Expand Down Expand Up @@ -96,7 +96,7 @@ public function onBeforeWrite()
}
}

public function onAfterUpload()
protected function onAfterUpload()
{
// If we have a parent, use it's subsite as our subsite
if ($this->owner->Parent()) {
Expand Down Expand Up @@ -132,7 +132,7 @@ public function canEdit($member = null)
*
* @return string
*/
public function cacheKeyComponent()
protected function cacheKeyComponent()
{
return 'subsite-' . SubsiteState::singleton()->getSubsiteId();
}
Expand Down
2 changes: 1 addition & 1 deletion src/Extensions/FolderFormFactoryExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class FolderFormFactoryExtension extends Extension
* Add subsites-specific fields to the folder editor.
* @param FieldList $fields
*/
public function updateFormFields(FieldList $fields)
protected function updateFormFields(FieldList $fields)
{
$sites = Subsite::accessible_sites('CMS_ACCESS_AssetAdmin');
$values = [];
Expand Down
6 changes: 3 additions & 3 deletions src/Extensions/GroupSubsites.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public function requireDefaultRecords()
}
}

public function updateCMSFields(FieldList $fields)
protected function updateCMSFields(FieldList $fields)
{
if ($this->owner->canEdit()) {
// i18n tab
Expand Down Expand Up @@ -132,7 +132,7 @@ public function updateCMSFields(FieldList $fields)
*
* @param string $title
*/
public function updateTreeTitle(&$title)
protected function updateTreeTitle(&$title)
{
if ($this->owner->AccessAllSubsites) {
$title = _t(__CLASS__ . '.GlobalGroup', 'global group');
Expand All @@ -148,7 +148,7 @@ public function updateTreeTitle(&$title)
* @param SQLSelect $query
* @param DataQuery|null $dataQuery
*/
public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null)
protected function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null)
{
if (Subsite::$disable_subsite_filter) {
return;
Expand Down
2 changes: 1 addition & 1 deletion src/Extensions/HintsCacheKeyExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
class HintsCacheKeyExtension extends Extension
{
public function updateHintsCacheKey(&$baseKey)
protected function updateHintsCacheKey(&$baseKey)
{
$baseKey .= '_Subsite:' . SubsiteState::singleton()->getSubsiteId();
}
Expand Down
8 changes: 4 additions & 4 deletions src/Extensions/LeftAndMainSubsites.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public function getCMSTreeTitle()
return $subsite ? Convert::raw2xml($subsite->Title) : _t(__CLASS__.'.SITECONTENTLEFT', 'Site Content');
}

public function updatePageOptions(&$fields)
protected function updatePageOptions(&$fields)
{
$fields->push(HiddenField::create('SubsiteID', 'SubsiteID', SubsiteState::singleton()->getSubsiteId()));
}
Expand Down Expand Up @@ -266,7 +266,7 @@ public function alternateAccessCheck(Member $member = null)
* fully re-synchronised with the internal session. This is better than risking some panels
* showing data from another subsite.
*/
public function onBeforeInit()
protected function onBeforeInit()
{
$request = Controller::curr()->getRequest();
$session = $request->getSession();
Expand Down Expand Up @@ -381,13 +381,13 @@ public function onBeforeInit()
return;
}

public function augmentNewSiteTreeItem(&$item)
protected function augmentNewSiteTreeItem(&$item)
{
$request = Controller::curr()->getRequest();
$item->SubsiteID = $request->postVar('SubsiteID') ?: SubsiteState::singleton()->getSubsiteId();
}

public function onAfterSave($record)
protected function onAfterSave($record)
{
if ($record->hasMethod('NormalRelated') && ($record->NormalRelated() || $record->ReverseRelated())) {
$this->owner->response->addHeader(
Expand Down
6 changes: 3 additions & 3 deletions src/Extensions/SiteConfigSubsites.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class SiteConfigSubsites extends DataExtension
* @param SQLSelect $query
* @param DataQuery|null $dataQuery
*/
public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null)
protected function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null)
{
if (Subsite::$disable_subsite_filter) {
return;
Expand Down Expand Up @@ -70,12 +70,12 @@ public function onBeforeWrite()
/**
* Return a piece of text to keep DataObject cache keys appropriately specific
*/
public function cacheKeyComponent()
protected function cacheKeyComponent()
{
return 'subsite-' . SubsiteState::singleton()->getSubsiteId();
}

public function updateCMSFields(FieldList $fields)
protected function updateCMSFields(FieldList $fields)
{
$fields->push(HiddenField::create('SubsiteID', 'SubsiteID', SubsiteState::singleton()->getSubsiteId()));
}
Expand Down
16 changes: 8 additions & 8 deletions src/Extensions/SiteTreeSubsites.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function isMainSite()
* @param SQLSelect $query
* @param DataQuery $dataQuery
*/
public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null)
protected function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null)
{
if (Subsite::$disable_subsite_filter) {
return;
Expand Down Expand Up @@ -107,7 +107,7 @@ public function onBeforeWrite()
parent::onBeforeWrite();
}

public function updateCMSFields(FieldList $fields)
protected function updateCMSFields(FieldList $fields)
{
$subsites = Subsite::accessible_sites('CMS_ACCESS_CMSMain');
if ($subsites && $subsites->count()) {
Expand Down Expand Up @@ -225,7 +225,7 @@ public function duplicateToSubsitePrep($subsiteID, $includeChildren)
/**
* When duplicating a page, assign the current subsite ID from the state
*/
public function onBeforeDuplicate()
protected function onBeforeDuplicate()
{
$subsiteId = SubsiteState::singleton()->getSubsiteId();
if ($subsiteId !== null) {
Expand Down Expand Up @@ -290,7 +290,7 @@ public function duplicateSubsiteRelations($originalPage)
/**
* @return SiteConfig
*/
public function alternateSiteConfig()
protected function alternateSiteConfig()
{
if (!$this->owner->SubsiteID) {
return false;
Expand Down Expand Up @@ -433,7 +433,7 @@ public function alternateAbsoluteLink($action = null)
* @param string|null $action
* @return string
*/
public function updatePreviewLink(&$link, $action = null)
protected function updatePreviewLink(&$link, $action = null)
{
$url = Director::absoluteURL($this->owner->Link($action));
$link = HTTP::setGetVar('SubsiteID', $this->owner->SubsiteID, $url);
Expand All @@ -454,7 +454,7 @@ public function MetaTags(&$tags)
return $tags;
}

public function augmentSyncLinkTracking()
protected function augmentSyncLinkTracking()
{
// Set LinkTracking appropriately
$links = HTTP::getLinksIn($this->owner->Content);
Expand Down Expand Up @@ -502,7 +502,7 @@ public function augmentSyncLinkTracking()
*
* @return null|bool Either true or false, or null to not influence result
*/
public function augmentValidURLSegment()
protected function augmentValidURLSegment()
{
// If this page is being filtered in the current subsite, then no custom validation query is required.
$subsiteID = SubsiteState::singleton()->getSubsiteId();
Expand All @@ -518,7 +518,7 @@ public function augmentValidURLSegment()
/**
* Return a piece of text to keep DataObject cache keys appropriately specific
*/
public function cacheKeyComponent()
protected function cacheKeyComponent()
{
return 'subsite-' . SubsiteState::singleton()->getSubsiteId();
}
Expand Down

0 comments on commit a9f9b63

Please sign in to comment.