PHPStan level 2

CHANGELOG.md

@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added union type declarations to method signatures
 - Solarium\Core\Query\Helper::formatDate() throws a `TypeError` instead of returning `false` if called with an incompatibly typed parameter
 - Managed resources queries no longer work around SOLR-6853 by default. Set the 'useDoubleEncoding' option to `true` if this bug affects you.
+- Solarium codebase is now analysed at PHPStan level 2
 
 ### Removed
 - Solarium\Component\Result\Stats\FacetValue::getFacets(), always returned `null`

composer.json

@@ -31,7 +31,7 @@
         "nyholm/psr7": "^1.8",
         "php-http/guzzle7-adapter": "^1.0",
         "phpstan/extension-installer": "^1.4",
-        "phpstan/phpstan": "^2.1",
+        "phpstan/phpstan": "^2.1.41",
         "phpstan/phpstan-deprecation-rules": "^2.0",
         "phpstan/phpstan-phpunit": "^2.0",
         "phpunit/phpunit": "^10.5",

phpstan.dist.neon

@@ -1,5 +1,9 @@
 parameters:
-    level: 1
+    level: 2
+    reportIgnoresWithoutComments: true
     paths:
         - src
         - tests
+    universalObjectCratesClasses:
+        - Solarium\Core\Query\DocumentInterface
+        - Solarium\Core\Query\Result\QueryType

src/Builder/Analytics/AnalyticsExpressionVisitor.php

@@ -42,6 +42,10 @@ public function dispatch(ExpressionInterface $expr)
 
     /**
      * {@inheritdoc}
+     *
+     * @param ExpressionInterface&FunctionInterface $expression
+     *
+     * @return mixed
      */
     public function walkExpression(ExpressionInterface $expression)
     {

src/Builder/Analytics/FunctionBuilder.php

@@ -12,6 +12,7 @@
 namespace Solarium\Builder\Analytics;
 
 use Solarium\Builder\ExpressionInterface;
+use Solarium\Builder\FunctionInterface;
 
 /**
  * FunctionBuilder.
@@ -20,7 +21,7 @@
  */
 class FunctionBuilder
 {
-    private ExpressionInterface $function;
+    private ExpressionInterface&FunctionInterface $function;
 
     private static ?ExpressionBuilder $expressionBuilder = null;
 
@@ -45,21 +46,21 @@ public static function expr(): ExpressionBuilder
     }
 
     /**
-     * @param ExpressionInterface $function
+     * @param ExpressionInterface&FunctionInterface $function
      *
      * @return self Provides fluent interface
      */
-    public function where(ExpressionInterface $function): self
+    public function where(ExpressionInterface&FunctionInterface $function): self
     {
         $this->function = $function;
 
         return $this;
     }
 
     /**
-     * @return ExpressionInterface
+     * @return ExpressionInterface&FunctionInterface
      */
-    public function getFunction(): ExpressionInterface
+    public function getFunction(): ExpressionInterface&FunctionInterface
     {
         return $this->function;
     }

src/Component/ComponentAwareQueryInterface.php

@@ -104,7 +104,7 @@ interface ComponentAwareQueryInterface
     /**
      * Get all registered component types.
      *
-     * @return array
+     * @return array<self::COMPONENT_*|string> An array of self::COMPONENT_* and/or self-registered keys
      */
     public function getComponentTypes(): array;
 
@@ -131,9 +131,9 @@ public function getComponents(): array;
      * You can optionally supply an autoload class to create a new component
      * instance if there is no registered component for the given key yet.
      *
-     * @param string     $key      Use one of the constants
-     * @param bool       $autoload Autoload if component needs to be created
-     * @param array|null $config   Configuration to use for autoload
+     * @param self::COMPONENT_*|string $key      A self::COMPONENT_* or self-registered key
+     * @param bool                     $autoload Autoload if component needs to be created
+     * @param array|null               $config   Configuration to use for autoload
      *
      * @throws OutOfBoundsException
      *
@@ -146,8 +146,8 @@ public function getComponent(string $key, ?bool $autoload = false, ?array $confi
      *
      * This overwrites any existing component registered with the same key.
      *
-     * @param string            $key
-     * @param AbstractComponent $component
+     * @param self::COMPONENT_*|string $key       A self::COMPONENT_* or self-registered key
+     * @param AbstractComponent        $component
      *
      * @return self Provides fluent interface
      */
@@ -158,7 +158,7 @@ public function setComponent(string $key, AbstractComponent $component): self;
      *
      * You can remove a component by passing its key or the component instance.
      *
-     * @param string|AbstractComponent $component
+     * @param self::COMPONENT_*|string|AbstractComponent $component
      *
      * @return self Provides fluent interface
      */

src/Component/ComponentAwareQueryTrait.php

@@ -31,7 +31,7 @@ trait ComponentAwareQueryTrait
     /**
      * Get all registered component types.
      *
-     * @return array
+     * @return array<self::COMPONENT_*|string> An array of self::COMPONENT_* and/or self-registered keys
      */
     public function getComponentTypes(): array
     {
@@ -69,9 +69,9 @@ public function getComponents(): array
      * You can optionally supply an autoload class to create a new component
      * instance if there is no registered component for the given key yet.
      *
-     * @param string     $key      Use one of the constants
-     * @param bool       $autoload Autoload if component needs to be created
-     * @param array|null $config   Configuration to use for autoload
+     * @param self::COMPONENT_*|string $key      A self::COMPONENT_* or self-registered key
+     * @param bool                     $autoload Autoload if component needs to be created
+     * @param array|null               $config   Configuration to use for autoload
      *
      * @throws OutOfBoundsException
      *
@@ -104,8 +104,8 @@ public function getComponent(string $key, ?bool $autoload = false, ?array $confi
      *
      * This overwrites any existing component registered with the same key.
      *
-     * @param string            $key
-     * @param AbstractComponent $component
+     * @param self::COMPONENT_*|string $key       A self::COMPONENT_* or self-registered key
+     * @param AbstractComponent        $component
      *
      * @return self Provides fluent interface
      */
@@ -122,7 +122,7 @@ public function setComponent(string $key, AbstractComponent $component): self
      *
      * You can remove a component by passing its key or the component instance.
      *
-     * @param string|AbstractComponent $component
+     * @param self::COMPONENT_*|string|AbstractComponent $component
      *
      * @return self Provides fluent interface
      */

src/Component/Facet/FieldValueParametersInterface.php

@@ -105,9 +105,7 @@ public function getMatches(): ?string;
     /**
      * Set the facet sort type.
      *
-     * Use one of the SORT_* constants as the value.
-     *
-     * @param string $sort
+     * @param self::SORT_* $sort
      */
     public function setSort(string $sort): static;
 
@@ -177,9 +175,7 @@ public function getMissing(): ?bool;
     /**
      * Set the facet method.
      *
-     * Use one of the METHOD_* constants as value.
-     *
-     * @param string $method
+     * @param self::METHOD_* $method
      */
     public function setMethod(string $method): static;
 

src/Component/Facet/FieldValueParametersTrait.php

@@ -105,9 +105,7 @@ public function getMatches(): ?string
     /**
      * Set the facet sort type.
      *
-     * Use one of the SORT_* constants as the value.
-     *
-     * @param string $sort
+     * @param self::SORT_* $sort
      */
     public function setSort(string $sort): static
     {
@@ -217,9 +215,7 @@ public function getMissing(): ?bool
     /**
      * Set the facet method.
      *
-     * Use one of the METHOD_* constants as value.
-     *
-     * @param string $method
+     * @param self::METHOD_* $method
      */
     public function setMethod(string $method): static
     {

src/Component/Facet/JsonFacetInterface.php

@@ -14,7 +14,7 @@
  *
  * @see https://solr.apache.org/guide/json-facet-api.html
  */
-interface JsonFacetInterface
+interface JsonFacetInterface extends FacetInterface
 {
     /**
      * Serializes nested facets as option "facet" and returns that array structure.

src/Component/Facet/JsonFacetTrait.php

@@ -171,6 +171,28 @@ public function addFacet(FacetInterface|array $facet): static
         throw new InvalidArgumentException('Only JSON facets can be nested.');
     }
 
+    /**
+     * Get a facet.
+     *
+     * @param string $key
+     *
+     * @return JsonFacetInterface|null
+     */
+    public function getFacet(string $key): ?JsonFacetInterface
+    {
+        return $this->facets[$key] ?? null;
+    }
+
+    /**
+     * Get all facets.
+     *
+     * @return JsonFacetInterface[]
+     */
+    public function getFacets(): array
+    {
+        return $this->facets;
+    }
+
     /**
      * Remove a single facet.
      *

src/Component/Facet/JsonTerms.php

@@ -171,7 +171,7 @@ public function getLimit(): ?int
      *
      * @see https://solr.apache.org/guide/json-facet-api.html#sorting-facets-by-nested-functions
      *
-     * @param string $sort
+     * @param self::SORT_*|string $sort
      */
     public function setSort(string $sort): static
     {
@@ -385,9 +385,7 @@ public function getPrefix(): ?string
     /**
      * Set the facet algorithm to use.
      *
-     * Use one of the METHOD_* constants as value.
-     *
-     * @param string $method
+     * @param self::METHOD_* $method
      */
     public function setMethod(string $method): static
     {

src/Component/Facet/Pivot.php

@@ -120,9 +120,7 @@ public function getOffset(): ?int
     /**
      * Set the facet sort type.
      *
-     * Use one of the SORT_* constants as the value.
-     *
-     * @param string $sort
+     * @param self::SORT_* $sort
      */
     public function setSort(string $sort): static
     {

src/Component/FacetSet.php

@@ -9,7 +9,6 @@
 
 namespace Solarium\Component;
 
-use Solarium\Component\Facet\FacetInterface;
 use Solarium\Component\Facet\Field;
 use Solarium\Component\Facet\FieldValueParametersInterface;
 use Solarium\Component\Facet\FieldValueParametersTrait;
@@ -116,9 +115,9 @@ public function getExtractFromResponse(): ?bool
      * @param string|array|null $options
      * @param bool              $add
      *
-     * @return Field|FacetInterface
+     * @return Field
      */
-    public function createFacetField(string|array|null $options = null, bool $add = true): FacetInterface
+    public function createFacetField(string|array|null $options = null, bool $add = true): Field
     {
         return $this->createFacet(FacetSetInterface::FACET_FIELD, $options, $add);
     }
@@ -133,7 +132,7 @@ public function createFacetField(string|array|null $options = null, bool $add =
      *
      * @return Query
      */
-    public function createFacetQuery(string|array|null $options = null, bool $add = true): FacetInterface
+    public function createFacetQuery(string|array|null $options = null, bool $add = true): Query
     {
         return $this->createFacet(FacetSetInterface::FACET_QUERY, $options, $add);
     }
@@ -148,7 +147,7 @@ public function createFacetQuery(string|array|null $options = null, bool $add =
      *
      * @return MultiQuery
      */
-    public function createFacetMultiQuery(string|array|null $options = null, bool $add = true): FacetInterface
+    public function createFacetMultiQuery(string|array|null $options = null, bool $add = true): MultiQuery
     {
         return $this->createFacet(FacetSetInterface::FACET_MULTIQUERY, $options, $add);
     }
@@ -163,7 +162,7 @@ public function createFacetMultiQuery(string|array|null $options = null, bool $a
      *
      * @return Range
      */
-    public function createFacetRange(string|array|null $options = null, bool $add = true): FacetInterface
+    public function createFacetRange(string|array|null $options = null, bool $add = true): Range
     {
         return $this->createFacet(FacetSetInterface::FACET_RANGE, $options, $add);
     }
@@ -178,7 +177,7 @@ public function createFacetRange(string|array|null $options = null, bool $add =
      *
      * @return Pivot
      */
-    public function createFacetPivot(string|array|null $options = null, bool $add = true): FacetInterface
+    public function createFacetPivot(string|array|null $options = null, bool $add = true): Pivot
     {
         return $this->createFacet(FacetSetInterface::FACET_PIVOT, $options, $add);
     }
@@ -193,7 +192,7 @@ public function createFacetPivot(string|array|null $options = null, bool $add =
      *
      * @return Interval
      */
-    public function createFacetInterval(string|array|null $options = null, bool $add = true): FacetInterface
+    public function createFacetInterval(string|array|null $options = null, bool $add = true): Interval
     {
         return $this->createFacet(FacetSetInterface::FACET_INTERVAL, $options, $add);
     }
@@ -208,7 +207,7 @@ public function createFacetInterval(string|array|null $options = null, bool $add
      *
      * @return JsonAggregation
      */
-    public function createJsonFacetAggregation(string|array|null $options = null, bool $add = true): FacetInterface
+    public function createJsonFacetAggregation(string|array|null $options = null, bool $add = true): JsonAggregation
     {
         return $this->createFacet(FacetSetInterface::JSON_FACET_AGGREGATION, $options, $add);
     }
@@ -223,7 +222,7 @@ public function createJsonFacetAggregation(string|array|null $options = null, bo
      *
      * @return JsonTerms
      */
-    public function createJsonFacetTerms(string|array|null $options = null, bool $add = true): FacetInterface
+    public function createJsonFacetTerms(string|array|null $options = null, bool $add = true): JsonTerms
     {
         return $this->createFacet(FacetSetInterface::JSON_FACET_TERMS, $options, $add);
     }
@@ -238,7 +237,7 @@ public function createJsonFacetTerms(string|array|null $options = null, bool $ad
      *
      * @return JsonQuery
      */
-    public function createJsonFacetQuery(string|array|null $options = null, bool $add = true): FacetInterface
+    public function createJsonFacetQuery(string|array|null $options = null, bool $add = true): JsonQuery
     {
         return $this->createFacet(FacetSetInterface::JSON_FACET_QUERY, $options, $add);
     }
@@ -253,7 +252,7 @@ public function createJsonFacetQuery(string|array|null $options = null, bool $ad
      *
      * @return JsonRange
      */
-    public function createJsonFacetRange(string|array|null $options = null, bool $add = true): FacetInterface
+    public function createJsonFacetRange(string|array|null $options = null, bool $add = true): JsonRange
     {
         return $this->createFacet(FacetSetInterface::JSON_FACET_RANGE, $options, $add);
     }