Rename arSolrQuery to arSolrStringQuery

Change arSolrQuery to arSolrStringQuery to avoid confusion with
Elastica's Query

lib/task/search/arSolrSearchTask.class.php

@@ -73,7 +73,7 @@ protected function configure()
 
     private function createQuery($queryText, $fields)
     {
-        $query = new arSolrQuery(arSolrPluginUtil::escapeTerm($queryText));
+        $query = new arSolrStringQuery(arSolrPluginUtil::escapeTerm($queryText));
         if ($fields) {
             $fieldsArr = explode(',', $fields);
             $newFields = [];

plugins/arSolrPlugin/lib/arSolrPluginUtil.class.php

@@ -179,12 +179,12 @@ public static function getI18nFieldNames($fields, $cultures = null)
      * @param array  $fields   fields to search (including culture if needed)
      * @param string $operator default query operator (AND/OR), default: AND
      *
-     * @return arSolrQuery the generated solr query
+     * @return arSolrStringQuery the generated solr query
      */
     public static function generateQuery(
         $query, $fields, $operator = 'AND'
     ) {
-        $solrQuery = new arSolrQuery(self::escapeTerm($query));
+        $solrQuery = new arSolrStringQuery(self::escapeTerm($query));
         $solrQuery->setDefaultOperator($operator);
         $solrQuery->setFields(self::getBoostedSearchFields($fields));
 

plugins/arSolrPlugin/lib/query/arSolrQuery.class.php → plugins/arSolrPlugin/lib/query/arSolrStringQuery.class.php

@@ -18,9 +18,9 @@
  */
 
 /**
- * arSolrQuery.
+ * arSolrStringQuery.
  */
-class arSolrQuery extends arSolrAbstractQuery
+class arSolrStringQuery extends arSolrAbstractQuery
 {
     /**
      * Query Params.

test/phpunit/arSolrPlugin/lib/query/ArSolrQueryTest.php → test/phpunit/arSolrPlugin/lib/query/ArSolrStringQueryTest.php

@@ -2,19 +2,19 @@
 
 use PHPUnit\Framework\TestCase;
 
-require_once 'plugins/arSolrPlugin/lib/query/arSolrQuery.class.php';
+require_once 'plugins/arSolrPlugin/lib/query/arSolrStringQuery.class.php';
 
 /**
  * @internal
  *
- * @covers \arSolrQuery
+ * @covers \arSolrStringQuery
  */
 class ArSolrQueryTest extends TestCase
 {
     public function createSolrQueryProvider()
     {
         return [
-            'New arSolrQuery with default options' => [
+            'New arSolrStringQuery with default options' => [
                 'searchQuery' => '*:*',
                 'expected' => '*:*',
             ],
@@ -29,16 +29,16 @@ public function createSolrQueryProvider()
      */
     public function testCreateSolrQuery($searchQuery, $expected)
     {
-        $this->query = new arSolrQuery($searchQuery);
+        $this->query = new arSolrStringQuery($searchQuery);
         $actual = $this->query->getSearchQuery();
 
-        $this->assertTrue($this->query instanceof arSolrQuery, 'Assert plugin object is arSolrQuery.');
-        $this->assertSame($expected, $actual, 'Assert arSolrQuery search query is correct.');
+        $this->assertTrue($this->query instanceof arSolrStringQuery, 'Assert plugin object is arSolrStringQuery.');
+        $this->assertSame($expected, $actual, 'Assert arSolrStringQuery search query is correct.');
     }
 
     public function testSetFields()
     {
-        $this->query = new arSolrQuery('*:*');
+        $this->query = new arSolrStringQuery('*:*');
 
         // Test setting the fields to empty array
         $this->query->setFields('');
@@ -76,7 +76,7 @@ public function setDefaultOperatorProvider()
      */
     public function testSetDefaultOperator($operator, $expected)
     {
-        $this->query = new arSolrQuery('*:*');
+        $this->query = new arSolrStringQuery('*:*');
         $this->query->setDefaultOperator($operator);
         $actual = $this->query->getDefaultOperator();
 
@@ -85,7 +85,7 @@ public function testSetDefaultOperator($operator, $expected)
 
     public function testSetDefaultOperatorException()
     {
-        $this->query = new arSolrQuery('*:*');
+        $this->query = new arSolrStringQuery('*:*');
 
         $this->expectException('\Exception');
         $this->expectExceptionMessage('Invalid operator. AND and OR are the only acceptable operator types.');
@@ -95,7 +95,7 @@ public function testSetDefaultOperatorException()
 
     public function testSetAggregations()
     {
-        $this->query = new arSolrQuery('*:*');
+        $this->query = new arSolrStringQuery('*:*');
 
         // Test setting the aggrergations to empty array
         $this->query->setAggregations([]);
@@ -144,7 +144,7 @@ public function getQueryParamsProvider(): array
      */
     public function testGetQueryParams($fields, $type, $operator, $searchQuery, $expected)
     {
-        $this->query = new arSolrQuery($searchQuery);
+        $this->query = new arSolrStringQuery($searchQuery);
         $this->query->setFields($fields);
         $this->query->setDefaultOperator($operator);
         $this->query->setType($type);
@@ -201,7 +201,7 @@ public function getQueryParamsAggsProvider(): array
      */
     public function testGetQueryParamsAggs($fields, $operator, $type, $searchQuery, $aggregations, $expected)
     {
-        $this->query = new arSolrQuery($searchQuery);
+        $this->query = new arSolrStringQuery($searchQuery);
         $this->query->setFields($fields);
         $this->query->setType($type);
         $this->query->setDefaultOperator($operator);
@@ -240,7 +240,7 @@ public function getQueryParamsAggsExceptionProvider(): array
      */
     public function testGetQueryParamsAggsException($fields, $type, $expectedException, $expectedExceptionMessage)
     {
-        $this->query = new arSolrQuery('*:*');
+        $this->query = new arSolrStringQuery('*:*');
         $this->query->setFields($fields);
         $this->query->setType($type);