Skip to content

Commit

Permalink
Merge pull request #222 from creative-commoners/pulls/2/stop-using-depr
Browse files Browse the repository at this point in the history
API Stop using deprecated API
  • Loading branch information
sabina-talipova authored Dec 5, 2022
2 parents d2a3a74 + dc932bd commit b5e7981
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
6 changes: 5 additions & 1 deletion src/StringTagField.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use SilverStripe\Control\Controller;
use SilverStripe\Control\HTTPRequest;
use SilverStripe\Control\HTTPResponse;
use SilverStripe\Dev\Deprecation;
use SilverStripe\Forms\DropdownField;
use SilverStripe\Forms\Validator;
use SilverStripe\ORM\ArrayList;
Expand Down Expand Up @@ -281,7 +282,10 @@ public function saveInto(DataObjectInterface $record)

$record->$name = $this->dataValue();

if (self::config()->get('immediate_write_enabled')) {
$immediate_write_enabled = Deprecation::withNoReplacement(function () {
return self::config()->get('immediate_write_enabled');
});
if ($immediate_write_enabled) {
$record->write();
}
}
Expand Down
11 changes: 9 additions & 2 deletions tests/StringTagFieldTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use SilverStripe\Forms\Form;
use SilverStripe\TagField\StringTagField;
use SilverStripe\TagField\Tests\Stub\StringTagFieldTestBlogPost;
use SilverStripe\Dev\Deprecation;

class StringTagFieldTest extends SapphireTest
{
Expand Down Expand Up @@ -63,10 +64,13 @@ public function testItSavesTagsOnExistingRecords()

public function testImmediateWriteEnabled()
{
if (Deprecation::isEnabled()) {
$this->markTestSkipped('Test calls deprecated code');
}
$record = $this->getNewStringTagFieldTestBlogPost('BlogPost1');
$record->write();

StringTagField::config()->update('immediate_write_enabled', true);
StringTagField::config()->set('immediate_write_enabled', true);

$field = new StringTagField('Tags');
$field->setValue(['Tag1', 'Tag2']);
Expand All @@ -77,10 +81,13 @@ public function testImmediateWriteEnabled()

public function testImmediateWriteDisabled()
{
if (Deprecation::isEnabled()) {
$this->markTestSkipped('Test calls deprecated code');
}
$record = $this->getNewStringTagFieldTestBlogPost('BlogPost1');
$record->write();

StringTagField::config()->update('immediate_write_enabled', false);
StringTagField::config()->set('immediate_write_enabled', false);

$field = new StringTagField('Tags');
$field->setValue(['Tag1', 'Tag2']);
Expand Down

0 comments on commit b5e7981

Please # to comment.