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

Update class references and array syntax

Browse Source
This commit is contained in:
Raissa North 2018-06-20 11:48:35 +12:00
parent e515423c26
commit 6b2a9e4f77
2 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
tests/php/Model/SiteTreeTest.php
View File

@ -2,6 +2,7 @@
namespace SilverStripe\CMS\Tests\Model; namespace SilverStripe\CMS\Tests\Model;
use LogicException;
use Page; use Page;
use ReflectionMethod; use ReflectionMethod;
use SilverStripe\CMS\Model\RedirectorPage; use SilverStripe\CMS\Model\RedirectorPage;
@ -11,6 +12,7 @@ use SilverStripe\Control\ContentNegotiator;
use SilverStripe\Control\Controller; use SilverStripe\Control\Controller;
use SilverStripe\Control\Director; use SilverStripe\Control\Director;
use SilverStripe\Core\Config\Config; use SilverStripe\Core\Config\Config;
use SilverStripe\Core\Injector\Injector;
use SilverStripe\Dev\SapphireTest; use SilverStripe\Dev\SapphireTest;
use SilverStripe\i18n\i18n; use SilverStripe\i18n\i18n;
use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DataObject;
@ -22,22 +24,25 @@ use SilverStripe\Security\Member;
use SilverStripe\Security\Permission; use SilverStripe\Security\Permission;
use SilverStripe\Security\Security; use SilverStripe\Security\Security;
use SilverStripe\SiteConfig\SiteConfig; use SilverStripe\SiteConfig\SiteConfig;
use SilverStripe\Subsites\Extensions\SiteTreeSubsites;
use SilverStripe\Versioned\Versioned; use SilverStripe\Versioned\Versioned;
use SilverStripe\View\Parsers\Diff; use SilverStripe\View\Parsers\Diff;
use SilverStripe\View\Parsers\ShortcodeParser; use SilverStripe\View\Parsers\ShortcodeParser;
use SilverStripe\View\Parsers\URLSegmentFilter; use SilverStripe\View\Parsers\URLSegmentFilter;
use SilverStripe\Core\Injector\Injector; use TractorCow\Fluent\Extension\FluentSiteTreeExtension;
use LogicException;
class SiteTreeTest extends SapphireTest class SiteTreeTest extends SapphireTest
{ {
protected static $fixture_file = 'SiteTreeTest.yml'; protected static $fixture_file = 'SiteTreeTest.yml';
protected static $illegal_extensions = array( protected static $illegal_extensions = [
SiteTree::class => array('SiteTreeSubsites', 'Translatable'), SiteTree::class => [
); SiteTreeSubsites::class,
FluentSiteTreeExtension::class,
],
];
protected static $extra_dataobjects = array( protected static $extra_dataobjects = [
SiteTreeTest_ClassA::class, SiteTreeTest_ClassA::class,
SiteTreeTest_ClassB::class, SiteTreeTest_ClassB::class,
SiteTreeTest_ClassC::class, SiteTreeTest_ClassC::class,
@ -46,7 +51,7 @@ class SiteTreeTest extends SapphireTest
SiteTreeTest_NotRoot::class, SiteTreeTest_NotRoot::class,
SiteTreeTest_StageStatusInherit::class, SiteTreeTest_StageStatusInherit::class,
SiteTreeTest_DataObject::class, SiteTreeTest_DataObject::class,
); ];
public function reservedSegmentsProvider() public function reservedSegmentsProvider()
{ {
@ -97,7 +102,7 @@ class SiteTreeTest extends SapphireTest
*/ */
public function testURLGeneration() public function testURLGeneration()
{ {
$expectedURLs = array( $expectedURLs = [
'home' => 'home', 'home' => 'home',
'staff' => 'my-staff', 'staff' => 'my-staff',
'about' => 'about-us', 'about' => 'about-us',
@ -109,7 +114,7 @@ class SiteTreeTest extends SapphireTest
'object' => 'object', 'object' => 'object',
'controller' => 'controller', 'controller' => 'controller',
'numericonly' => '1930', 'numericonly' => '1930',
); ];
foreach ($expectedURLs as $fixture => $urlSegment) { foreach ($expectedURLs as $fixture => $urlSegment) {
$obj = $this->objFromFixture('Page', $fixture); $obj = $this->objFromFixture('Page', $fixture);
@ -214,9 +219,9 @@ class SiteTreeTest extends SapphireTest
$oldMode = Versioned::get_reading_mode(); $oldMode = Versioned::get_reading_mode();
Versioned::set_stage(Versioned::LIVE); Versioned::set_stage(Versioned::LIVE);
$checkSiteTree = DataObject::get_one(SiteTree::class, array( $checkSiteTree = DataObject::get_one(SiteTree::class, [
'"SiteTree"."URLSegment"' => 'get-one-test-page' '"SiteTree"."URLSegment"' => 'get-one-test-page'
)); ]);
$this->assertEquals("V1", $checkSiteTree->Title); $this->assertEquals("V1", $checkSiteTree->Title);
Versioned::set_reading_mode($oldMode); Versioned::set_reading_mode($oldMode);
@ -610,9 +615,9 @@ class SiteTreeTest extends SapphireTest
{ {
$date = '2009-07-02 14:05:07'; $date = '2009-07-02 14:05:07';
Versioned::reading_archived_date($date); Versioned::reading_archived_date($date);
SiteTree::get()->where(array( SiteTree::get()->where([
'"SiteTree"."ParentID"' => 0 '"SiteTree"."ParentID"' => 0
))->sql($args); ])->sql($args);
$this->assertContains($date, $args); $this->assertContains($date, $args);
} }
@ -671,19 +676,19 @@ class SiteTreeTest extends SapphireTest
// Test creation underneath a parent which this user doesn't have access to // Test creation underneath a parent which this user doesn't have access to
$parent = $this->objFromFixture('Page', 'about'); $parent = $this->objFromFixture('Page', 'about');
$this->assertFalse(singleton(SiteTree::class)->canCreate(null, array('Parent' => $parent))); $this->assertFalse(singleton(SiteTree::class)->canCreate(null, ['Parent' => $parent]));
// Test creation underneath a parent which doesn't allow a certain child // Test creation underneath a parent which doesn't allow a certain child
$parentB = new SiteTreeTest_ClassB(); $parentB = new SiteTreeTest_ClassB();
$parentB->Title = 'Only Allows SiteTreeTest_ClassC'; $parentB->Title = 'Only Allows SiteTreeTest_ClassC';
$parentB->write(); $parentB->write();
$this->assertTrue(singleton(SiteTreeTest_ClassA::class)->canCreate(null)); $this->assertTrue(singleton(SiteTreeTest_ClassA::class)->canCreate(null));
$this->assertFalse(singleton(SiteTreeTest_ClassA::class)->canCreate(null, array('Parent' => $parentB))); $this->assertFalse(singleton(SiteTreeTest_ClassA::class)->canCreate(null, ['Parent' => $parentB]));
$this->assertTrue(singleton(SiteTreeTest_ClassC::class)->canCreate(null, array('Parent' => $parentB))); $this->assertTrue(singleton(SiteTreeTest_ClassC::class)->canCreate(null, ['Parent' => $parentB]));
// Test creation underneath a parent which doesn't exist in the database. This should // Test creation underneath a parent which doesn't exist in the database. This should
// fall back to checking whether the user can create pages at the root of the site // fall back to checking whether the user can create pages at the root of the site
$this->assertTrue(singleton(SiteTree::class)->canCreate(null, array('Parent' => singleton(SiteTree::class)))); $this->assertTrue(singleton(SiteTree::class)->canCreate(null, ['Parent' => singleton(SiteTree::class)]));
//Test we don't check for allowedChildren on parent context if it's not SiteTree instance //Test we don't check for allowedChildren on parent context if it's not SiteTree instance
$this->assertTrue(singleton(SiteTree::class)->canCreate(null, ['Parent' => $this->objFromFixture(SiteTreeTest_DataObject::class, 'relations')])); $this->assertTrue(singleton(SiteTree::class)->canCreate(null, ['Parent' => $this->objFromFixture(SiteTreeTest_DataObject::class, 'relations')]));
@ -803,7 +808,7 @@ class SiteTreeTest extends SapphireTest
$redirectPage = $this->objFromFixture(RedirectorPage::class, 'external'); $redirectPage = $this->objFromFixture(RedirectorPage::class, 'external');
$parser = new ShortcodeParser(); $parser = new ShortcodeParser();
$parser->register('sitetree_link', array(SiteTree::class, 'link_shortcode_handler')); $parser->register('sitetree_link', [SiteTree::class, 'link_shortcode_handler']);
$aboutShortcode = sprintf('[sitetree_link,id=%d]', $aboutPage->ID); $aboutShortcode = sprintf('[sitetree_link,id=%d]', $aboutPage->ID);
$aboutEnclosed = sprintf('[sitetree_link,id=%d]Example Content[/sitetree_link]', $aboutPage->ID); $aboutEnclosed = sprintf('[sitetree_link,id=%d]Example Content[/sitetree_link]', $aboutPage->ID);
@ -847,9 +852,9 @@ class SiteTreeTest extends SapphireTest
$this->assertFalse($productPage->isCurrent()); $this->assertFalse($productPage->isCurrent());
$this->assertTrue( $this->assertTrue(
DataObject::get_one(SiteTree::class, array( DataObject::get_one(SiteTree::class, [
'"SiteTree"."Title"' => 'About Us' '"SiteTree"."Title"' => 'About Us'
))->isCurrent(), ])->isCurrent(),
'Assert that isCurrent works on another instance with the same ID.' 'Assert that isCurrent works on another instance with the same ID.'
); );
@ -893,7 +898,7 @@ class SiteTreeTest extends SapphireTest
$sitetree->Title = _t( $sitetree->Title = _t(
'SilverStripe\\CMS\\Controllers\\CMSMain.NEWPAGE', 'SilverStripe\\CMS\\Controllers\\CMSMain.NEWPAGE',
'New {pagetype}', 'New {pagetype}',
array('pagetype' => $sitetree->i18n_singular_name()) ['pagetype' => $sitetree->i18n_singular_name()]
); );
$sitetree->write(); $sitetree->write();
$this->assertEquals( $this->assertEquals(
@ -928,7 +933,7 @@ class SiteTreeTest extends SapphireTest
$sitetree->Title = _t( $sitetree->Title = _t(
'SilverStripe\\CMS\\Controllers\\CMSMain.NEWPAGE', 'SilverStripe\\CMS\\Controllers\\CMSMain.NEWPAGE',
'New {pagetype}', 'New {pagetype}',
array('pagetype' => $sitetree->i18n_singular_name()) ['pagetype' => $sitetree->i18n_singular_name()]
); );
$sitetree->write(); $sitetree->write();
$this->assertEquals( $this->assertEquals(
@ -1361,7 +1366,7 @@ class SiteTreeTest extends SapphireTest
// necessary for admin / cms users, who require this permission to edit / rearrange these pages. // necessary for admin / cms users, who require this permission to edit / rearrange these pages.
$permission = new Permission(); $permission = new Permission();
$permission->Code = 'VIEW_DRAFT_CONTENT'; $permission->Code = 'VIEW_DRAFT_CONTENT';
$group = new Group(array('Title' => 'Staging Users')); $group = new Group(['Title' => 'Staging Users']);
$group->write(); $group->write();
$group->Permissions()->add($permission); $group->Permissions()->add($permission);
$member = new Member(); $member = new Member();

11
tests/php/Search/SearchFormTest.php
View File

@ -17,7 +17,9 @@ use SilverStripe\ORM\Search\FulltextSearchable;
use SilverStripe\PostgreSQL\PostgreSQLDatabase; use SilverStripe\PostgreSQL\PostgreSQLDatabase;
use SilverStripe\Security\Member; use SilverStripe\Security\Member;
use SilverStripe\Security\Security; use SilverStripe\Security\Security;
use SilverStripe\Subsites\Extensions\SiteTreeSubsites;
use SilverStripe\Versioned\Versioned; use SilverStripe\Versioned\Versioned;
use TractorCow\Fluent\Extension\FluentSiteTreeExtension;
/** /**
* @todo Fix unpublished pages check in testPublishedPagesMatchedByTitle() * @todo Fix unpublished pages check in testPublishedPagesMatchedByTitle()
@ -30,9 +32,12 @@ class ZZZSearchFormTest extends FunctionalTest
protected static $fixture_file = 'SearchFormTest.yml'; protected static $fixture_file = 'SearchFormTest.yml';
protected static $illegal_extensions = array( protected static $illegal_extensions = [
SiteTree::class => array('SiteTreeSubsites', 'Translatable') SiteTree::class => [
); SiteTreeSubsites::class,
FluentSiteTreeExtension::class,
],
];
/** /**
* @var ContentController * @var ContentController