Skip to content

Commit 90925fa

Browse files
xinixini
committed
code cleanup, PHP 8.1 compatibility
1 parent 72a0dda commit 90925fa

File tree

4 files changed

+83
-81
lines changed

4 files changed

+83
-81
lines changed

‎changelog.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
44

55
This project adheres to [Semantic Versioning](http://semver.org/).
66

7+
## [5.1.2]
8+
9+
* code cleanup, PHP 8.1 compatibility
10+
711
## [5.1.1]
812

913
* fix routes for configured multistes

‎src/Controllers/RobotsController.php‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class RobotsController extends Controller
2020

2121
public function index()
2222
{
23-
$mode = $this->getActiveMode();
23+
$mode = $this->getActiveMode();
2424

2525
$this->getResponse()->addHeader(
2626
'Content-Type',
@@ -82,7 +82,7 @@ public function getActiveMode()
8282

8383
public function getRobotsSite()
8484
{
85-
$multisitesClass = $this->getMultisitesClassName();
85+
$multisitesClass = $this->getMultisitesClassName();
8686
if (isset($multisitesClass) && class_exists($multisitesClass)) {
8787
$site = $multisitesClass::inst()->getCurrentSite();
8888
} else {
@@ -106,8 +106,8 @@ public function getGoogleSitemapURL()
106106
}
107107

108108
if ($isGoogleSitemapsEnabled) {
109-
$multisitesClass = $this->getMultisitesClassName();
110-
if (!empty($multisitesClass)) {
109+
$multisitesClass = $this->getMultisitesClassName();
110+
if (!empty($multisitesClass)) {
111111
$site = $multisitesClass::inst()->getCurrentSite();
112112
$url = $site->getURL() . $url;
113113
} else {
@@ -132,41 +132,41 @@ public function getDisallowedPages()
132132
}
133133

134134
if ($isGoogleSitemapsEnabled) {
135-
$pages = SiteTree::get();
136-
137-
// exclude redirector page
138-
$pages = $pages->exclude([
139-
'ClassName' => RedirectorPage::class
140-
]);
141-
142-
$siteClass = $this->getMultisitesSiteClassName();
143-
if (!empty($siteClass)) {
144-
$pages = $pages->exclude([
145-
'ClassName' => $siteClass,
146-
]);
147-
}
148-
149-
// exclude redirection page
150-
$isRedirectionEnabled = ModuleLoader::inst()
151-
->getManifest()
152-
->moduleExists('fromholdio/silverstripe-superlinker-redirection');
153-
if ($isRedirectionEnabled) {
154-
$pages = $pages->exclude([
155-
'ClassName' => RedirectionPage::class
156-
]);
157-
}
158-
159-
// exclude folder pages
160-
$isFoldersEnabled = ModuleLoader::inst()
161-
->getManifest()
162-
->moduleExists('innoweb/silverstripe-folder-page');
163-
if ($isFoldersEnabled) {
164-
$pages = $pages->exclude([
165-
'ClassName' => FolderPage::class
166-
]);
167-
}
168-
169-
$googleSitemap = GoogleSitemap::singleton();
135+
$pages = SiteTree::get();
136+
137+
// exclude redirector page
138+
$pages = $pages->exclude([
139+
'ClassName' => RedirectorPage::class
140+
]);
141+
142+
$siteClass = $this->getMultisitesSiteClassName();
143+
if (!empty($siteClass)) {
144+
$pages = $pages->exclude([
145+
'ClassName' => $siteClass,
146+
]);
147+
}
148+
149+
// exclude redirection page
150+
$isRedirectionEnabled = ModuleLoader::inst()
151+
->getManifest()
152+
->moduleExists('fromholdio/silverstripe-superlinker-redirection');
153+
if ($isRedirectionEnabled) {
154+
$pages = $pages->exclude([
155+
'ClassName' => RedirectionPage::class
156+
]);
157+
}
158+
159+
// exclude folder pages
160+
$isFoldersEnabled = ModuleLoader::inst()
161+
->getManifest()
162+
->moduleExists('innoweb/silverstripe-folder-page');
163+
if ($isFoldersEnabled) {
164+
$pages = $pages->exclude([
165+
'ClassName' => FolderPage::class
166+
]);
167+
}
168+
169+
$googleSitemap = GoogleSitemap::singleton();
170170
$isFiltered = (bool) $googleSitemap->config()->get('use_show_in_search');
171171
$filterFieldName = 'ShowInSearch';
172172
if (method_exists(GoogleSitemap::class, 'getFilterFieldName')) {
@@ -175,36 +175,36 @@ public function getDisallowedPages()
175175
if ($isFiltered) {
176176
$pages = $pages->exclude($filterFieldName, true);
177177
} else {
178-
$pages = $pages->filter(['Priority' => '-1']);
178+
$pages = $pages->filter(['Priority' => '-1']);
179179
}
180180

181-
return $pages;
181+
return $pages;
182182
}
183183

184184
return null;
185185
}
186186

187-
public function getMultisitesClassName(): ?string
188-
{
189-
$manifest = ModuleLoader::inst()->getManifest();
190-
if ($manifest->moduleExists('symbiote/silverstripe-multisites')) {
191-
return \Symbiote\Multisites\Multisites::class;
192-
}
193-
if ($manifest->moduleExists('fromholdio/silverstripe-configured-multisites')) {
194-
return \Fromholdio\ConfiguredMultisites\Multisites::class;
195-
}
196-
return null;
197-
}
198-
199-
public function getMultisitesSiteClassName(): ?string
200-
{
201-
$manifest = ModuleLoader::inst()->getManifest();
202-
if ($manifest->moduleExists('symbiote/silverstripe-multisites')) {
203-
return \Symbiote\Multisites\Model\Site::class;
204-
}
205-
if ($manifest->moduleExists('fromholdio/silverstripe-configured-multisites')) {
206-
return \Fromholdio\ConfiguredMultisites\Model\Site::class;
207-
}
208-
return null;
209-
}
187+
public function getMultisitesClassName(): ?string
188+
{
189+
$manifest = ModuleLoader::inst()->getManifest();
190+
if ($manifest->moduleExists('symbiote/silverstripe-multisites')) {
191+
return \Symbiote\Multisites\Multisites::class;
192+
}
193+
if ($manifest->moduleExists('fromholdio/silverstripe-configured-multisites')) {
194+
return \Fromholdio\ConfiguredMultisites\Multisites::class;
195+
}
196+
return null;
197+
}
198+
199+
public function getMultisitesSiteClassName(): ?string
200+
{
201+
$manifest = ModuleLoader::inst()->getManifest();
202+
if ($manifest->moduleExists('symbiote/silverstripe-multisites')) {
203+
return \Symbiote\Multisites\Model\Site::class;
204+
}
205+
if ($manifest->moduleExists('fromholdio/silverstripe-configured-multisites')) {
206+
return \Fromholdio\ConfiguredMultisites\Model\Site::class;
207+
}
208+
return null;
209+
}
210210
}

‎src/Extensions/ConfigExtension.php‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,7 @@ public function applyRobotsCMSFields(FieldList $fields)
8484

8585
$hiddenModeField = HiddenField::create('RobotsMode', null);
8686
$fields->addFieldToTab($tabPath, $hiddenModeField);
87-
88-
reset($options);
89-
$this->getOwner()->RobotsMode = key($options);
87+
$this->getOwner()->RobotsMode = array_key_first($options);
9088
} else {
9189
$modeField = OptionsetField::create('RobotsMode', 'Robots.txt', $options);
9290
$fields->addFieldToTab($tabPath, $modeField);
@@ -133,9 +131,9 @@ public function requireDefaultRecords()
133131
{
134132
// get correct config class
135133
if (class_exists('Symbiote\Multisites\Multisites')) {
136-
$configs = \Symbiote\Multisites\Model\Site::get();
137-
} elseif (class_exists('Fromholdio\ConfiguredMultisites\Multisites')) {
138-
$configs = \Fromholdio\ConfiguredMultisites\Model\Site::get();
134+
$configs = \Symbiote\Multisites\Model\Site::get();
135+
} elseif (class_exists('Fromholdio\ConfiguredMultisites\Multisites')) {
136+
$configs = \Fromholdio\ConfiguredMultisites\Model\Site::get();
139137
} else {
140138
$configs = SiteConfig::get();
141139
}

‎src/Extensions/PageExtension.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ public function getRobotsTagString()
3333
} elseif (is_a(Controller::curr(), Security::class)) {
3434
$follow = "nofollow";
3535
$index = "noindex";
36-
} elseif (Controller::curr()->hasMethod('data') && ($page = Controller::curr()->data()) && stripos($page->URLSegment, 'error') !== false) {
37-
$follow = "nofollow";
38-
$index = "noindex";
39-
} elseif ($this->getOwner()->hasExtension('Wilr\GoogleSitemaps\Extensions\GoogleSitemapSiteTreeExtension')
36+
} elseif (Controller::curr()->hasMethod('data') && ($page = Controller::curr()->data()) && stripos($page->URLSegment ?? '', 'error') !== false) {
37+
$follow = "nofollow";
38+
$index = "noindex";
39+
} elseif ($this->getOwner()->hasExtension(\Wilr\GoogleSitemaps\Extensions\GoogleSitemapSiteTreeExtension::class)
4040
&& ($priority = $this->getOwner()->Priority)
4141
&& $priority == -1
4242
) {
@@ -48,7 +48,7 @@ public function getRobotsTagString()
4848
&& (!$this->getOwner()->{$filterFieldName})
4949
) {
5050
$index = "noindex";
51-
} elseif ($this->getOwner()->hasExtension('Wilr\GoogleSitemaps\Extensions\GoogleSitemapSiteTreeExtension')
51+
} elseif ($this->getOwner()->hasExtension(\Wilr\GoogleSitemaps\Extensions\GoogleSitemapSiteTreeExtension::class)
5252
&& !$this->getOwner()->ShowInSearch
5353
) {
5454
$index = "noindex";
@@ -64,13 +64,13 @@ public function getRobotsTagString()
6464

6565
$robotsString = "$index, $follow";
6666

67-
if ($this->getOwner()) {
68-
$this->getOwner()->invokeWithExtensions('updateRobotsTagString', $robotsString);
69-
}
67+
if ($this->getOwner()) {
68+
$this->getOwner()->invokeWithExtensions('updateRobotsTagString', $robotsString);
69+
}
7070

71-
if (Controller::curr()) {
72-
Controller::curr()->invokeWithExtensions('updateRobotsTagString', $robotsString);
73-
}
71+
if (Controller::curr()) {
72+
Controller::curr()->invokeWithExtensions('updateRobotsTagString', $robotsString);
73+
}
7474

7575
return $robotsString;
7676
}

0 commit comments

Comments
 (0)