diff --git a/src/Plugin/views/argument/SearchApiArgument.php b/src/Plugin/views/argument/SearchApiArgument.php index cfa6c8b..9f288fe 100644 --- a/src/Plugin/views/argument/SearchApiArgument.php +++ b/src/Plugin/views/argument/SearchApiArgument.php @@ -9,7 +9,7 @@ namespace Drupal\search_api\Plugin\views\argument; use Drupal\Component\Utility\Unicode; use Drupal\Core\Form\FormStateInterface; -use Drupal\search_api\TodoCacheableDependencyTrait; +use Drupal\search_api\UncacheableDependencyTrait; use Drupal\views\Plugin\views\argument\ArgumentPluginBase; /** @@ -21,7 +21,7 @@ use Drupal\views\Plugin\views\argument\ArgumentPluginBase; */ class SearchApiArgument extends ArgumentPluginBase { - use TodoCacheableDependencyTrait; + use UncacheableDependencyTrait; /** * The Views query object used by this contextual filter. diff --git a/src/Plugin/views/argument/SearchApiDate.php b/src/Plugin/views/argument/SearchApiDate.php index 6a48316..c94a225 100644 --- a/src/Plugin/views/argument/SearchApiDate.php +++ b/src/Plugin/views/argument/SearchApiDate.php @@ -9,7 +9,7 @@ namespace Drupal\search_api\Plugin\views\argument; use Drupal\Component\Render\FormattableMarkup; use Drupal\Component\Utility\Html; -use Drupal\search_api\TodoCacheableDependencyTrait; +use Drupal\search_api\UncacheableDependencyTrait; /** * Defines a contextual filter for conditions on date fields. @@ -20,7 +20,7 @@ use Drupal\search_api\TodoCacheableDependencyTrait; */ class SearchApiDate extends SearchApiArgument { - use TodoCacheableDependencyTrait; + use UncacheableDependencyTrait; /** * {@inheritdoc} diff --git a/src/Plugin/views/argument/SearchApiFulltext.php b/src/Plugin/views/argument/SearchApiFulltext.php index a57ca63..55fc156 100644 --- a/src/Plugin/views/argument/SearchApiFulltext.php +++ b/src/Plugin/views/argument/SearchApiFulltext.php @@ -10,7 +10,7 @@ namespace Drupal\search_api\Plugin\views\argument; use Drupal\Component\Utility\Html; use Drupal\Core\Form\FormStateInterface; use Drupal\search_api\Plugin\views\query\SearchApiQuery; -use Drupal\search_api\TodoCacheableDependencyTrait; +use Drupal\search_api\UncacheableDependencyTrait; /** * Defines a contextual filter for doing fulltext searches. @@ -21,7 +21,7 @@ use Drupal\search_api\TodoCacheableDependencyTrait; */ class SearchApiFulltext extends SearchApiArgument { - use TodoCacheableDependencyTrait; + use UncacheableDependencyTrait; /** * {@inheritdoc} diff --git a/src/Plugin/views/argument/SearchApiMoreLikeThis.php b/src/Plugin/views/argument/SearchApiMoreLikeThis.php index e97dc5e..3829337 100644 --- a/src/Plugin/views/argument/SearchApiMoreLikeThis.php +++ b/src/Plugin/views/argument/SearchApiMoreLikeThis.php @@ -10,7 +10,7 @@ namespace Drupal\search_api\Plugin\views\argument; use Drupal\Core\Form\FormStateInterface; use Drupal\search_api\Entity\Index; use Drupal\search_api\SearchApiException; -use Drupal\search_api\TodoCacheableDependencyTrait; +use Drupal\search_api\UncacheableDependencyTrait; /** * Defines a contextual filter for displaying a "More Like This" list. @@ -21,7 +21,7 @@ use Drupal\search_api\TodoCacheableDependencyTrait; */ class SearchApiMoreLikeThis extends SearchApiArgument { - use TodoCacheableDependencyTrait; + use UncacheableDependencyTrait; /** * {@inheritdoc} diff --git a/src/Plugin/views/argument/SearchApiTaxonomyTerm.php b/src/Plugin/views/argument/SearchApiTaxonomyTerm.php index 6713d2a..1ffcc15 100644 --- a/src/Plugin/views/argument/SearchApiTaxonomyTerm.php +++ b/src/Plugin/views/argument/SearchApiTaxonomyTerm.php @@ -8,7 +8,7 @@ namespace Drupal\search_api\Plugin\views\argument; use Drupal\Component\Utility\Html; -use Drupal\search_api\TodoCacheableDependencyTrait; +use Drupal\search_api\UncacheableDependencyTrait; use Drupal\taxonomy\Entity\Term; /** @@ -21,7 +21,7 @@ use Drupal\taxonomy\Entity\Term; // @todo This seems to be only partially ported to D8. class SearchApiTaxonomyTerm extends SearchApiArgument { - use TodoCacheableDependencyTrait; + use UncacheableDependencyTrait; /** * {@inheritdoc} diff --git a/src/Plugin/views/field/SearchApiExcerpt.php b/src/Plugin/views/field/SearchApiExcerpt.php index 0cd4800..8a78746 100644 --- a/src/Plugin/views/field/SearchApiExcerpt.php +++ b/src/Plugin/views/field/SearchApiExcerpt.php @@ -7,7 +7,7 @@ namespace Drupal\search_api\Plugin\views\field; -use Drupal\search_api\TodoCacheableDependencyTrait; +use Drupal\search_api\UncacheableDependencyTrait; use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\views\ResultRow; @@ -20,7 +20,7 @@ use Drupal\views\ResultRow; */ class SearchApiExcerpt extends FieldPluginBase { - use TodoCacheableDependencyTrait; + use UncacheableDependencyTrait; /** * {@inheritdoc} diff --git a/src/Plugin/views/filter/SearchApiFilterBoolean.php b/src/Plugin/views/filter/SearchApiFilterBoolean.php index 3e9951d..b849a26 100644 --- a/src/Plugin/views/filter/SearchApiFilterBoolean.php +++ b/src/Plugin/views/filter/SearchApiFilterBoolean.php @@ -7,7 +7,7 @@ namespace Drupal\search_api\Plugin\views\filter; -use Drupal\search_api\TodoCacheableDependencyTrait; +use Drupal\search_api\UncacheableDependencyTrait; use Drupal\views\Plugin\views\filter\BooleanOperator; /** @@ -19,7 +19,7 @@ use Drupal\views\Plugin\views\filter\BooleanOperator; */ class SearchApiFilterBoolean extends BooleanOperator { - use TodoCacheableDependencyTrait; + use UncacheableDependencyTrait; use SearchApiFilterTrait; } diff --git a/src/Plugin/views/filter/SearchApiFilterDatasource.php b/src/Plugin/views/filter/SearchApiFilterDatasource.php index e388670..56bbbd5 100644 --- a/src/Plugin/views/filter/SearchApiFilterDatasource.php +++ b/src/Plugin/views/filter/SearchApiFilterDatasource.php @@ -7,7 +7,7 @@ namespace Drupal\search_api\Plugin\views\filter; -use Drupal\search_api\TodoCacheableDependencyTrait; +use Drupal\search_api\UncacheableDependencyTrait; /** * Provides filtering on the datasource. @@ -18,7 +18,7 @@ use Drupal\search_api\TodoCacheableDependencyTrait; */ class SearchApiFilterDatasource extends SearchApiFilterOptions { - use TodoCacheableDependencyTrait; + use UncacheableDependencyTrait; /** * {@inheritdoc} diff --git a/src/Plugin/views/filter/SearchApiFilterDate.php b/src/Plugin/views/filter/SearchApiFilterDate.php index 49e715d..349f4e5 100644 --- a/src/Plugin/views/filter/SearchApiFilterDate.php +++ b/src/Plugin/views/filter/SearchApiFilterDate.php @@ -7,7 +7,7 @@ namespace Drupal\search_api\Plugin\views\filter; -use Drupal\search_api\TodoCacheableDependencyTrait; +use Drupal\search_api\UncacheableDependencyTrait; use Drupal\views\Plugin\views\filter\Date; /** @@ -19,7 +19,7 @@ use Drupal\views\Plugin\views\filter\Date; */ class SearchApiFilterDate extends Date { - use TodoCacheableDependencyTrait; + use UncacheableDependencyTrait; use SearchApiFilterTrait; /** diff --git a/src/Plugin/views/filter/SearchApiFilterEntityBase.php b/src/Plugin/views/filter/SearchApiFilterEntityBase.php index c169f2d..c4574a2 100644 --- a/src/Plugin/views/filter/SearchApiFilterEntityBase.php +++ b/src/Plugin/views/filter/SearchApiFilterEntityBase.php @@ -9,14 +9,14 @@ namespace Drupal\search_api\Plugin\views\filter; use Drupal\Component\Utility\Tags; use Drupal\Core\Form\FormStateInterface; -use Drupal\search_api\TodoCacheableDependencyTrait; +use Drupal\search_api\UncacheableDependencyTrait; /** * Provides a base class for filters on entity-typed fields. */ abstract class SearchApiFilterEntityBase extends SearchApiFilterString { - use TodoCacheableDependencyTrait; + use UncacheableDependencyTrait; /** * Where the $query object will reside: diff --git a/src/Plugin/views/filter/SearchApiFilterNumeric.php b/src/Plugin/views/filter/SearchApiFilterNumeric.php index 71b3a15..ff2e5fa 100644 --- a/src/Plugin/views/filter/SearchApiFilterNumeric.php +++ b/src/Plugin/views/filter/SearchApiFilterNumeric.php @@ -7,7 +7,7 @@ namespace Drupal\search_api\Plugin\views\filter; -use Drupal\search_api\TodoCacheableDependencyTrait; +use Drupal\search_api\UncacheableDependencyTrait; use Drupal\views\Plugin\views\filter\NumericFilter; /** @@ -19,7 +19,7 @@ use Drupal\views\Plugin\views\filter\NumericFilter; */ class SearchApiFilterNumeric extends NumericFilter { - use TodoCacheableDependencyTrait; + use UncacheableDependencyTrait; use SearchApiFilterTrait; /** diff --git a/src/Plugin/views/filter/SearchApiFilterOptions.php b/src/Plugin/views/filter/SearchApiFilterOptions.php index 6c58981..d095dd2 100644 --- a/src/Plugin/views/filter/SearchApiFilterOptions.php +++ b/src/Plugin/views/filter/SearchApiFilterOptions.php @@ -8,7 +8,7 @@ namespace Drupal\search_api\Plugin\views\filter; use Drupal\Core\Form\FormStateInterface; -use Drupal\search_api\TodoCacheableDependencyTrait; +use Drupal\search_api\UncacheableDependencyTrait; use Drupal\views\Plugin\views\filter\ManyToOne; /** @@ -20,7 +20,7 @@ use Drupal\views\Plugin\views\filter\ManyToOne; */ class SearchApiFilterOptions extends ManyToOne { - use TodoCacheableDependencyTrait; + use UncacheableDependencyTrait; use SearchApiFilterTrait; /** diff --git a/src/Plugin/views/filter/SearchApiFilterString.php b/src/Plugin/views/filter/SearchApiFilterString.php index a0e0067..f6cc5f7 100644 --- a/src/Plugin/views/filter/SearchApiFilterString.php +++ b/src/Plugin/views/filter/SearchApiFilterString.php @@ -7,7 +7,7 @@ namespace Drupal\search_api\Plugin\views\filter; -use Drupal\search_api\TodoCacheableDependencyTrait; +use Drupal\search_api\UncacheableDependencyTrait; /** * Defines a filter for adding conditions on string fields to the query. @@ -23,6 +23,6 @@ use Drupal\search_api\TodoCacheableDependencyTrait; */ class SearchApiFilterString extends SearchApiFilterNumeric { - use TodoCacheableDependencyTrait; + use UncacheableDependencyTrait; } diff --git a/src/Plugin/views/filter/SearchApiFilterText.php b/src/Plugin/views/filter/SearchApiFilterText.php index bc1e475..21aee15 100644 --- a/src/Plugin/views/filter/SearchApiFilterText.php +++ b/src/Plugin/views/filter/SearchApiFilterText.php @@ -6,7 +6,7 @@ */ namespace Drupal\search_api\Plugin\views\filter; -use Drupal\search_api\TodoCacheableDependencyTrait; +use Drupal\search_api\UncacheableDependencyTrait; /** * Defines a filter for filtering on fulltext fields. @@ -17,7 +17,7 @@ use Drupal\search_api\TodoCacheableDependencyTrait; */ class SearchApiFilterText extends SearchApiFilterString { - use TodoCacheableDependencyTrait; + use UncacheableDependencyTrait; /** * {@inheritdoc} diff --git a/src/Plugin/views/filter/SearchApiFulltext.php b/src/Plugin/views/filter/SearchApiFulltext.php index 8f59625..26fb7ad 100644 --- a/src/Plugin/views/filter/SearchApiFulltext.php +++ b/src/Plugin/views/filter/SearchApiFulltext.php @@ -11,7 +11,7 @@ use Drupal\Component\Utility\Unicode; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Render\Element; use Drupal\search_api\Entity\Index; -use Drupal\search_api\TodoCacheableDependencyTrait; +use Drupal\search_api\UncacheableDependencyTrait; use Drupal\views\Plugin\views\filter\FilterPluginBase; /** @@ -23,7 +23,7 @@ use Drupal\views\Plugin\views\filter\FilterPluginBase; */ class SearchApiFulltext extends FilterPluginBase { - use TodoCacheableDependencyTrait; + use UncacheableDependencyTrait; use SearchApiFilterTrait; /** diff --git a/src/Plugin/views/filter/SearchApiLanguage.php b/src/Plugin/views/filter/SearchApiLanguage.php index 2280f58..c4e5161 100644 --- a/src/Plugin/views/filter/SearchApiLanguage.php +++ b/src/Plugin/views/filter/SearchApiLanguage.php @@ -9,7 +9,7 @@ namespace Drupal\search_api\Plugin\views\filter; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Language\LanguageManagerInterface; -use Drupal\search_api\TodoCacheableDependencyTrait; +use Drupal\search_api\UncacheableDependencyTrait; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -21,7 +21,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; */ class SearchApiLanguage extends SearchApiFilterOptions { - use TodoCacheableDependencyTrait; + use UncacheableDependencyTrait; /** * The language manager. diff --git a/src/Plugin/views/filter/SearchApiTerm.php b/src/Plugin/views/filter/SearchApiTerm.php index 2cc9910..bcc337e 100644 --- a/src/Plugin/views/filter/SearchApiTerm.php +++ b/src/Plugin/views/filter/SearchApiTerm.php @@ -7,7 +7,7 @@ namespace Drupal\search_api\Plugin\views\filter; -use Drupal\search_api\TodoCacheableDependencyTrait; +use Drupal\search_api\UncacheableDependencyTrait; use Drupal\taxonomy\Plugin\views\filter\TaxonomyIndexTid; /** @@ -21,7 +21,7 @@ use Drupal\taxonomy\Plugin\views\filter\TaxonomyIndexTid; */ class SearchApiTerm extends TaxonomyIndexTid { - use TodoCacheableDependencyTrait; + use UncacheableDependencyTrait; use SearchApiFilterTrait; } diff --git a/src/Plugin/views/filter/SearchApiUser.php b/src/Plugin/views/filter/SearchApiUser.php index d0cd131..89fc575 100644 --- a/src/Plugin/views/filter/SearchApiUser.php +++ b/src/Plugin/views/filter/SearchApiUser.php @@ -7,7 +7,7 @@ namespace Drupal\search_api\Plugin\views\filter; -use Drupal\search_api\TodoCacheableDependencyTrait; +use Drupal\search_api\UncacheableDependencyTrait; use Drupal\user\Plugin\views\filter\Name; /** @@ -21,7 +21,7 @@ use Drupal\user\Plugin\views\filter\Name; */ class SearchApiUser extends Name { - use TodoCacheableDependencyTrait; + use UncacheableDependencyTrait; use SearchApiFilterTrait; /** diff --git a/src/Plugin/views/row/SearchApiRow.php b/src/Plugin/views/row/SearchApiRow.php index 7df0453..0b3ae45 100644 --- a/src/Plugin/views/row/SearchApiRow.php +++ b/src/Plugin/views/row/SearchApiRow.php @@ -14,7 +14,7 @@ use Drupal\Core\Logger\LoggerChannelInterface; use Drupal\Core\TypedData\ComplexDataInterface; use Drupal\search_api\Plugin\views\query\SearchApiQuery; use Drupal\search_api\SearchApiException; -use Drupal\search_api\TodoCacheableDependencyTrait; +use Drupal\search_api\UncacheableDependencyTrait; use Drupal\views\Plugin\views\display\DisplayPluginBase; use Drupal\views\Plugin\views\row\RowPluginBase; use Drupal\views\ViewExecutable; @@ -31,7 +31,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; */ class SearchApiRow extends RowPluginBase { - use TodoCacheableDependencyTrait; + use UncacheableDependencyTrait; /** * The search index. diff --git a/src/Plugin/views/sort/SearchApiSort.php b/src/Plugin/views/sort/SearchApiSort.php index 76a77dc..ba520e4 100644 --- a/src/Plugin/views/sort/SearchApiSort.php +++ b/src/Plugin/views/sort/SearchApiSort.php @@ -7,7 +7,7 @@ namespace Drupal\search_api\Plugin\views\sort; -use Drupal\search_api\TodoCacheableDependencyTrait; +use Drupal\search_api\UncacheableDependencyTrait; use Drupal\views\Plugin\views\sort\SortPluginBase; /** @@ -17,7 +17,7 @@ use Drupal\views\Plugin\views\sort\SortPluginBase; */ class SearchApiSort extends SortPluginBase { - use TodoCacheableDependencyTrait; + use UncacheableDependencyTrait; /** * The associated views query object. diff --git a/src/TodoCacheableDependencyTrait.php b/src/UncacheableDependencyTrait.php similarity index 97% rename from src/TodoCacheableDependencyTrait.php rename to src/UncacheableDependencyTrait.php index 4f1ed94..c11e933 100644 --- a/src/TodoCacheableDependencyTrait.php +++ b/src/UncacheableDependencyTrait.php @@ -32,7 +32,7 @@ namespace Drupal\search_api; * * @see \Drupal\Core\Cache\CacheableDependencyInterface */ -trait TodoCacheableDependencyTrait { +trait UncacheableDependencyTrait { /** * {@inheritdoc}