Appease Stan

composer.json

@@ -37,10 +37,10 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.0",
-        "phpstan/phpstan": "0.12.*",
+        "phpstan/phpstan": "^1.0",
         "phpstan/extension-installer": "^1.0",
-        "phpstan/phpstan-phpunit": "0.12.*",
-        "phpunit/phpunit": "8.5.*"
+        "phpstan/phpstan-phpunit": "^1.0",
+        "phpunit/phpunit": "^9.0"
     },
     "autoload": {
         "psr-4": {
@@ -69,7 +69,10 @@
     },
     "config": {
         "preferred-install": "dist",
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "phpstan/extension-installer": true
+        }
     },
     "funding": [
         {

phpstan.neon

@@ -3,3 +3,4 @@ parameters:
     paths:
         - 'src'
         - 'tests'
+    checkGenericClassInNonGenericObjectType: false

src/HTTP/Controllers/Controller.php

@@ -7,7 +7,7 @@ abstract class Controller
     /**
      * Return the routes this controller handles.
      *
-     * @return array[]
+     * @return array<mixed>
      */
     abstract public function routes() : array;
 }

src/HTTP/Controllers/DashboardController.php

@@ -27,7 +27,7 @@ public function __construct(SSEChannel $channel)
     /**
      * Return the routes this controller handles.
      *
-     * @return array[]
+     * @return array<mixed>
      */
     public function routes() : array
     {

src/HTTP/Controllers/GraphQLController.php

@@ -45,7 +45,7 @@ public function __construct(Schema $schema, PromiseAdapter $adapter)
     /**
      * Return the routes this controller handles.
      *
-     * @return array[]
+     * @return array<mixed>
      */
     public function routes() : array
     {

src/HTTP/Controllers/ModelController.php

@@ -34,7 +34,7 @@ public function __construct(Model $model)
     /**
      * Return the routes this controller handles.
      *
-     * @return array[]
+     * @return array<mixed>
      */
     public function routes() : array
     {

src/HTTP/Controllers/ServerController.php

@@ -27,7 +27,7 @@ public function __construct(Server $server)
     /**
      * Return the routes this controller handles.
      *
-     * @return array[]
+     * @return array<mixed>
      */
     public function routes() : array
     {

src/HTTP/Controllers/StaticAssetsController.php

@@ -66,7 +66,7 @@ public function __construct(string $basePath, Cache $cache)
     /**
      * Return the routes this controller handles.
      *
-     * @return array[]
+     * @return array<mixed>
      */
     public function routes() : array
     {

src/Helpers/JSON.php

@@ -34,7 +34,7 @@ class JSON
      *
      * @param mixed $value
      * @param int $options
-     * @param int $depth
+     * @param positive-int $depth
      * @throws \Rubix\Server\Exceptions\JSONException
      * @return string
      */
@@ -56,7 +56,7 @@ public static function encode($value, int $options = self::DEFAULT_OPTIONS, int
      *
      * @param string $data
      * @param int $options
-     * @param int $depth
+     * @param positive-int $depth
      * @throws \Rubix\Server\Exceptions\JSONException
      * @return mixed[]
      */

src/Listeners/CloseSSEChannels.php

@@ -24,7 +24,7 @@ public function __construct(array $channels)
     /**
      * Return the events that this listener subscribes to.
      *
-     * @return array[]
+     * @return array<array<\Rubix\Server\Listeners\Listener>>
      */
     public function events() : array
     {

src/Listeners/CloseSocket.php

@@ -25,7 +25,7 @@ public function __construct(Socket $socket)
     /**
      * Return the events that this listener subscribes to.
      *
-     * @return array[]
+     * @return array<array<\Rubix\Server\Listeners\Listener>>
      */
     public function events() : array
     {

src/Listeners/DashboardEmitter.php

@@ -28,7 +28,7 @@ public function __construct(SSEChannel $channel)
     /**
      * Return the events that this listener subscribes to.
      *
-     * @return array[]
+     * @return array<array<\Rubix\Server\Listeners\Listener|callable>>
      */
     public function events() : array
     {

src/Listeners/Listener.php

@@ -7,7 +7,7 @@ interface Listener
     /**
      * Return the events that this listener subscribes to and their handlers.
      *
-     * @return array[]
+     * @return array<array<\Rubix\Server\Listeners\Listener|callable>>
      */
     public function events() : array;
 }

src/Listeners/LogFailures.php

@@ -26,7 +26,7 @@ public function __construct(LoggerInterface $logger)
     /**
      * Return the events that this listener subscribes to.
      *
-     * @return array[]
+     * @return array<array<\Rubix\Server\Listeners\Listener>>
      */
     public function events() : array
     {

src/Listeners/RecordHTTPStats.php

@@ -26,7 +26,7 @@ public function __construct(HTTPStats $httpStats)
     /**
      * Return the events that this listener subscribes to.
      *
-     * @return array[]
+     * @return array<array<\Rubix\Server\Listeners\Listener|callable>>
      */
     public function events() : array
     {

src/Listeners/StopTimers.php

@@ -34,7 +34,7 @@ public function __construct(Scheduler $scheduler, array $timers)
     /**
      * Return the events that this listener subscribes to.
      *
-     * @return array[]
+     * @return array<array<\Rubix\Server\Listeners\Listener>>
      */
     public function events() : array
     {

src/Models/Model.php

@@ -77,7 +77,7 @@ public function predict(Dataset $dataset) : array
      *
      * @param \Rubix\ML\Datasets\Dataset $dataset
      * @throws \Rubix\Server\Exceptions\RuntimeException
-     * @return array[]
+     * @return array<array<float>>
      */
     public function proba(Dataset $dataset) : array
     {

src/Services/Routes.php

@@ -26,7 +26,7 @@ class Routes implements ArrayAccess
     /**
      * The routes and their controllers.
      *
-     * @var array[]
+     * @var array<array<\Rubix\Server\HTTP\Controllers\Controller>>
      */
     protected array $routes;
 
@@ -70,7 +70,7 @@ public static function collect(array $controllers) : self
     }
 
     /**
-     * @param array[] $routes
+     * @param array<array<\Rubix\Server\HTTP\Controllers\Controller>> $routes
      * @throws \Rubix\Server\Exceptions\InvalidArgumentException
      */
     public function __construct(array $routes)

src/Services/Subscriptions.php

@@ -18,14 +18,14 @@ class Subscriptions implements ArrayAccess
     /**
      * The mapping of events to their handlers.
      *
-     * @var array[]
+     * @var array<array<\Rubix\Server\Listeners\Listener|callable>>
      */
     protected array $subscriptions;
 
     /**
      * Subscribe an array of listeners to their events.
      *
-     * @param \Rubix\Server\Listeners\Listener[] $listeners
+     * @param array<\Rubix\Server\Listeners\Listener|callable> $listeners
      * @throws \InvalidArgumentException
      * @return self
      */
@@ -50,7 +50,7 @@ public static function subscribe(array $listeners) : self
     }
 
     /**
-     * @param array[] $subscriptions
+     * @param array<array<\Rubix\Server\Listeners\Listener|callable>> $subscriptions
      * @throws \Rubix\Server\Exceptions\InvalidArgumentException
      */
     public function __construct(array $subscriptions)