Fix types

AydinHassan · AydinHassan · commit 6f6646cb6b10 · 2024-03-10T12:11:09.000+01:00
diff --git a/phpstan-bootstrap.php b/phpstan-bootstrap.php
@@ -1,6 +1,4 @@
-<?php
-
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 class_exists(\Hoa\Socket\Connection::class);
 class_exists(\Hoa\Exception::class);
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,4 +1,3 @@
 parameters:
 	bootstrapFiles:
 		- phpstan-bootstrap.php
-	phpVersion: 70200
diff --git a/src/Exercise/ArrayWeGo.php b/src/Exercise/ArrayWeGo.php
@@ -18,15 +18,8 @@ class ArrayWeGo extends AbstractExercise implements ExerciseInterface, FunctionR
 {
     use TemporaryDirectoryTrait;
 
-    /**
-     * @var Filesystem
-     */
-    private $filesystem;
-
-    /**
-     * @var Generator
-     */
-    private $faker;
+    private Filesystem $filesystem;
+    private Generator $faker;
 
     public function __construct(Filesystem $filesystem, Generator $faker)
     {
diff --git a/src/Exercise/ConcernedAboutSeparation.php b/src/Exercise/ConcernedAboutSeparation.php
@@ -2,7 +2,6 @@
 
 namespace PhpSchool\LearnYouPhp\Exercise;
 
-use Faker\Generator;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Parser;
 use PhpSchool\PhpWorkshop\Exercise\AbstractExercise;
@@ -11,7 +10,6 @@
 use PhpSchool\PhpWorkshop\Exercise\ExerciseType;
 use PhpSchool\PhpWorkshop\Exercise\TemporaryDirectoryTrait;
 use PhpSchool\PhpWorkshop\ExerciseCheck\SelfCheck;
-use PhpSchool\PhpWorkshop\ExerciseCheck\StdOutExerciseCheck;
 use PhpSchool\PhpWorkshop\Input\Input;
 use PhpSchool\PhpWorkshop\Result\Failure;
 use PhpSchool\PhpWorkshop\Result\ResultInterface;
@@ -25,15 +23,8 @@ class ConcernedAboutSeparation extends AbstractExercise implements ExerciseInter
 {
     use TemporaryDirectoryTrait;
 
-    /**
-     * @var Filesystem
-     */
-    private $filesystem;
-
-    /**
-     * @var Parser
-     */
-    private $parser;
+    private Filesystem $filesystem;
+    private Parser $parser;
 
     public function __construct(Filesystem $filesystem, Parser $parser)
     {
diff --git a/src/Exercise/DatabaseRead.php b/src/Exercise/DatabaseRead.php
@@ -14,20 +14,16 @@
 use PhpSchool\PhpWorkshop\Exercise\ExerciseType;
 use PhpSchool\PhpWorkshop\ExerciseCheck\DatabaseExerciseCheck;
 use PhpSchool\PhpWorkshop\ExerciseDispatcher;
-use PhpSchool\PhpWorkshop\SubmissionPatch;
 use Symfony\Component\Filesystem\Filesystem;
 
 class DatabaseRead extends AbstractExercise implements ExerciseInterface, DatabaseExerciseCheck, CliExercise
 {
-    /**
-     * @var Generator
-     */
-    private $faker;
+    private Generator $faker;
 
     /**
      * @var array{id: int, name: string}
      */
-    private $randomRecord;
+    private array $randomRecord;
 
     public function __construct(Generator $faker)
     {
diff --git a/src/Exercise/DependencyHeaven.php b/src/Exercise/DependencyHeaven.php
@@ -20,10 +20,7 @@ class DependencyHeaven extends AbstractExercise implements
     CgiExercise,
     ComposerExerciseCheck
 {
-    /**
-     * @var Generator
-     */
-    private $faker;
+    private Generator $faker;
 
     public function __construct(Generator $faker)
     {
diff --git a/src/Exercise/ExceptionalCoding.php b/src/Exercise/ExceptionalCoding.php
@@ -10,7 +10,6 @@
 use PhpSchool\PhpWorkshop\Exercise\ExerciseType;
 use PhpSchool\PhpWorkshop\Exercise\TemporaryDirectoryTrait;
 use PhpSchool\PhpWorkshop\ExerciseCheck\FunctionRequirementsExerciseCheck;
-use PhpSchool\PhpWorkshop\ExerciseCheck\StdOutExerciseCheck;
 use PhpSchool\PhpWorkshop\ExerciseDispatcher;
 use Symfony\Component\Filesystem\Filesystem;
 
@@ -21,15 +20,8 @@ class ExceptionalCoding extends AbstractExercise implements
 {
     use TemporaryDirectoryTrait;
 
-    /**
-     * @var Filesystem
-     */
-    private $filesystem;
-
-    /**
-     * @var Generator
-     */
-    private $faker;
+    private Filesystem $filesystem;
+    private Generator $faker;
 
     public function __construct(Filesystem $filesystem, Generator $faker)
     {
diff --git a/src/Exercise/FilteredLs.php b/src/Exercise/FilteredLs.php
@@ -7,18 +7,13 @@
 use PhpSchool\PhpWorkshop\Exercise\ExerciseInterface;
 use PhpSchool\PhpWorkshop\Exercise\ExerciseType;
 use PhpSchool\PhpWorkshop\Exercise\TemporaryDirectoryTrait;
-use PhpSchool\PhpWorkshop\ExerciseCheck\StdOutExerciseCheck;
-use PhpSchool\PhpWorkshop\ExerciseDispatcher;
 use Symfony\Component\Filesystem\Filesystem;
 
 class FilteredLs extends AbstractExercise implements ExerciseInterface, CliExercise
 {
     use TemporaryDirectoryTrait;
 
-    /**
-     * @var Filesystem
-     */
-    private $filesystem;
+    private Filesystem $filesystem;
 
     public function __construct(Filesystem $filesystem)
     {
diff --git a/src/Exercise/HelloWorld.php b/src/Exercise/HelloWorld.php
@@ -6,8 +6,6 @@
 use PhpSchool\PhpWorkshop\Exercise\CliExercise;
 use PhpSchool\PhpWorkshop\Exercise\ExerciseInterface;
 use PhpSchool\PhpWorkshop\Exercise\ExerciseType;
-use PhpSchool\PhpWorkshop\ExerciseCheck\StdOutExerciseCheck;
-use PhpSchool\PhpWorkshop\ExerciseDispatcher;
 
 class HelloWorld extends AbstractExercise implements ExerciseInterface, CliExercise
 {
diff --git a/src/Exercise/HttpJsonApi.php b/src/Exercise/HttpJsonApi.php
@@ -7,7 +7,6 @@
 use PhpSchool\PhpWorkshop\Exercise\CgiExercise;
 use PhpSchool\PhpWorkshop\Exercise\ExerciseInterface;
 use PhpSchool\PhpWorkshop\Exercise\ExerciseType;
-use PhpSchool\PhpWorkshop\ExerciseCheck\CgiOutputExerciseCheck;
 use Psr\Http\Message\RequestInterface;
 
 class HttpJsonApi extends AbstractExercise implements ExerciseInterface, CgiExercise
diff --git a/src/Exercise/MyFirstIo.php b/src/Exercise/MyFirstIo.php
@@ -10,7 +10,6 @@
 use PhpSchool\PhpWorkshop\Exercise\ExerciseType;
 use PhpSchool\PhpWorkshop\Exercise\TemporaryDirectoryTrait;
 use PhpSchool\PhpWorkshop\ExerciseCheck\FunctionRequirementsExerciseCheck;
-use PhpSchool\PhpWorkshop\ExerciseCheck\StdOutExerciseCheck;
 use PhpSchool\PhpWorkshop\ExerciseDispatcher;
 use Symfony\Component\Filesystem\Filesystem;
 
@@ -21,15 +20,8 @@ class MyFirstIo extends AbstractExercise implements
 {
     use TemporaryDirectoryTrait;
 
-    /**
-     * @var Filesystem
-     */
-    private $filesystem;
-
-    /**
-     * @var Generator
-     */
-    private $faker;
+    private Filesystem $filesystem;
+    private Generator $faker;
 
     public function __construct(Filesystem $filesystem, Generator $faker)
     {
diff --git a/src/Exercise/TimeServer.php b/src/Exercise/TimeServer.php
@@ -123,10 +123,7 @@ public function getArgs(): array
         return [];
     }
 
-    /**
-     * @return resource
-     */
-    private function createSocket()
+    private function createSocket(): Socket
     {
         $socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
 
diff --git a/test/Exercise/TimeServerTest.php b/test/Exercise/TimeServerTest.php
@@ -5,6 +5,7 @@
 use Colors\Color;
 use PhpSchool\LearnYouPhp\Exercise\TimeServer;
 use PhpSchool\PhpWorkshop\Check\CheckRepository;
+use PhpSchool\PhpWorkshop\Check\PhpLintCheck;
 use PhpSchool\PhpWorkshop\Event\EventDispatcher;
 use PhpSchool\PhpWorkshop\Exercise\ExerciseType;
 use PhpSchool\PhpWorkshop\ExerciseDispatcher;
@@ -37,20 +38,24 @@ public function setUp(): void
         $results = new ResultAggregator();
         $eventDispatcher = new EventDispatcher($results);
 
-        $r = new \ReflectionClass(CliRunner::class);
+        $this->exercise = new TimeServer();
+        $runner = new CliRunner($this->exercise, $eventDispatcher);
+
+        $r = new \ReflectionClass($runner);
         $rp = $r->getProperty('requiredChecks');
         $rp->setAccessible(true);
-        $rp->setValue([]);
+        $rp->setValue($runner, []);
 
+        $runnerFactory = $this->createPartialMock(CliRunnerFactory::class, ['create']);
+        $runnerFactory->method('create')->willReturn($runner);
         $runnerManager = new RunnerManager();
-        $runnerManager->addFactory(new CliRunnerFactory($eventDispatcher));
+        $runnerManager->addFactory($runnerFactory);
         $this->exerciseDispatcher = new ExerciseDispatcher(
             $runnerManager,
             $results,
             $eventDispatcher,
-            new CheckRepository()
+            new CheckRepository([new PhpLintCheck()])
         );
-        $this->exercise = new TimeServer();
     }
 
     public function testGetters(): void

Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,7 @@ class DependencyHeaven extends AbstractExercise implements`
`20`	`20`	`CgiExercise,`
`21`	`21`	`ComposerExerciseCheck`
`22`	`22`	`{`
`23`		`- /**`
`24`		`- * @var Generator`
`25`		`- */`
`26`		`- private $faker;`
	`23`	`+ private Generator $faker;`
`27`	`24`
`28`	`25`	`public function __construct(Generator $faker)`
`29`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@`
`6`	`6`	`use PhpSchool\PhpWorkshop\Exercise\CliExercise;`
`7`	`7`	`use PhpSchool\PhpWorkshop\Exercise\ExerciseInterface;`
`8`	`8`	`use PhpSchool\PhpWorkshop\Exercise\ExerciseType;`
`9`		`-use PhpSchool\PhpWorkshop\ExerciseCheck\StdOutExerciseCheck;`
`10`		`-use PhpSchool\PhpWorkshop\ExerciseDispatcher;`
`11`	`9`
`12`	`10`	`class HelloWorld extends AbstractExercise implements ExerciseInterface, CliExercise`
`13`	`11`	`{`