Skip to content

Commit

Permalink
API Use updated Versioned and Staged classes
Browse files Browse the repository at this point in the history
  • Loading branch information
emteknetnz committed Oct 29, 2024
1 parent 0311c19 commit 4ea2ee8
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions src/AddToCampaignHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
use SilverStripe\ORM\DataObject;
use SilverStripe\Core\Validation\ValidationException;
use SilverStripe\Core\Validation\ValidationResult;
use SilverStripe\Versioned\ChangeSet;
use SilverStripe\Versioned\ChangeSetItem;
use SilverStripe\Versioned\Versioned;
use SilverStripe\Versioned\Staged\ChangeSet;
use SilverStripe\Versioned\Staged\ChangeSetItem;
use SilverStripe\Versioned\Mode\Versioned;
use SilverStripe\Core\Convert;

/**
Expand Down
4 changes: 2 additions & 2 deletions src/CampaignAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
use SilverStripe\Security\PermissionProvider;
use SilverStripe\Security\Security;
use SilverStripe\Security\SecurityToken;
use SilverStripe\Versioned\ChangeSet;
use SilverStripe\Versioned\ChangeSetItem;
use SilverStripe\Versioned\Staged\ChangeSet;
use SilverStripe\Versioned\Staged\ChangeSetItem;
use SilverStripe\View\Requirements;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/CampaignAdminList.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
namespace SilverStripe\CampaignAdmin;

use SilverStripe\Forms\FormField;
use SilverStripe\Versioned\ChangeSet;
use SilverStripe\Versioned\Staged\ChangeSet;

/**
* Warning: Volatile API as placeholder for standard "GridField"
Expand Down
2 changes: 1 addition & 1 deletion tests/behat/src/FixtureContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use SilverStripe\BehatExtension\Context\FixtureContext as BaseFixtureContext;
use SilverStripe\BehatExtension\Utility\StepHelper;
use SilverStripe\MinkFacebookWebDriver\FacebookWebDriver;
use SilverStripe\Versioned\ChangeSet;
use SilverStripe\Versioned\Staged\ChangeSet;

/**
* Context used to create fixtures in the SilverStripe ORM.
Expand Down
2 changes: 1 addition & 1 deletion tests/php/AddToCampaignValidatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use SilverStripe\CampaignAdmin\AddToCampaignHandler;
use SilverStripe\CampaignAdmin\AddToCampaignValidator;
use SilverStripe\Dev\SapphireTest;
use SilverStripe\Versioned\ChangeSet;
use SilverStripe\Versioned\Staged\ChangeSet;

class AddToCampaignValidatorTest extends SapphireTest
{
Expand Down
2 changes: 1 addition & 1 deletion tests/php/AddToCampaignValidatorTest.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SilverStripe\CampaignAdmin\Tests\AddToCampaignValidatorTest\TestObject:
object1:
Title: 'Test Object'
SilverStripe\Versioned\ChangeSet:
SilverStripe\Versioned\Staged\ChangeSet:
changeset1:
Name: 'ChangeSet 1'
changeset2:
Expand Down
2 changes: 1 addition & 1 deletion tests/php/AddToCampaignValidatorTest/TestObject.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use SilverStripe\Dev\TestOnly;
use SilverStripe\ORM\DataObject;
use SilverStripe\Versioned\Versioned;
use SilverStripe\Versioned\Mode\Versioned;

class TestObject extends DataObject implements TestOnly
{
Expand Down
4 changes: 2 additions & 2 deletions tests/php/CampaignAdminTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
use SilverStripe\Security\Group;
use SilverStripe\Security\Member;
use SilverStripe\Security\Permission;
use SilverStripe\Versioned\ChangeSet;
use SilverStripe\Versioned\ChangeSetItem;
use SilverStripe\Versioned\Staged\ChangeSet;
use SilverStripe\Versioned\Staged\ChangeSetItem;
use PHPUnit\Framework\Attributes\DataProvider;

class CampaignAdminTest extends FunctionalTest
Expand Down
2 changes: 1 addition & 1 deletion tests/php/CampaignAdminTest.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SilverStripe\Versioned\ChangeSet:
SilverStripe\Versioned\Staged\ChangeSet:
change1:
Name: 'changeset 1'
State: open
Expand Down
2 changes: 1 addition & 1 deletion tests/php/CampaignAdminTest/InvalidChangeSet.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace SilverStripe\CampaignAdmin\Tests\CampaignAdminTest;

use SilverStripe\ORM\UnexpectedDataException;
use SilverStripe\Versioned\ChangeSet;
use SilverStripe\Versioned\Staged\ChangeSet;
use SilverStripe\Dev\TestOnly;

class InvalidChangeSet extends ChangeSet implements TestOnly
Expand Down
2 changes: 1 addition & 1 deletion tests/php/SiteTreeExtensionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use SilverStripe\CampaignAdmin\SiteTreeExtension;
use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\Dev\SapphireTest;
use SilverStripe\Versioned\Versioned;
use SilverStripe\Versioned\Mode\Versioned;

class SiteTreeExtensionTest extends SapphireTest
{
Expand Down

0 comments on commit 4ea2ee8

Please sign in to comment.