Skip to content

Commit

Permalink
Merge branch '7.3' into 7.4
Browse files Browse the repository at this point in the history
  • Loading branch information
andrerom committed Feb 1, 2019
2 parents 71ca773 + f901a3a commit 07c0676
Show file tree
Hide file tree
Showing 14 changed files with 180 additions and 362 deletions.
15 changes: 3 additions & 12 deletions Repository/Tests/FieldType/AuthorIntegrationTest.php
Expand Up @@ -144,7 +144,7 @@ public function getFieldName()
public function assertFieldDataLoadedCorrect(Field $field)
{
$this->assertInstanceOf(
'eZ\\Publish\\Core\\FieldType\\Author\\Value',
AuthorValue::class,
$field->value
);

Expand Down Expand Up @@ -225,7 +225,7 @@ public function getValidUpdateFieldData()
public function assertUpdatedFieldDataLoadedCorrect(Field $field)
{
$this->assertInstanceOf(
'eZ\\Publish\\Core\\FieldType\\Author\\Value',
AuthorValue::class,
$field->value
);

Expand Down Expand Up @@ -285,7 +285,7 @@ public function provideInvalidUpdateFieldData()
public function assertCopiedFieldDataLoadedCorrectly(Field $field)
{
$this->assertInstanceOf(
'eZ\\Publish\\Core\\FieldType\\Author\\Value',
AuthorValue::class,
$field->value
);

Expand Down Expand Up @@ -417,15 +417,6 @@ public function providerForTestIsNotEmptyValue()
);
}

protected function checkSearchEngineSupport()
{
if (ltrim(get_class($this->getSetupFactory()), '\\') === 'eZ\\Publish\\API\\Repository\\Tests\\SetupFactory\\Legacy') {
$this->markTestSkipped(
"'ezauthor' field type is not searchable with Legacy Search Engine"
);
}
}

protected function getValidSearchValueOne()
{
return array(
Expand Down
10 changes: 10 additions & 0 deletions Repository/Tests/FieldType/DateAndTimeIntegrationTest.php
Expand Up @@ -30,6 +30,16 @@ public function getTypeName()
return 'ezdatetime';
}

/**
* {@inheritdoc}
*/
protected function supportsLikeWildcard($value)
{
parent::supportsLikeWildcard($value);

return false;
}

/**
* Get expected settings schema.
*
Expand Down
10 changes: 10 additions & 0 deletions Repository/Tests/FieldType/DateIntegrationTest.php
Expand Up @@ -31,6 +31,16 @@ public function getTypeName()
return 'ezdate';
}

/**
* {@inheritdoc}
*/
protected function supportsLikeWildcard($value)
{
parent::supportsLikeWildcard($value);

return false;
}

/**
* Get expected settings schema.
*
Expand Down
193 changes: 0 additions & 193 deletions Repository/Tests/FieldType/FileBaseIntegrationTest.php

This file was deleted.

110 changes: 0 additions & 110 deletions Repository/Tests/FieldType/RelationBaseIntegrationTest.php

This file was deleted.

10 changes: 10 additions & 0 deletions Repository/Tests/FieldType/RelationIntegrationTest.php
Expand Up @@ -33,6 +33,16 @@ public function getTypeName()
return 'ezobjectrelation';
}

/**
* {@inheritdoc}
*/
protected function supportsLikeWildcard($value)
{
parent::supportsLikeWildcard($value);

return false;
}

/**
* @param \eZ\Publish\API\Repository\Values\Content\Content $content
*
Expand Down

0 comments on commit 07c0676

Please sign in to comment.