General: Update to phpstan level 10

.github/workflows/php-tests.yml

@@ -9,7 +9,7 @@ jobs:
   php-tests:
     uses: lunr-php/actions-templates/.github/workflows/php-composer.yml@master
     with:
-      phpstan-level: 6
+      phpstan-level: 10
       allow-style-failures: false
       allow-phpstan-failures: false
       codestyle-branch: '0.10.2'

src/Lunr/Halo/FluidInterfaceMock.php

@@ -18,7 +18,7 @@ class FluidInterfaceMock
 
     /**
      * Array of mocked return values
-     * @var array<string, mixed>
+     * @var array<string, mixed[]>
      */
     protected array $return;
 

src/Lunr/Halo/LegacyBaseTest.php

@@ -21,13 +21,15 @@
  * This class contains helper code for the Lunr unit tests.
  *
  * @deprecated Use `LunrBaseTestCase` instead
+ *
+ * @phpstan-type CallableMethod array{0:object|string,1:string}
  */
 abstract class LegacyBaseTest extends TestCase
 {
 
     /**
      * Instance of the tested class.
-     * @var mixed
+     * @var object
      */
     protected $class;
 
@@ -251,10 +253,10 @@ private function uopz_unmock_function(string $name): void
      *
      * Replace the code of a function of a specific class
      *
-     * @param array<int,object|string> $method     Method defined in an array form
-     * @param Closure                  $mock       Replacement code for the method
-     * @param string                   $visibility Visibility of the redefined method
-     * @param string                   $args       Comma-delimited list of arguments for the redefined method
+     * @param CallableMethod $method     Method defined in an array form
+     * @param Closure        $mock       Replacement code for the method
+     * @param string         $visibility Visibility of the redefined method
+     * @param string         $args       Comma-delimited list of arguments for the redefined method
      *
      * @return void
      */
@@ -269,9 +271,9 @@ protected function mock_method(array $method, Closure $mock, string $visibility
      *
      * Replace the code of a function of a specific class
      *
-     * @param array<int,object|string> $method Method defined in an array form
-     * @param Closure                  $mock   Replacement code for the method
-     * @param string                   $args   Comma-delimited list of arguments for the redefined method
+     * @param CallableMethod $method Method defined in an array form
+     * @param Closure        $mock   Replacement code for the method
+     * @param string         $args   Comma-delimited list of arguments for the redefined method
      *
      * @return void
      */
@@ -309,7 +311,7 @@ private function uopz_mock_method(array $method, Closure $mock, string $args = '
     /**
      * Unmock a method.
      *
-     * @param array<int,object|string> $method Method defined in an array form
+     * @param CallableMethod $method Method defined in an array form
      *
      * @return void
      */
@@ -321,7 +323,7 @@ protected function unmock_method(array $method): void
     /**
      * Unmock a method with uopz.
      *
-     * @param array<int,object|string> $method Method defined in an array form
+     * @param CallableMethod $method Method defined in an array form
      *
      * @return void
      */

src/Lunr/Halo/LunrBaseTestCase.php

@@ -20,6 +20,8 @@
 
 /**
  * This class contains helper code for the Lunr unit tests.
+ *
+ * @phpstan-type CallableMethod array{0:object|string,1:string}
  */
 abstract class LunrBaseTestCase extends TestCase
 {
@@ -97,7 +99,13 @@ public function baseSetUp(object $class): void
 
         if ($class instanceof MockObject)
         {
-            $this->reflection = new ReflectionClass(get_parent_class($class));
+            /**
+             * MockObject *must* have a parent, so this can't return FALSE.
+             * @var class-string<object> $instance
+             */
+            $instance = get_parent_class($class);
+
+            $this->reflection = new ReflectionClass($instance);
         }
         else
         {
@@ -353,10 +361,10 @@ private function uopzUnmockFunction(string $name): void
      *
      * Replace the code of a function of a specific class
      *
-     * @param array<int,object|string> $method     Method defined in an array form
-     * @param Closure                  $mock       Replacement code for the method
-     * @param string                   $visibility Visibility of the redefined method
-     * @param string                   $args       Comma-delimited list of arguments for the redefined method
+     * @param CallableMethod $method     Method defined in an array form
+     * @param Closure        $mock       Replacement code for the method
+     * @param string         $visibility Visibility of the redefined method
+     * @param string         $args       Comma-delimited list of arguments for the redefined method
      *
      * @deprecated Use mockMethod() instead
      *
@@ -372,10 +380,10 @@ protected function mock_method(array $method, Closure $mock, string $visibility
      *
      * Replace the code of a function of a specific class
      *
-     * @param array<int,object|string> $method     Method defined in an array form
-     * @param Closure                  $mock       Replacement code for the method
-     * @param string                   $visibility Visibility of the redefined method
-     * @param string                   $args       Comma-delimited list of arguments for the redefined method
+     * @param CallableMethod $method     Method defined in an array form
+     * @param Closure        $mock       Replacement code for the method
+     * @param string         $visibility Visibility of the redefined method
+     * @param string         $args       Comma-delimited list of arguments for the redefined method
      *
      * @return void
      */
@@ -390,9 +398,9 @@ protected function mockMethod(array $method, Closure $mock, string $visibility =
      *
      * Replace the code of a function of a specific class
      *
-     * @param array<int,object|string> $method Method defined in an array form
-     * @param Closure                  $mock   Replacement code for the method
-     * @param string                   $args   Comma-delimited list of arguments for the redefined method
+     * @param CallableMethod $method Method defined in an array form
+     * @param Closure        $mock   Replacement code for the method
+     * @param string         $args   Comma-delimited list of arguments for the redefined method
      *
      * @return void
      */
@@ -430,7 +438,7 @@ private function uopzMockMethod(array $method, Closure $mock, string $args = '')
     /**
      * Unmock a method.
      *
-     * @param array<int,object|string> $method Method defined in an array form
+     * @param CallableMethod $method Method defined in an array form
      *
      * @deprecated Use unmockMethod() instead
      *
@@ -444,7 +452,7 @@ protected function unmock_method(array $method): void
     /**
      * Unmock a method.
      *
-     * @param array<int,object|string> $method Method defined in an array form
+     * @param CallableMethod $method Method defined in an array form
      *
      * @return void
      */
@@ -456,7 +464,7 @@ protected function unmockMethod(array $method): void
     /**
      * Unmock a method with uopz.
      *
-     * @param array<int,object|string> $method Method defined in an array form
+     * @param CallableMethod $method Method defined in an array form
      *
      * @return void
      */

tests/phpstan.neon.dist

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 parameters:
-    level: 6
+    level: 10
     paths:
         - ../src
     bootstrapFiles: