tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-10-22 11:05:55 +02:00
Code Issues Projects Releases Wiki Activity

DEP PHP Support in CMS5 (#497)

Browse Source
This commit is contained in:
Sabina Talipova 2023-01-10 13:31:07 +13:00 committed by GitHub
parent f45ccead3c
commit a67b7ef45f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 15 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
_config.php
View File

@ -1,5 +0,0 @@
<?php
use SilverStripe\Dev\Deprecation;
Deprecation::notification_version('2.0', 'subsites');

2
_config/middleware.yml
View File

@ -8,5 +8,3 @@ SilverStripe\Core\Injector\Injector:
properties: properties:
Middlewares: Middlewares:
SubsitesStateMiddleware: '%$SilverStripe\Subsites\Middleware\InitStateMiddleware' SubsitesStateMiddleware: '%$SilverStripe\Subsites\Middleware\InitStateMiddleware'
SilverStripe\Dev\Tasks\MigrateFileTask:
class: SilverStripe\Subsites\Tasks\SubsiteMigrateFileTask

16
composer.json
View File

@ -15,17 +15,17 @@
} }
], ],
"require": { "require": {
"php": "^7.4 || ^8.0", "php": "^8.1",
"silverstripe/framework": "^4.10", "silverstripe/framework": "^5",
"silverstripe/cms": "^4.4@dev", "silverstripe/cms": "^5",
"silverstripe/admin": "^1.4@dev", "silverstripe/admin": "^2",
"silverstripe/asset-admin": "^1.4@dev", "silverstripe/asset-admin": "^2",
"silverstripe/errorpage": "^1.4@dev", "silverstripe/errorpage": "^2",
"silverstripe/versioned": "^1.4@dev" "silverstripe/versioned": "^2"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^9.5", "phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "^3.0" "squizlabs/php_codesniffer": "^3"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

3
src/Controller/SubsiteXHRController.php
View File

@ -3,6 +3,7 @@
namespace SilverStripe\Subsites\Controller; namespace SilverStripe\Subsites\Controller;
use SilverStripe\Admin\LeftAndMain; use SilverStripe\Admin\LeftAndMain;
use SilverStripe\Control\PjaxResponseNegotiator;
use SilverStripe\Security\Member; use SilverStripe\Security\Member;
use SilverStripe\Security\Permission; use SilverStripe\Security\Permission;
use SilverStripe\Subsites\Model\Subsite; use SilverStripe\Subsites\Model\Subsite;
@ -46,7 +47,7 @@ class SubsiteXHRController extends LeftAndMain
]); ]);
} }
public function getResponseNegotiator() public function getResponseNegotiator(): PjaxResponseNegotiator
{ {
$negotiator = parent::getResponseNegotiator(); $negotiator = parent::getResponseNegotiator();

5
src/Model/Subsite.php
View File

@ -971,11 +971,8 @@ JS;
/** /**
* Duplicate this subsite * Duplicate this subsite
* @param bool $doWrite
* @param string $manyMany
* @return DataObject
*/ */
public function duplicate($doWrite = true, $manyMany = 'many_many') public function duplicate(bool $doWrite = true, ?array $manyMany = null): static
{ {
$duplicate = parent::duplicate($doWrite); $duplicate = parent::duplicate($doWrite);

19
src/Tasks/SubsiteMigrateFileTask.php
View File

@ -1,19 +0,0 @@
<?php
namespace SilverStripe\Subsites\Tasks;
use SilverStripe\Dev\Tasks\MigrateFileTask;
use SilverStripe\Subsites\Model\Subsite;
class SubsiteMigrateFileTask extends MigrateFileTask
{
public function run($request)
{
$origDisableSubsiteFilter = Subsite::$disable_subsite_filter;
Subsite::disable_subsite_filter(true);
parent::run($request);
Subsite::disable_subsite_filter($origDisableSubsiteFilter);
}
}

6
tests/behat/features/insert-content-link.feature
View File

@ -17,12 +17,12 @@ Feature: Insert an internal link into content
# See "insert-a-link.feature" from silverstripe/cms # See "insert-a-link.feature" from silverstripe/cms
When I select "My page" in the "Content" HTML field When I select "My page" in the "Content" HTML field
And I press the "Insert link" HTML field button And I press the "Insert link" HTML field button
And I click "Page on this site" in the ".mce-menu" element And I click "Page on this site" in the ".tox-collection__group" element
Then I should see an "form#Form_editorInternalLink" element Then I should see an "form#Form_editorInternalLink" element
When I click "(Search or choose Page)" in the ".Select-multi-value-wrapper" element When I click on the ".treedropdownfield" element
And I click "Another page" in the ".treedropdownfield__menu" element And I click "Another page" in the ".treedropdownfield__menu" element
And I fill in "my desc" for "Link description" And I fill in "my desc" for "Link description"
And I press the "Insert" button And I click on the "#Form_editorInternalLink_action_insert" element
Then the "Content" HTML field should contain "<a title="my desc" href="[sitetree_link" Then the "Content" HTML field should contain "<a title="my desc" href="[sitetree_link"
And the "Content" HTML field should contain "My page</a>" And the "Content" HTML field should contain "My page</a>"
# Required to avoid "unsaved changes" browser dialog # Required to avoid "unsaved changes" browser dialog

2
tests/php/SubsitesVirtualPageTest.php
View File

@ -5,7 +5,7 @@ namespace SilverStripe\Subsites\Tests;
use Page; use Page;
use SilverStripe\Assets\File; use SilverStripe\Assets\File;
use SilverStripe\Assets\Filesystem; use SilverStripe\Assets\Filesystem;
use SilverStripe\Assets\Tests\Storage\AssetStoreTest\TestAssetStore; use SilverStripe\Assets\Dev\TestAssetStore;
use SilverStripe\CMS\Model\SiteTree; use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\Control\Director; use SilverStripe\Control\Director;
use SilverStripe\Core\Config\Config; use SilverStripe\Core\Config\Config;