More type coverage

src/Check/ComposerCheck.php

@@ -17,7 +17,6 @@
  */
 class ComposerCheck implements SimpleCheckInterface
 {
-
     /**
      * Return the check's name
      */

src/Check/DatabaseCheck.php

@@ -51,11 +51,11 @@ class DatabaseCheck implements ListenableCheckInterface
      */
     public function __construct()
     {
-        $this->databaseDirectory    = $this->getTemporaryPath();
-        $this->userDatabasePath     = sprintf('%s/user-db.sqlite', $this->databaseDirectory);
+        $this->databaseDirectory = $this->getTemporaryPath();
+        $this->userDatabasePath = sprintf('%s/user-db.sqlite', $this->databaseDirectory);
         $this->solutionDatabasePath = sprintf('%s/solution-db.sqlite', $this->databaseDirectory);
-        $this->solutionDsn          = sprintf('sqlite:%s', $this->solutionDatabasePath);
-        $this->userDsn              = sprintf('sqlite:%s', $this->userDatabasePath);
+        $this->solutionDsn = sprintf('sqlite:%s', $this->solutionDatabasePath);
+        $this->userDsn = sprintf('sqlite:%s', $this->userDatabasePath);
     }
 
     /**

src/Check/FunctionRequirementsCheck.php

@@ -24,7 +24,6 @@
  */
 class FunctionRequirementsCheck implements SimpleCheckInterface
 {
-
     /**
      * @var Parser
      */

src/Check/PhpLintCheck.php

@@ -16,7 +16,6 @@
  */
 class PhpLintCheck implements SimpleCheckInterface
 {
-
     /**
      * Return the check's name
      */

src/Command/HelpCommand.php

@@ -31,17 +31,17 @@ class HelpCommand
      * @param OutputInterface $output
      * @param Color $color
      */
-    public function __construct($appName, OutputInterface $output, Color $color)
+    public function __construct(string $appName, OutputInterface $output, Color $color)
     {
-        $this->output   = $output;
-        $this->color    = $color;
-        $this->appName  = $appName;
+        $this->output = $output;
+        $this->color = $color;
+        $this->appName = $appName;
     }
 
     /**
      * @return void
      */
-    public function __invoke()
+    public function __invoke(): void
     {
         $this->output->writeLine($this->color->__invoke('Usage')->yellow()->bold());
         $this->output->writeLine("");

src/Command/MenuCommand.php

@@ -25,7 +25,7 @@ public function __construct(CliMenu $menu)
     /**
      * @return void
      */
-    public function __invoke()
+    public function __invoke(): void
     {
         $this->menu->open();
     }

src/Command/PrintCommand.php

@@ -46,23 +46,23 @@ class PrintCommand
      * @param OutputInterface $output
      */
     public function __construct(
-        $appName,
+        string $appName,
         ExerciseRepository $exerciseRepository,
         UserState $userState,
         MarkdownRenderer $markdownRenderer,
         OutputInterface $output
     ) {
-        $this->appName              = $appName;
-        $this->markdownRenderer     = $markdownRenderer;
-        $this->output               = $output;
-        $this->userState            = $userState;
-        $this->exerciseRepository   = $exerciseRepository;
+        $this->appName = $appName;
+        $this->markdownRenderer = $markdownRenderer;
+        $this->output = $output;
+        $this->userState = $userState;
+        $this->exerciseRepository = $exerciseRepository;
     }
 
     /**
-     * @return int|void
+     * @return void
      */
-    public function __invoke()
+    public function __invoke(): void
     {
         $currentExercise = $this->userState->getCurrentExercise();
         $exercise = $this->exerciseRepository->findByName($currentExercise);

src/Command/RunCommand.php

@@ -45,18 +45,18 @@ public function __construct(
         UserState $userState,
         OutputInterface $output
     ) {
-        $this->output               = $output;
-        $this->exerciseRepository   = $exerciseRepository;
-        $this->userState            = $userState;
-        $this->exerciseDispatcher   = $exerciseDispatcher;
+        $this->output = $output;
+        $this->exerciseRepository = $exerciseRepository;
+        $this->userState = $userState;
+        $this->exerciseDispatcher = $exerciseDispatcher;
     }
 
     /**
      * @param Input $input The command line arguments passed to the command.
      *
-     * @return int|void
+     * @return void
      */
-    public function __invoke(Input $input)
+    public function __invoke(Input $input): void
     {
         $exercise = $this->exerciseRepository->findByName($this->userState->getCurrentExercise());
         $this->exerciseDispatcher->run($exercise, $input, $this->output);

src/Command/VerifyCommand.php

@@ -62,20 +62,20 @@ public function __construct(
         OutputInterface $output,
         ResultsRenderer $resultsRenderer
     ) {
-        $this->output               = $output;
-        $this->exerciseRepository   = $exerciseRepository;
-        $this->userState            = $userState;
-        $this->userStateSerializer  = $userStateSerializer;
-        $this->resultsRenderer      = $resultsRenderer;
-        $this->exerciseDispatcher   = $exerciseDispatcher;
+        $this->output = $output;
+        $this->exerciseRepository = $exerciseRepository;
+        $this->userState = $userState;
+        $this->userStateSerializer = $userStateSerializer;
+        $this->resultsRenderer = $resultsRenderer;
+        $this->exerciseDispatcher = $exerciseDispatcher;
     }
 
     /**
      * @param Input $input The command line arguments passed to the command.
      *
-     * @return int|void
+     * @return int
      */
-    public function __invoke(Input $input)
+    public function __invoke(Input $input): int
     {
         $exercise   = $this->exerciseRepository->findByName($this->userState->getCurrentExercise());
         $results    = $this->exerciseDispatcher->verify($exercise, $input);

src/CommandArgument.php

@@ -31,7 +31,7 @@ public function __construct(string $name, bool $optional = false)
      * @param string $name
      * @return self
      */
-    public static function optional($name)
+    public static function optional(string $name): self
     {
         return new self($name, true);
     }
@@ -40,31 +40,31 @@ public static function optional($name)
      * @param string $name
      * @return self
      */
-    public static function required($name)
+    public static function required(string $name): self
     {
         return new self($name);
     }
 
     /**
      * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return $this->name;
     }
 
     /**
      * @return bool
      */
-    public function isRequired()
+    public function isRequired(): bool
     {
         return !$this->isOptional();
     }
 
     /**
      * @return bool
      */
-    public function isOptional()
+    public function isOptional(): bool
     {
         return $this->optional;
     }

src/CommandDefinition.php

@@ -17,7 +17,7 @@ class CommandDefinition
     private $name;
 
     /**
-     * @var CommandArgument[]
+     * @var array<CommandArgument>
      */
     private $args = [];
 
@@ -31,10 +31,10 @@ class CommandDefinition
      * @param string[]|CommandArgument[] $args A list of arguments. Must be an array of strings or `CommandArgument`'s.
      * @param string|callable $commandCallable The name of a callable container entry or an actual PHP callable.
      */
-    public function __construct($name, array $args, $commandCallable)
+    public function __construct(string $name, array $args, $commandCallable)
     {
-        $this->name             = $name;
-        $this->commandCallable  = $commandCallable;
+        $this->name = $name;
+        $this->commandCallable = $commandCallable;
 
         array_walk($args, function ($arg) {
             $this->addArgument($arg);
@@ -45,7 +45,7 @@ public function __construct($name, array $args, $commandCallable)
      * @param string|CommandArgument $argument
      * @return $this
      */
-    public function addArgument($argument)
+    public function addArgument($argument): self
     {
         if (!is_string($argument) && !$argument instanceof CommandArgument) {
             throw InvalidArgumentException::notValidParameter(
@@ -80,17 +80,17 @@ public function addArgument($argument)
      *
      * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return $this->name;
     }
 
     /**
      * Get the list of required arguments.
      *
-     * @return CommandArgument[]
+     * @return array<CommandArgument>
      */
-    public function getRequiredArgs()
+    public function getRequiredArgs(): array
     {
         return $this->args;
     }

src/CommandRouter.php

@@ -218,7 +218,7 @@ private function resolveCallable(CommandDefinition $command, Input $input): int
      * @param Input $input
      * @return ?int
      */
-    private function callCommand(CommandDefinition $command, callable $callable, Input $input)
+    private function callCommand(CommandDefinition $command, callable $callable, Input $input): ?int
     {
         $this->eventDispatcher->dispatch(new Event\Event('route.pre.invoke'));
         $this->eventDispatcher->dispatch(new Event\Event(sprintf('route.pre.invoke.%s', $command->getName())));

src/Event/ContainerListenerHelper.php

@@ -21,7 +21,7 @@ class ContainerListenerHelper
      * @param string $service
      * @param string $method
      */
-    public function __construct($service, $method = '__invoke')
+    public function __construct(string $service, string $method = '__invoke')
     {
         $this->service = $service;
         $this->method = $method;
@@ -30,15 +30,15 @@ public function __construct($service, $method = '__invoke')
     /**
      * @return string
      */
-    public function getService()
+    public function getService(): string
     {
         return $this->service;
     }
 
     /**
      * @return string
      */
-    public function getMethod()
+    public function getMethod(): string
     {
         return $this->method;
     }

src/Event/functions.php

@@ -9,7 +9,7 @@
      * @param string $method
      * @return ContainerListenerHelper
      */
-    function containerListener($service, $method = '__invoke')
+    function containerListener(string $service, string $method = '__invoke')
     {
         return new ContainerListenerHelper($service, $method);
     }

src/Exception/CheckNotApplicableException.php

@@ -19,7 +19,7 @@ class CheckNotApplicableException extends RuntimeException
      * @param ExerciseInterface $exercise The exercise Instance.
      * @return self
      */
-    public static function fromCheckAndExercise(CheckInterface $check, ExerciseInterface $exercise)
+    public static function fromCheckAndExercise(CheckInterface $check, ExerciseInterface $exercise): self
     {
         return new self(
             sprintf(

src/Exception/CliRouteNotExistsException.php

@@ -12,7 +12,7 @@ class CliRouteNotExistsException extends RuntimeException
     /**
      * @param string $routeName The name of the command which was typed.
      */
-    public function __construct($routeName)
+    public function __construct(string $routeName)
     {
         parent::__construct(sprintf('Command: "%s" does not exist', $routeName));
     }

src/Exception/CodeExecutionException.php

@@ -16,7 +16,7 @@ class CodeExecutionException extends RuntimeException
      * @param Process $process The `Symfony\Component\Process\Process` instance which failed.
      * @return self
      */
-    public static function fromProcess(Process $process)
+    public static function fromProcess(Process $process): self
     {
         return new self(
             sprintf(

src/Exception/ExerciseNotConfiguredException.php

@@ -18,7 +18,7 @@ class ExerciseNotConfiguredException extends RuntimeException
      * @param string $interface The FQCN of the interface.
      * @return self
      */
-    public static function missingImplements(ExerciseInterface $exercise, $interface)
+    public static function missingImplements(ExerciseInterface $exercise, string $interface): self
     {
         return new self(sprintf('Exercise: "%s" should implement interface: "%s"', $exercise->getName(), $interface));
     }

src/Exercise/CgiExercise.php

@@ -13,7 +13,7 @@ interface CgiExercise extends ProvidesSolution
      * This method should return an array of PSR-7 requests, which will be forwarded to the student's
      * solution.
      *
-     * @return RequestInterface[] An array of PSR-7 requests.
+     * @return array<RequestInterface> An array of PSR-7 requests.
      */
-    public function getRequests();
+    public function getRequests(): array;
 }

src/Exercise/CliExercise.php

@@ -11,7 +11,7 @@ interface CliExercise extends ProvidesSolution
      * This method should return an array of an array of strings.
      * Each set of arguments will be passed to the students solution as command line arguments.
      *
-     * @return string[][] An array of string arguments.
+     * @return array<array<string>> An array of string arguments.
      */
-    public function getArgs();
+    public function getArgs(): array;
 }

src/Exercise/CustomVerifyingExercise.php

@@ -12,5 +12,5 @@ interface CustomVerifyingExercise
     /**
      * @return ResultInterface
      */
-    public function verify();
+    public function verify(): ResultInterface;
 }

src/Exercise/SubmissionPatchable.php

@@ -18,5 +18,5 @@ interface SubmissionPatchable
      *
      * @return Patch
      */
-    public function getPatch();
+    public function getPatch(): Patch;
 }

src/ExerciseCheck/DatabaseExerciseCheck.php

@@ -17,7 +17,7 @@ interface DatabaseExerciseCheck
      * @param PDO $db A `PDO` instance pointing to the database which will be accessible to the student's solution.
      * @return void
      */
-    public function seed(PDO $db);
+    public function seed(PDO $db): void;
 
     /**
      * This method allows your exercise to verify the state of database *after* the student's solution has been
@@ -28,5 +28,5 @@ public function seed(PDO $db);
      * @param PDO $db A `PDO` instance pointing to the database which was accessible by the student's solution.
      * @return bool The result of the verification.
      */
-    public function verify(PDO $db);
+    public function verify(PDO $db): bool;
 }