phpstan level 5

Author: AydinHassan

composer.json

@@ -56,6 +56,6 @@
             "phpcs src --standard=PSR12 --encoding=UTF-8",
             "phpcs test --standard=PSR12 --encoding=UTF-8"
         ],
-        "static": "phpstan --ansi analyse --level 3 src"
+        "static": "phpstan --ansi analyse --level 5 src"
     }
 }

phpstan.neon

@@ -0,0 +1,2 @@
+parameters:
+    treatPhpDocTypesAsCertain: false

src/CommandRouter.php

@@ -219,7 +219,7 @@ private function resolveCallable(CommandDefinition $command, Input $input)
      * @param CommandDefinition $command
      * @param callable $callable
      * @param Input $input
-     * @return int
+     * @return ?int
      */
     private function callCommand(CommandDefinition $command, callable $callable, Input $input)
     {

src/ExerciseRunner/CgiRunner.php

@@ -12,6 +12,7 @@
 use PhpSchool\PhpWorkshop\Exception\CodeExecutionException;
 use PhpSchool\PhpWorkshop\Exception\SolutionExecutionException;
 use PhpSchool\PhpWorkshop\Exercise\CgiExercise;
+use PhpSchool\PhpWorkshop\Exercise\ExerciseInterface;
 use PhpSchool\PhpWorkshop\Input\Input;
 use PhpSchool\PhpWorkshop\Output\OutputInterface;
 use PhpSchool\PhpWorkshop\Result\Cgi\CgiResult;
@@ -32,9 +33,8 @@
  */
 class CgiRunner implements ExerciseRunnerInterface
 {
-
     /**
-     * @var CgiExercise
+     * @var CgiExercise&ExerciseInterface
      */
     private $exercise;
 
@@ -93,6 +93,7 @@ public function __construct(
                 );
             }
         }
+        /** @var CgiExercise&ExerciseInterface $exercise */
         $this->eventDispatcher = $eventDispatcher;
         $this->exercise = $exercise;
         $this->requestRenderer = $requestRenderer;

src/ExerciseRunner/CliRunner.php

@@ -12,6 +12,7 @@
 use PhpSchool\PhpWorkshop\Exception\CodeExecutionException;
 use PhpSchool\PhpWorkshop\Exception\SolutionExecutionException;
 use PhpSchool\PhpWorkshop\Exercise\CliExercise;
+use PhpSchool\PhpWorkshop\Exercise\ExerciseInterface;
 use PhpSchool\PhpWorkshop\Input\Input;
 use PhpSchool\PhpWorkshop\Output\OutputInterface;
 use PhpSchool\PhpWorkshop\Result\Cli\RequestFailure;
@@ -33,7 +34,7 @@
 class CliRunner implements ExerciseRunnerInterface
 {
     /**
-     * @var CliExercise
+     * @var CliExercise&ExerciseInterface
      */
     private $exercise;
 
@@ -59,6 +60,7 @@ class CliRunner implements ExerciseRunnerInterface
      */
     public function __construct(CliExercise $exercise, EventDispatcher $eventDispatcher)
     {
+        /** @var CliExercise&ExerciseInterface $exercise */
         $this->eventDispatcher = $eventDispatcher;
         $this->exercise = $exercise;
     }

src/ExerciseRunner/Factory/CgiRunnerFactory.php

@@ -5,6 +5,7 @@
 use PhpSchool\PhpWorkshop\CommandArgument;
 use PhpSchool\PhpWorkshop\CommandDefinition;
 use PhpSchool\PhpWorkshop\Event\EventDispatcher;
+use PhpSchool\PhpWorkshop\Exercise\CgiExercise;
 use PhpSchool\PhpWorkshop\Exercise\ExerciseInterface;
 use PhpSchool\PhpWorkshop\Exercise\ExerciseType;
 use PhpSchool\PhpWorkshop\ExerciseRunner\CgiRunner;
@@ -64,7 +65,7 @@ public function configureInput(CommandDefinition $commandDefinition)
     /**
      * Create and return an instance of the runner.
      *
-     * @param ExerciseInterface $exercise
+     * @param ExerciseInterface&CgiExercise $exercise
      * @return ExerciseRunnerInterface
      */
     public function create(ExerciseInterface $exercise)

src/ExerciseRunner/Factory/CliRunnerFactory.php

@@ -5,6 +5,7 @@
 use PhpSchool\PhpWorkshop\CommandArgument;
 use PhpSchool\PhpWorkshop\CommandDefinition;
 use PhpSchool\PhpWorkshop\Event\EventDispatcher;
+use PhpSchool\PhpWorkshop\Exercise\CliExercise;
 use PhpSchool\PhpWorkshop\Exercise\ExerciseInterface;
 use PhpSchool\PhpWorkshop\Exercise\ExerciseType;
 use PhpSchool\PhpWorkshop\ExerciseRunner\CliRunner;
@@ -57,7 +58,7 @@ public function configureInput(CommandDefinition $commandDefinition)
     /**
      * Create and return an instance of the runner.
      *
-     * @param ExerciseInterface $exercise
+     * @param ExerciseInterface&CliExercise $exercise
      * @return ExerciseRunnerInterface
      */
     public function create(ExerciseInterface $exercise)

src/ExerciseRunner/Factory/CustomVerifyingRunnerFactory.php

@@ -3,6 +3,7 @@
 namespace PhpSchool\PhpWorkshop\ExerciseRunner\Factory;
 
 use PhpSchool\PhpWorkshop\CommandDefinition;
+use PhpSchool\PhpWorkshop\Exercise\CustomVerifyingExercise;
 use PhpSchool\PhpWorkshop\Exercise\ExerciseInterface;
 use PhpSchool\PhpWorkshop\Exercise\ExerciseType;
 use PhpSchool\PhpWorkshop\ExerciseRunner\CustomVerifyingRunner;
@@ -41,7 +42,7 @@ public function configureInput(CommandDefinition $commandDefinition)
     /**
      * Create and return an instance of the runner.
      *
-     * @param ExerciseInterface $exercise
+     * @param ExerciseInterface&CustomVerifyingExercise $exercise
      * @return ExerciseRunnerInterface
      */
     public function create(ExerciseInterface $exercise)