Remove deprecations for Solarium 7 (#1164)

Co-authored-by: Markus Kalkbrenner <git@kalki.de>

Author: thomascorthals

CHANGELOG.md

@@ -14,6 +14,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - Added `void` return type to `Solarium\Core\Plugin\AbstractPlugin::initPluginType()` method signature
  - Changed return type of some Facets methods from `self`to `static`
 
+### Removed
+- Solarium\Component\Result\Stats\FacetValue::getFacets(), always returned `null`
+- Solarium\Core\Query\AbstractQuery::setTimeAllowed() and getTimeAllowed(), moved to Solarium\QueryType\Select\Query\Query
+- Solarium\Core\Query\Helper::cacheControl(), use Solarium\QueryType\Select\Query\FilterQuery::setCache() and setCost() instead
+
 
 ## [6.4.1]
 ### Added

src/Component/Result/Stats/FacetValue.php

@@ -44,16 +44,4 @@ public function getValue(): ?string
     {
         return $this->value;
     }
-
-    /**
-     * Get facet stats.
-     *
-     * @return array|null
-     *
-     * @deprecated Will be removed in Solarium 7
-     */
-    public function getFacets(): ?array
-    {
-        return null;
-    }
 }

src/Core/Query/AbstractQuery.php

@@ -92,34 +92,6 @@ public function getResultClass(): ?string
         return $this->getOption('resultclass');
     }
 
-    /**
-     * Set timeAllowed option.
-     *
-     * @param int $value
-     *
-     * @return self Provides fluent interface
-     *
-     * @deprecated Will be removed in Solarium 7. This parameter is only relevant for Select queries.
-     */
-    public function setTimeAllowed(int $value): self
-    {
-        $this->setOption('timeallowed', $value);
-
-        return $this;
-    }
-
-    /**
-     * Get timeAllowed option.
-     *
-     * @return int|null
-     *
-     * @deprecated Will be removed in Solarium 7. This parameter is only relevant for Select queries.
-     */
-    public function getTimeAllowed(): ?int
-    {
-        return $this->getOption('timeallowed');
-    }
-
     /**
      * Set omitHeader option.
      *

src/Core/Query/Helper.php

@@ -457,37 +457,6 @@ public function qparserTerm(string $field, float $weight): string
         return $this->qparser('term', ['f' => $field]).$weight;
     }
 
-    /**
-     * Render cache control param for use in filterquery.
-     *
-     * This is a Solr 3.4+ feature.
-     *
-     * @see https://solr.apache.org/guide/common-query-parameters.html#cache-parameter
-     *
-     * @param bool       $useCache
-     * @param float|null $cost
-     *
-     * @return string
-     *
-     * @deprecated Will be removed in Solarium 6. Use FilterQuery::setCache() and FilterQuery::setCost() instead.
-     */
-    public function cacheControl(bool $useCache, ?float $cost = null): string
-    {
-        $cache = 'false';
-
-        if (true === $useCache) {
-            $cache = 'true';
-        }
-
-        $result = '{!cache='.$cache;
-        if (null !== $cost) {
-            $result .= ' cost='.$cost;
-        }
-        $result .= '}';
-
-        return $result;
-    }
-
     /**
      * Filters control characters that cause issues with servlet containers.
      *

tests/Core/Query/HelperTest.php

@@ -718,28 +718,6 @@ public function testQparserTerm(): void
         );
     }
 
-    /**
-     * @deprecated Will be removed in Solarium 6
-     */
-    public function testCacheControlWithCost(): void
-    {
-        $this->assertSame(
-            '{!cache=false cost=6}',
-            $this->helper->cacheControl(false, 6)
-        );
-    }
-
-    /**
-     * @deprecated Will be removed in Solarium 6
-     */
-    public function testCacheControlWithoutCost(): void
-    {
-        $this->assertSame(
-            '{!cache=true}',
-            $this->helper->cacheControl(true)
-        );
-    }
-
     public function testFilterControlCharacters(): void
     {
         $this->assertSame(

tests/Core/Query/QueryTest.php

@@ -86,25 +86,6 @@ public function testSetAndGetResponseWriter(): void
         $this->assertSame('phps', $query->getResponseWriter());
     }
 
-    /**
-     * @deprecated Will be removed in Solarium 7. This parameter is only relevant for Select queries.
-     */
-    public function testGetDefaultTimeAllowed(): void
-    {
-        $query = new TestQuery();
-        $this->assertNull($query->getTimeAllowed());
-    }
-
-    /**
-     * @deprecated Will be removed in Solarium 7. This parameter is only relevant for Select queries.
-     */
-    public function testSetAndGetTimeAllowed(): void
-    {
-        $query = new TestQuery();
-        $query->setTimeAllowed(1200);
-        $this->assertSame(1200, $query->getTimeAllowed());
-    }
-
     public function testSetAndGetNow(): void
     {
         $query = new TestQuery();

tests/QueryType/Select/Result/Stats/FacetValueTest.php

@@ -109,14 +109,6 @@ public function testGetCardinality(): void
         $this->assertSame($this->stats['cardinality'], $this->result->getCardinality());
     }
 
-    /**
-     * @deprecated Will be removed in Solarium 7
-     */
-    public function testGetFacets(): void
-    {
-        $this->assertNull($this->result->getFacets());
-    }
-
     public function testGetStatValue(): void
     {
         $this->assertSame($this->stats['dummy'], $this->result->getStatValue('dummy'));