Fix PHP 8.4/8.5 deprecations

src/CodePatcher.php

@@ -54,7 +54,7 @@ class CodePatcher
      * @param LoggerInterface $logger
      * @param Patch|null $defaultPatch
      */
-    public function __construct(Parser $parser, Standard $printer, LoggerInterface $logger, Patch $defaultPatch = null)
+    public function __construct(Parser $parser, Standard $printer, LoggerInterface $logger, ?Patch $defaultPatch = null)
     {
         $this->parser = $parser;
         $this->printer = $printer;

src/CommandRouter.php

@@ -98,7 +98,7 @@ public function addCommand(CommandDefinition $c): void
      * @return int
      * @throws CliRouteNotExistsException
      */
-    public function route(array $args = null): int
+    public function route(?array $args = null): int
     {
         if (null === $args) {
             $args = $_SERVER['argv'] ?? [];

src/ExerciseRunner/Context/TestContext.php

@@ -25,9 +25,9 @@ class TestContext extends ExecutionContext
     private bool $referenceSolutionDirWasCreated = false;
 
     public function __construct(
-        ExerciseInterface $exercise = null,
-        Input $input = null,
-        string $studentDirectory = null,
+        ?ExerciseInterface $exercise = null,
+        ?Input $input = null,
+        ?string $studentDirectory = null,
     ) {
         $this->exercise = $exercise ?? new MockExercise();
 

src/Factory/ResultRendererFactory.php

@@ -29,7 +29,7 @@ class ResultRendererFactory
      * @param class-string $rendererClass
      * @param callable|null $factory
      */
-    public function registerRenderer(string $resultClass, string $rendererClass, callable $factory = null): void
+    public function registerRenderer(string $resultClass, string $rendererClass, ?callable $factory = null): void
     {
         if (!$this->isImplementationNameOfClass($resultClass, ResultInterface::class)) {
             throw new InvalidArgumentException();

src/Patch/WrapInTryCatch.php

@@ -26,7 +26,7 @@ class WrapInTryCatch implements Transformer
      * @param string $exceptionClass
      * @param array<Stmt>|null $statements
      */
-    public function __construct(string $exceptionClass = \Exception::class, array $statements = null)
+    public function __construct(string $exceptionClass = \Exception::class, ?array $statements = null)
     {
         $this->exceptionClass = $exceptionClass;
         $this->statements = $statements ?: [

src/Process/DockerProcessFactory.php

@@ -18,7 +18,7 @@ public function __construct(
         string $basePath,
         string $projectName,
         string $composerCacheDir,
-        ExecutableFinder $executableFinder = null,
+        ?ExecutableFinder $executableFinder = null,
     ) {
         $this->executableFinder = $executableFinder ?? new ExecutableFinder();
         $this->basePath = $basePath;

src/Process/HostProcessFactory.php

@@ -11,7 +11,7 @@ final class HostProcessFactory implements ProcessFactory
 {
     private ExecutableFinder $executableFinder;
 
-    public function __construct(ExecutableFinder $executableFinder = null)
+    public function __construct(?ExecutableFinder $executableFinder = null)
     {
         $this->executableFinder = $executableFinder ?? new ExecutableFinder();
     }

src/Result/Cgi/GenericFailure.php

@@ -27,7 +27,7 @@ class GenericFailure extends Failure implements FailureInterface
      * @param RequestInterface $request The request that caused the failure.
      * @param string|null $reason
      */
-    public function __construct(RequestInterface $request, string $reason = null)
+    public function __construct(RequestInterface $request, ?string $reason = null)
     {
         $this->request = $request;
         parent::__construct(self::$name, $reason);
@@ -40,7 +40,7 @@ public function __construct(RequestInterface $request, string $reason = null)
      * @param string|null $reason The reason (if any) of the failure.
      * @return self The result.
      */
-    public static function fromRequestAndReason(RequestInterface $request, string $reason = null): self
+    public static function fromRequestAndReason(RequestInterface $request, ?string $reason = null): self
     {
         return new self($request, $reason);
     }

src/Result/Cli/GenericFailure.php

@@ -27,7 +27,7 @@ class GenericFailure extends Failure implements FailureInterface
      * @param ArrayObject<int, string> $args The arguments that caused the failure.
      * @param string|null $reason The reason (if any) of the failure.
      */
-    public function __construct(ArrayObject $args, string $reason = null)
+    public function __construct(ArrayObject $args, ?string $reason = null)
     {
         $this->args = $args;
         parent::__construct(self::$name, $reason);
@@ -40,7 +40,7 @@ public function __construct(ArrayObject $args, string $reason = null)
      * @param string|null $reason The reason (if any) of the failure.
      * @return self The result.
      */
-    public static function fromArgsAndReason(ArrayObject $args, string $reason = null): self
+    public static function fromArgsAndReason(ArrayObject $args, ?string $reason = null): self
     {
         return new self($args, $reason);
     }

src/Result/ComposerFailure.php

@@ -34,7 +34,7 @@ class ComposerFailure implements FailureInterface
      * @param CheckInterface $check The check that produced this result.
      * @param array<string> $missingPackages
      */
-    public function __construct(CheckInterface $check, string $missingComponent = null, array $missingPackages = [])
+    public function __construct(CheckInterface $check, ?string $missingComponent = null, array $missingPackages = [])
     {
         $this->check = $check;
         $this->missingPackages = $missingPackages;

src/Result/Failure.php

@@ -30,7 +30,7 @@ class Failure implements FailureInterface
      * @param string $name The name of the check that produced this result.
      * @param string|null $reason The reason (if any) of the failure.
      */
-    public function __construct(string $name, string $reason = null)
+    public function __construct(string $name, ?string $reason = null)
     {
         $this->name = $name;
         $this->reason = $reason;
@@ -43,7 +43,7 @@ public function __construct(string $name, string $reason = null)
      * @param string|null $reason The reason (if any) of the failure.
      * @return self The result.
      */
-    public static function fromNameAndReason(string $name, string $reason = null): self
+    public static function fromNameAndReason(string $name, ?string $reason = null): self
     {
         return new self($name, $reason);
     }
@@ -55,7 +55,7 @@ public static function fromNameAndReason(string $name, string $reason = null): s
      * @param string|null $reason The reason (if any) of the failure.
      * @return self The result.
      */
-    public static function fromCheckAndReason(CheckInterface $check, string $reason = null): self
+    public static function fromCheckAndReason(CheckInterface $check, ?string $reason = null): self
     {
         return new self($check->getName(), $reason);
     }

src/UserState/UserState.php

@@ -29,7 +29,7 @@ class UserState
      * @param array<string> $completedExercises An array of exercise names.
      * @param string|null $currentExercise Can be null in-case the student did not start an exercise yet.
      */
-    public function __construct(array $completedExercises = [], string $currentExercise = null)
+    public function __construct(array $completedExercises = [], ?string $currentExercise = null)
     {
         $this->currentExercise = $currentExercise;
         $this->completedExercises = $completedExercises;

test/ApplicationTest.php

@@ -47,10 +47,8 @@ public function testEventListenersFromLocalAndWorkshopConfigAreMerged(): void
         $app = new Application('Test App', $localFile);
 
         $rm = new \ReflectionMethod($app, 'getContainer');
-        $rm->setAccessible(true);
 
         $rp = new \ReflectionProperty(Application::class, 'frameworkConfigLocation');
-        $rp->setAccessible(true);
         $rp->setValue($app, $frameworkFile);
 
         $container = $rm->invoke($app, false);

test/BaseTest.php

@@ -23,7 +23,7 @@ public function getTemporaryDirectory(): string
         return $this->tempDirectory;
     }
 
-    public function getTemporaryFile(string $filename, string $content = null): string
+    public function getTemporaryFile(string $filename, ?string $content = null): string
     {
         $file = Path::join($this->getTemporaryDirectory(), $filename);
 

test/Check/DatabaseCheckTest.php

@@ -96,7 +96,6 @@ public function testIfPDOThrowsExceptionItCleansUp(): void
         $eventDispatcher = new EventDispatcher(new ResultAggregator());
 
         $refProp = new ReflectionProperty(DatabaseCheck::class, 'userDsn');
-        $refProp->setAccessible(true);
         $refProp->setValue($this->check, 'notvaliddsn');
 
         try {

test/Exception/InvalidArgumentExceptionTest.php

@@ -38,7 +38,6 @@ public function testExceptionFromMissingImplements(): void
     public function testStringify($value, string $expected): void
     {
         $rM = new \ReflectionMethod(InvalidArgumentException::class, 'stringify');
-        $rM->setAccessible(true);
 
         $this->assertEquals($rM->invoke(null, $value), $expected);
     }