Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EZP-29984: Fix LIKE support for * as wildcard across engines, deprecate % usage #2517

Merged
merged 17 commits into from
Feb 1, 2019
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/.travis/prepare_unittest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ composer config -g github-oauth.github.com "d0285ed5c8644f30547572ead2ed897431c1
# solr package search API integration tests
if [ "$TEST_CONFIG" = "phpunit-integration-legacy-solr.xml" ] ; then
echo "> Require ezsystems/ezplatform-solr-search-engine:^1.3.0@dev"
composer require --no-update ezsystems/ezplatform-solr-search-engine:^1.3.0@dev
composer require --no-update ezsystems/ezplatform-solr-search-engine:dev-EZP-29984
fi

# Switch to another Symfony version if asked for
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,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 @@ -219,7 +219,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 @@ -279,7 +279,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 @@ -411,15 +411,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
Original file line number Diff line number Diff line change
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 eZ/Publish/API/Repository/Tests/FieldType/DateIntegrationTest.php
Original file line number Diff line number Diff line change
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 eZ/Publish/API/Repository/Tests/FieldType/FileBaseIntegrationTest.php

This file was deleted.

This file was deleted.

Loading