mirror of
https://github.com/silverstripe/silverstripe-tagfield
synced 2024-06-29 07:59:26 +02:00
API Remove deprecated code (#228)
This commit is contained in:
parent
5b26bd0739
commit
6f203a36af
|
@ -6,7 +6,6 @@ use Iterator;
|
||||||
use SilverStripe\Control\Controller;
|
use SilverStripe\Control\Controller;
|
||||||
use SilverStripe\Control\HTTPRequest;
|
use SilverStripe\Control\HTTPRequest;
|
||||||
use SilverStripe\Control\HTTPResponse;
|
use SilverStripe\Control\HTTPResponse;
|
||||||
use SilverStripe\Dev\Deprecation;
|
|
||||||
use SilverStripe\Forms\DropdownField;
|
use SilverStripe\Forms\DropdownField;
|
||||||
use SilverStripe\Forms\Validator;
|
use SilverStripe\Forms\Validator;
|
||||||
use SilverStripe\ORM\ArrayList;
|
use SilverStripe\ORM\ArrayList;
|
||||||
|
@ -34,13 +33,6 @@ class StringTagField extends DropdownField
|
||||||
'suggest',
|
'suggest',
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
|
||||||
* @var bool Triggers a write call within the saveInto function if enabled
|
|
||||||
*
|
|
||||||
* @deprecated 3.0.0 Will be removed without equivalent functionality to replace it
|
|
||||||
*/
|
|
||||||
private static $immediate_write_enabled = true;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var bool
|
* @var bool
|
||||||
*/
|
*/
|
||||||
|
@ -280,13 +272,6 @@ class StringTagField extends DropdownField
|
||||||
$name = $this->getName();
|
$name = $this->getName();
|
||||||
|
|
||||||
$record->$name = $this->dataValue();
|
$record->$name = $this->dataValue();
|
||||||
|
|
||||||
$immediate_write_enabled = Deprecation::withNoReplacement(function () {
|
|
||||||
return self::config()->get('immediate_write_enabled');
|
|
||||||
});
|
|
||||||
if ($immediate_write_enabled) {
|
|
||||||
$record->write();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -8,7 +8,6 @@ use SilverStripe\Forms\FieldList;
|
||||||
use SilverStripe\Forms\Form;
|
use SilverStripe\Forms\Form;
|
||||||
use SilverStripe\TagField\StringTagField;
|
use SilverStripe\TagField\StringTagField;
|
||||||
use SilverStripe\TagField\Tests\Stub\StringTagFieldTestBlogPost;
|
use SilverStripe\TagField\Tests\Stub\StringTagFieldTestBlogPost;
|
||||||
use SilverStripe\Dev\Deprecation;
|
|
||||||
|
|
||||||
class StringTagFieldTest extends SapphireTest
|
class StringTagFieldTest extends SapphireTest
|
||||||
{
|
{
|
||||||
|
@ -62,44 +61,6 @@ class StringTagFieldTest extends SapphireTest
|
||||||
$this->assertEquals('Tag1,Tag2', $record->Tags);
|
$this->assertEquals('Tag1,Tag2', $record->Tags);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testImmediateWriteEnabled()
|
|
||||||
{
|
|
||||||
if (Deprecation::isEnabled()) {
|
|
||||||
$this->markTestSkipped('Test calls deprecated code');
|
|
||||||
}
|
|
||||||
$record = $this->getNewStringTagFieldTestBlogPost('BlogPost1');
|
|
||||||
$record->write();
|
|
||||||
|
|
||||||
StringTagField::config()->set('immediate_write_enabled', true);
|
|
||||||
|
|
||||||
$field = new StringTagField('Tags');
|
|
||||||
$field->setValue(['Tag1', 'Tag2']);
|
|
||||||
$field->saveInto($record);
|
|
||||||
|
|
||||||
$this->assertEquals('Tag1,Tag2', StringTagFieldTestBlogPost::get()->byID($record->ID)->Tags);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testImmediateWriteDisabled()
|
|
||||||
{
|
|
||||||
if (Deprecation::isEnabled()) {
|
|
||||||
$this->markTestSkipped('Test calls deprecated code');
|
|
||||||
}
|
|
||||||
$record = $this->getNewStringTagFieldTestBlogPost('BlogPost1');
|
|
||||||
$record->write();
|
|
||||||
|
|
||||||
StringTagField::config()->set('immediate_write_enabled', false);
|
|
||||||
|
|
||||||
$field = new StringTagField('Tags');
|
|
||||||
$field->setValue(['Tag1', 'Tag2']);
|
|
||||||
$field->saveInto($record);
|
|
||||||
|
|
||||||
$this->assertNull(StringTagFieldTestBlogPost::get()->byID($record->ID)->Tags);
|
|
||||||
|
|
||||||
$record->write();
|
|
||||||
|
|
||||||
$this->assertEquals('Tag1,Tag2', StringTagFieldTestBlogPost::get()->byID($record->ID)->Tags);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testItSuggestsTags()
|
public function testItSuggestsTags()
|
||||||
{
|
{
|
||||||
$field = new StringTagField('SomeField', 'Some field', ['Tag1', 'Tag2'], []);
|
$field = new StringTagField('SomeField', 'Some field', ['Tag1', 'Tag2'], []);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user