#2624862: Namespace change from facet_api to facets.

.travis.yml

@@ -35,8 +35,8 @@ env:
     - PATH="$PATH:$HOME/.composer/vendor/bin"
 
     # Configuration variables.
-    - DRUPAL_TI_MODULE_NAME="facetapi"
-    - DRUPAL_TI_SIMPLETEST_GROUP="facetapi"
+    - DRUPAL_TI_MODULE_NAME="facets"
+    - DRUPAL_TI_SIMPLETEST_GROUP="facets"
 
     # Define runners and environment vars to include before and after the
     # main runners / environment vars.

config/schema/facetapi.facet.schema.yml → config/schema/facets.facet.schema.yml

-facetapi.facet.*:
+facets.facet.*:
   type: config_entity
   label : 'Facet'
   mapping:
@@ -52,4 +52,4 @@ facetapi.facet.*:
               type: integer
               label: 'The processor''s weight for this stage'
           settings:
-            type: facetapi.processor.plugin.[%parent.processor_id]
+            type: facets.processor.plugin.[%parent.processor_id]

config/schema/facetapi.processor.schema.yml → config/schema/facets.processor.schema.yml

-facetapi.processor.plugin.count_widget_order:
+facets.processor.plugin.count_widget_order:
   type: mapping
   label: 'Count widget order'
   mapping:
@@ -6,7 +6,7 @@ facetapi.processor.plugin.count_widget_order:
       type: string
       label: sort order
 
-facetapi.processor.plugin.display_value_widget_order:
+facets.processor.plugin.display_value_widget_order:
   type: mapping
   label: 'Display value widget order'
   mapping:
@@ -14,7 +14,7 @@ facetapi.processor.plugin.display_value_widget_order:
       type: string
       label: sort order
 
-facetapi.processor.plugin.raw_value_widget_order:
+facets.processor.plugin.raw_value_widget_order:
   type: mapping
   label: 'Raw value widget order'
   mapping:
@@ -22,7 +22,7 @@ facetapi.processor.plugin.raw_value_widget_order:
       type: string
       label: sort order
 
-facetapi.processor.plugin.active_widget_order:
+facets.processor.plugin.active_widget_order:
   type: mapping
   label: 'Active widget order'
   mapping:
@@ -30,7 +30,7 @@ facetapi.processor.plugin.active_widget_order:
       type: string
       label: sort order
 
-facetapi.processor.plugin.minimum_count:
+facets.processor.plugin.minimum_count:
   type: mapping
   label: 'Minimum count widget'
   mapping:

core_search_facetapi/core_search_facetapi.info.yml → core_search_facets/core_search_facetapi.info.yml

@@ -4,4 +4,4 @@ description: 'Facet API integration for Core.'
 core: 8.x
 package: Search
 dependencies:
- - facetapi
+ - facets

core_search_facetapi/core_search_facetapi.module → core_search_facets/core_search_facetapi.module

@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains core_search_facetapi.module
+ * Contains core_search_facets.module
  */
 
 use Drupal\Core\Database\Query\AlterableInterface;
@@ -12,13 +12,13 @@ use Drupal\Core\Database\Query\AlterableInterface;
  *
  * @param \Drupal\Core\Database\Query\AlterableInterface $query
  */
-function core_search_facetapi_query_search_node_search_alter(AlterableInterface $query) {
+function core_search_facets_query_search_node_search_alter(AlterableInterface $query) {
   // Obtain the Facet Source id for the current search.
   $request = \Drupal::requestStack()->getMasterRequest();
   $search_page = $request->attributes->get('entity');
 
-  /** @var \Drupal\facetapi\FacetManager\DefaultFacetManager $facet_manager */
-  $facet_manager = \Drupal::service('facetapi.manager');
+  /** @var \Drupal\facets\FacetManager\DefaultFacetManager $facet_manager */
+  $facet_manager = \Drupal::service('facets.manager');
   $search_id = 'core_node_search:' . $search_page->id();
 
   // Add the active filters.
@@ -36,12 +36,12 @@ function core_search_facetapi_query_search_node_search_alter(AlterableInterface
  * @see \Drupal\search\Annotation\SearchPlugin
  * @see \Drupal\search\SearchPluginManager
  */
-function core_search_facetapi_search_plugin_alter(array &$definitions) {
+function core_search_facets_search_plugin_alter(array &$definitions) {
   // Replace the Search Plugin class to alter the search form on a different
   // way because we don't need content types or languages as advanced search
   // filters.
   // @TODO wait until we can add configuration to a facet source.
   if (isset($definitions['node_search'])) {
-    //$definitions['node_search']['class'] = 'Drupal\core_search_facetapi\Plugin\Search\NodeSearchFacets';
+    //$definitions['node_search']['class'] = 'Drupal\core_search_facets\Plugin\Search\NodeSearchFacets';
   }
 }

core_search_facetapi/src/FacetapiQuery.php → core_search_facets/src/FacetapiQuery.php

@@ -2,17 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\core_search_facetapi\FacetapiQuery.
+ * Contains \Drupal\core_search_facets\FacetsQuery.
  */
 
-namespace Drupal\core_search_facetapi;
+namespace Drupal\core_search_facets;
 
 use Drupal\search\SearchQuery;
 
 /**
  * Extension of the SearchQuery class.
  */
-class FacetapiQuery extends SearchQuery {
+class FacetsQuery extends SearchQuery {
 
   /**
    * Stores joined tables.
@@ -27,7 +27,7 @@ class FacetapiQuery extends SearchQuery {
    * @param $table_alias
    *   The alias of the table being joined.
    *
-   *  @return FacetapiQuery
+   *  @return FacetsQuery
    *    An instance of this class.
    */
   public function addFacetJoin(array $query_info, $table_alias) {
@@ -46,7 +46,7 @@ class FacetapiQuery extends SearchQuery {
    * @param array $query_info
    *   An associative array of query information.
    *
-   *  @return FacetapiQuery
+   *  @return FacetsQuery
    *    An instance of this class.
    */
   public function addFacetField(array $query_info) {

core_search_facetapi/src/Plugin/CoreSearchFacetSourceInterface.php → core_search_facets/src/Plugin/CoreSearchFacetSourceInterface.php

@@ -2,12 +2,12 @@
 
 /**
  * @file
- * Contains \Drupal\core_search_facetapi\Plugin\FacetSourceInterface.
+ * Contains \Drupal\core_search_facets\Plugin\FacetSourceInterface.
  */
 
-namespace Drupal\core_search_facetapi\Plugin;
+namespace Drupal\core_search_facets\Plugin;
 
-use Drupal\facetapi\FacetInterface;
+use Drupal\facets\FacetInterface;
 
 /**
  *
@@ -22,15 +22,15 @@ interface CoreSearchFacetSourceInterface {
   /**
    * Sets the facet query object.
    *
-   * @return \Drupal\core_search_facetapi\FacetapiQuery
+   * @return \Drupal\core_search_facets\FacetsQuery
    */
   public function getFacetQueryExtender();
 
   /**
    * Returns the query info for this facet field.
    *
-   * @param \Drupal\facetapi\FacetInterface $facet
-   *   The facet definition as returned by facetapi_facet_load().
+   * @param \Drupal\facets\FacetInterface $facet
+   *   The facet definition as returned by facets_facet_load().
    *
    * @return array
    *   An associative array containing:

core_search_facetapi/src/Plugin/Search/NodeSearchFacets.php → core_search_facets/src/Plugin/Search/NodeSearchFacets.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\core_search_facetapi\Plugin\Search\NodeSearchFacets.
+ * Contains \Drupal\core_search_facets\Plugin\Search\NodeSearchFacets.
  */
 
-namespace Drupal\core_search_facetapi\Plugin\Search;
+namespace Drupal\core_search_facets\Plugin\Search;
 
 use Drupal\Core\Config\Config;
 use Drupal\Core\Database\Driver\mysql\Connection;
@@ -46,7 +46,7 @@ class NodeSearchFacets extends NodeSearch {
     parent::__construct($configuration, $plugin_id, $plugin_definition, $database, $entity_manager, $module_handler, $search_settings, $language_manager, $renderer, $account);
     /** @var \Symfony\Component\HttpFoundation\RequestStack $request_stack */
     if ($search_page = $request_stack->getMasterRequest()->attributes->get('entity')) {
-      /** @var \Drupal\facetapi\FacetSource\FacetSourcePluginManager $facet_source_plugin_manager */
+      /** @var \Drupal\facets\FacetSource\FacetSourcePluginManager $facet_source_plugin_manager */
       $this->facetSource = $facet_source_plugin_manager->createInstance('core_node_search:' . $search_page->id());
     }
   }
@@ -66,7 +66,7 @@ class NodeSearchFacets extends NodeSearch {
       $container->get('language_manager'),
       $container->get('renderer'),
       $container->get('current_user'),
-      $container->get('plugin.manager.facetapi.facet_source'),
+      $container->get('plugin.manager.facets.facet_source'),
       $container->get('request_stack')
     );
   }

core_search_facetapi/src/Plugin/facetapi/facet_source/CoreNodeSearchFacetSource.php → core_search_facets/src/Plugin/facetapi/facet_source/CoreNodeSearchFacetSource.php

@@ -2,18 +2,18 @@
 
 /**
  * @file
- *   Contains \Drupal\core_search_facetapi\Plugin\facet_api\facet_source\CoreNodeSearchFacetSource
+ *   Contains \Drupal\core_search_facets\Plugin\facets\facet_source\CoreNodeSearchFacetSource
  */
 
-namespace Drupal\core_search_facetapi\Plugin\facetapi\facet_source;
+namespace Drupal\core_search_facets\Plugin\facets\facet_source;
 
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\core_search_facetapi\Plugin\CoreSearchFacetSourceInterface;
-use Drupal\facetapi\FacetInterface;
-use Drupal\facetapi\FacetSource\FacetSourceInterface;
-use Drupal\facetapi\FacetSource\FacetSourcePluginBase;
+use Drupal\core_search_facets\Plugin\CoreSearchFacetSourceInterface;
+use Drupal\facets\FacetInterface;
+use Drupal\facets\FacetSource\FacetSourceInterface;
+use Drupal\facets\FacetSource\FacetSourcePluginBase;
 use Drupal\search\SearchPageInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -21,9 +21,9 @@ use Symfony\Component\HttpFoundation\RequestStack;
 /**
  * Represents a facet source which represents the search api views.
  *
- * @FacetApiFacetSource(
+ * @FacetsFacetSource(
  *   id = "core_node_search",
- *   deriver = "Drupal\core_search_facetapi\Plugin\facetapi\facet_source\CoreNodeSearchFacetSourceDeriver"
+ *   deriver = "Drupal\core_search_facets\Plugin\facets\facet_source\CoreNodeSearchFacetSourceDeriver"
  * )
  */
 class CoreNodeSearchFacetSource extends FacetSourcePluginBase implements CoreSearchFacetSourceInterface {
@@ -79,7 +79,7 @@ class CoreNodeSearchFacetSource extends FacetSourcePluginBase implements CoreSea
       $configuration,
       $plugin_id,
       $plugin_definition,
-      $container->get('plugin.manager.facetapi.query_type'),
+      $container->get('plugin.manager.facets.query_type'),
       $container->get('plugin.manager.search'),
       $request_stack
     );
@@ -119,7 +119,7 @@ class CoreNodeSearchFacetSource extends FacetSourcePluginBase implements CoreSea
    * {@inheritdoc}
    */
   public function getQueryTypesForFacet(FacetInterface $facet) {
-    // Get our FacetApi Field Identifier.
+    // Get our Facets Field Identifier.
     $field_id = $facet->getFieldIdentifier();
 
     return $this->getQueryTypesForDataType($field_id);
@@ -200,7 +200,7 @@ class CoreNodeSearchFacetSource extends FacetSourcePluginBase implements CoreSea
     //$this->searchQuery->searchExpression($input, $this->searchType);
     //$this->searchQuery->publicParseSearchExpression();
 
-    $this->facetQueryExtender = db_select('search_index', 'i', array('target' => 'replica'))->extend('Drupal\core_search_facetapi\FacetapiQuery');
+    $this->facetQueryExtender = db_select('search_index', 'i', array('target' => 'replica'))->extend('Drupal\core_search_facets\FacetsQuery');
     $this->facetQueryExtender->join('node_field_data', 'n', 'n.nid = i.sid');
     $this->facetQueryExtender
       //->condition('n.status', 1)
@@ -266,7 +266,7 @@ class CoreNodeSearchFacetSource extends FacetSourcePluginBase implements CoreSea
    * @TODO move to the Base class???
    */
   public function hasFacets() {
-    $manager = \Drupal::service('entity_type.manager')->getStorage('facetapi_facet');
+    $manager = \Drupal::service('entity_type.manager')->getStorage('facets_facet');
     $facets = $manager->loadMultiple();
     foreach($facets as $facet) {
       if ($facet->getFacetSourceId() == $this->getPluginId()) {

core_search_facetapi/src/Plugin/facetapi/facet_source/CoreNodeSearchFacetSourceDeriver.php → core_search_facets/src/Plugin/facetapi/facet_source/CoreNodeSearchFacetSourceDeriver.php

@@ -2,19 +2,19 @@
 
 /**
  * @file
- * Contains \Drupal\core_search_facetapi\Plugin\facet_api\facet_source\CoreNodeSearchFacetSourceDeriver.
+ * Contains \Drupal\core_search_facets\Plugin\facets\facet_source\CoreNodeSearchFacetSourceDeriver.
  */
 
-namespace Drupal\core_search_facetapi\Plugin\facetapi\facet_source;
+namespace Drupal\core_search_facets\Plugin\facets\facet_source;
 
 use Drupal\Component\Plugin\PluginBase;
-use Drupal\facetapi\FacetSource\FacetSourceDeriverBase;
+use Drupal\facets\FacetSource\FacetSourceDeriverBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Derives a facet source plugin definition for every search api view.
  *
- * @see \Drupal\facetapi\Plugin\facetapi\facet_source\SearchApiViewsPage
+ * @see \Drupal\facets\Plugin\facets\facet_source\SearchApiViewsPage
  */
 class CoreNodeSearchFacetSourceDeriver extends FacetSourceDeriverBase {
 

core_search_facetapi/src/Plugin/facetapi/query_type/CoreNodeSearchString.php → core_search_facets/src/Plugin/facetapi/query_type/CoreNodeSearchString.php

@@ -2,17 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\core_search_facetapi\Plugin\facetapi\query_type\CoreNodeSearchString.
+ * Contains \Drupal\core_search_facets\Plugin\facets\query_type\CoreNodeSearchString.
  */
 
-namespace Drupal\core_search_facetapi\Plugin\facetapi\query_type;
+namespace Drupal\core_search_facets\Plugin\facets\query_type;
 
-use Drupal\facetapi\QueryType\QueryTypePluginBase;
-use Drupal\facetapi\Result\Result;
+use Drupal\facets\QueryType\QueryTypePluginBase;
+use Drupal\facets\Result\Result;
 
 /**
  *
- * @FacetApiQueryType(
+ * @FacetsQueryType(
  *   id = "core_node_search_string",
  *   label = @Translation("String"),
  * )
@@ -31,10 +31,10 @@ class CoreNodeSearchString extends QueryTypePluginBase {
    */
   public function execute() {
 
-    /** @var \Drupal\core_search_facetapi\Plugin\CoreSearchFacetSourceInterface $facetSource */
+    /** @var \Drupal\core_search_facets\Plugin\CoreSearchFacetSourceInterface $facetSource */
     $facetSource = $this->facet->getFacetSource();
     $query_info = $facetSource->getQueryInfo($this->facet);
-    /** @var \Drupal\core_search_facetapi\FacetapiQuery $facet_query */
+    /** @var \Drupal\core_search_facets\FacetsQuery $facet_query */
     $facet_query = $facetSource->getFacetQueryExtender();
     $tables_joined = [];
 
@@ -68,11 +68,11 @@ class CoreNodeSearchString extends QueryTypePluginBase {
    * {@inheritdoc}
    */
   public function build() {
-    /** @var \Drupal\core_search_facetapi\Plugin\CoreSearchFacetSourceInterface $facetSource */
+    /** @var \Drupal\core_search_facets\Plugin\CoreSearchFacetSourceInterface $facetSource */
     $facetSource = $this->facet->getFacetSource();
     $query_info = $facetSource->getQueryInfo($this->facet);
 
-    /** @var \Drupal\core_search_facetapi\FacetapiQuery $facet_query */
+    /** @var \Drupal\core_search_facets\FacetsQuery $facet_query */
     $facet_query = $facetSource->getFacetQueryExtender();
 
     $facet_query->addFacetField($query_info);

css/facetapi.admin.css → css/facets.admin.css

@@ -6,25 +6,25 @@
 /*
  * Facet API overview page
  */
-#facetapi-groups-list {
+#facets-groups-list {
   margin-bottom: 2em;
 }
-#facetapi-groups-list tr {
+#facets-groups-list tr {
   border-bottom: none;
 }
 
-#facetapi-groups-list tr.facet-source {
+#facets-groups-list tr.facet-source {
   border-top: 1px solid #e6e4df;
 }
-#facetapi-groups-list tr.facet:last-of-type {
+#facets-groups-list tr.facet:last-of-type {
   border-bottom: 1px solid #e6e4df;
 }
 
-#facetapi-groups-list tr.facet-source .facetapi-type,
-#facetapi-groups-list tr.facet-source .search-api-title {
+#facets-groups-list tr.facet-source .facets-type,
+#facets-groups-list tr.facet-source .search-api-title {
   font-weight: bold;
 }
-#facetapi-groups-list tr.facet .facetapi-type {
+#facets-groups-list tr.facet .facets-type {
   padding-left: 3em;
 }
 
@@ -32,13 +32,13 @@
 /*
  * Facet API Display page
  */
-.facetapi-processor-settings-sorting {
+.facets-processor-settings-sorting {
   margin-bottom: -7px;
   margin-left: 20px;
   margin-top: -16px;
 }
 
-.facetapi-processor-settings-facet {
+.facets-processor-settings-facet {
   margin-left: 20px;
   margin-bottom: 20px;
 }
\ No newline at end of file

facetapi.links.action.yml

-entity.facetapi_facet.add_form:
-  route_name: entity.facetapi_facet.add_form
-  title: 'Add facet'
-  appears_on:
-    - facetapi.overview

facetapi.links.contextual.yml

-entity.facetapi_facet.display_form:
-  title: 'Configure facet display'
-  route_name: 'entity.facetapi_facet.display_form'
-  group: facetapi_facet
\ No newline at end of file

facetapi.links.task.yml

-entity.facetapi_facet.edit_form:
-  title: 'Edit'
-  route_name: entity.facetapi_facet.edit_form
-  base_route: entity.facetapi_facet.edit_form
-entity.facetapi_facet.display:
-  title: 'Display'
-  route_name: entity.facetapi_facet.display_form
-  base_route: entity.facetapi_facet.edit_form
\ No newline at end of file

facetapi.routing.yml

-facetapi.overview:
-  path: '/admin/config/search/facet-api'
-  defaults:
-    _title: 'Facet API'
-    _entity_list: 'facetapi_facet'
-  requirements:
-    _entity_create_access: 'facetapi_facet'
-
-entity.facetapi_facet.add_form:
-  path: '/admin/config/search/facet-api/add-facet'
-  defaults:
-    _entity_form: 'facetapi_facet.default'
-  requirements:
-    _entity_create_access: 'facetapi_facet'
-
-entity.facetapi_facet.canonical:
-  path: '/admin/config/search/facet-api/{facetapi_facet}'
-  defaults:
-    _controller: '\Drupal\facetapi\Controller\FacetController::page'
-    _title_callback: '\Drupal\facetapi\Controller\FacetController::pageTitle'
-  requirements:
-    _entity_access: 'facetapi_facet.view'
-
-entity.facetapi_facet.edit_form:
-  path: '/admin/config/search/facet-api/{facetapi_facet}/edit'
-  defaults:
-    _entity_form: 'facetapi_facet.edit'
-  requirements:
-    _entity_access: 'facetapi_facet.edit'
-
-entity.facetapi_facet.delete_form:
-  path: '/admin/config/search/facet-api/{facetapi_facet}/delete'
-  defaults:
-    _entity_form: 'facetapi_facet.delete'
-  requirements:
-    _entity_access: 'facetapi_facet.delete'
-
-entity.facetapi_facet.display_form:
-  path: '/admin/config/search/facet-api/{facetapi_facet}/display'
-  defaults:
-    _entity_form: 'facetapi_facet.display'
-  requirements:
-    _entity_access: 'facetapi_facet.edit'

facetapi.api.php → facets.api.php

@@ -18,9 +18,9 @@
  * @param array $query_types
  *   The Search API backend info array, keyed by backend ID.
  *
- * @see \Drupal\facetapi\Plugin\facetapi\facet_source\SearchApiBaseFacetSource
+ * @see \Drupal\facets\Plugin\facets\facet_source\SearchApiBaseFacetSource
  */
-function hook_facetapi_search_api_query_type_mapping_alter($backend_plugin_id, array &$query_types) {
+function hook_facets_search_api_query_type_mapping_alter($backend_plugin_id, array &$query_types) {
   if ($backend_plugin_id == 'search_api_solr') {
     $query_types['string'] = 'search_api_solr_string';
   }

facetapi.libraries.yml → facets.libraries.yml

-drupal.facetapi.admin_css:
+drupal.facets.admin_css:
   version: VERSION
   css:
     theme:
-      css/facetapi.admin.css: {}
+      css/facets.admin.css: {}

facets.links.action.yml

+entity.facets_facet.add_form:
+  route_name: entity.facets_facet.add_form
+  title: 'Add facet'
+  appears_on:
+    - facets.overview