Upgrade codebase to php 8 (part 1)

src/bref/bref/Context.php

@@ -11,24 +11,13 @@
  */
 final class Context implements \JsonSerializable
 {
-    /** @var string */
-    private $awsRequestId;
-
-    /** @var int Holds the deadline Unix timestamp in millis */
-    private $deadlineMs;
-
-    /** @var string */
-    private $invokedFunctionArn;
-
-    /** @var string */
-    private $traceId;
-
-    public function __construct(string $awsRequestId, int $deadlineMs, string $invokedFunctionArn, string $traceId)
-    {
-        $this->awsRequestId = $awsRequestId;
-        $this->deadlineMs = $deadlineMs;
-        $this->invokedFunctionArn = $invokedFunctionArn;
-        $this->traceId = $traceId;
+    public function __construct(
+        private string $awsRequestId,
+        /** @var int Holds the deadline Unix timestamp in millis */
+        private int $deadlineMs,
+        private string $invokedFunctionArn,
+        private string $traceId
+    ) {
     }
 
     /**

src/bref/src/BrefRunner.php

@@ -13,13 +13,8 @@
  */
 class BrefRunner implements RunnerInterface
 {
-    private $handler;
-    private $loopMax;
-
-    public function __construct(Handler $handler, int $loopMax)
+    public function __construct(private Handler $handler, private int $loopMax)
     {
-        $this->handler = $handler;
-        $this->loopMax = $loopMax;
     }
 
     public function run(): int

src/bref/src/ConsoleApplicationHandler.php

@@ -15,15 +15,15 @@
  */
 class ConsoleApplicationHandler implements Handler
 {
-    private $application;
+    private Application $application;
 
     public function __construct(Application $application)
     {
         $this->application = $application;
         $this->application->setAutoExit(false);
     }
 
-    public function handle($event, Context $context)
+    public function handle($event, Context $context): array
     {
         $args = \Clue\Arguments\split((string) $event);
         array_unshift($args, 'command');

src/bref/src/ConsoleApplicationRunner.php

@@ -13,13 +13,11 @@
  */
 class ConsoleApplicationRunner implements RunnerInterface
 {
-    private $handler;
-    private $loopMax;
+    private ConsoleApplicationHandler $handler;
 
-    public function __construct(Application $application, int $loopMax = 1)
+    public function __construct(Application $application, private int $loopMax = 1)
     {
         $this->handler = new ConsoleApplicationHandler($application);
-        $this->loopMax = $loopMax;
     }
 
     public function run(): int

src/bref/src/Lambda/ContextBuilder.php

@@ -9,17 +9,13 @@
  */
 final class ContextBuilder
 {
-    /** @var string */
-    private $awsRequestId;
+    private string $awsRequestId;
 
-    /** @var int */
-    private $deadlineMs;
+    private int $deadlineMs;
 
-    /** @var string */
-    private $invokedFunctionArn;
+    private string $invokedFunctionArn;
 
-    /** @var string */
-    private $traceId;
+    private string $traceId;
 
     public function __construct()
     {

src/bref/src/Lambda/LambdaClient.php

@@ -37,25 +37,20 @@ final class LambdaClient
     /** @var resource|\CurlHandle|null */
     private $returnHandler;
 
-    /** @var string */
-    private $apiUrl;
-
-    /** @var string */
-    private $layer;
+    private string $apiUrl;
 
     public static function fromEnvironmentVariable(string $layer): self
     {
         return new self((string) getenv('AWS_LAMBDA_RUNTIME_API'), $layer);
     }
 
-    public function __construct(string $apiUrl, string $layer)
+    public function __construct(string $apiUrl, private string $layer)
     {
         if ('' === $apiUrl) {
             exit('At the moment lambdas can only be executed in an Lambda environment');
         }
 
         $this->apiUrl = $apiUrl;
-        $this->layer = $layer;
     }
 
     public function __destruct()

src/bref/src/LaravelHttpHandler.php

@@ -16,7 +16,7 @@
  */
 class LaravelHttpHandler extends HttpHandler
 {
-    private $kernel;
+    private Kernel $kernel;
 
     public function __construct(Kernel $kernel)
     {

src/bref/src/LocalRunner.php

@@ -13,13 +13,8 @@
  */
 class LocalRunner implements RunnerInterface
 {
-    private $handler;
-    private $data;
-
-    public function __construct(Handler $handler, $data)
+    public function __construct(private Handler $handler, private mixed $data)
     {
-        $this->handler = $handler;
-        $this->data = $data;
     }
 
     public function run(): int

src/bref/src/Runtime.php

@@ -46,7 +46,7 @@ public function getRunner(?object $application): RunnerInterface
         }
     }
 
-    private function tryToFindRunner(?object $application)
+    private function tryToFindRunner(?object $application): RunnerInterface
     {
         if ($application instanceof ContainerInterface) {
             $handler = explode(':', $_SERVER['_HANDLER']);

src/bref/src/SymfonyHttpHandler.php

@@ -17,12 +17,8 @@
  */
 class SymfonyHttpHandler extends HttpHandler
 {
-    private $kernel;
-
-    public function __construct(HttpKernelInterface $kernel)
+    public function __construct(private HttpKernelInterface $kernel)
     {
-        $this->kernel = $kernel;
-
         Request::setTrustedProxies(['127.0.0.1'], Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO);
     }
 

src/bref/tests/Lambda/LambdaClientTest.php

@@ -16,8 +16,7 @@
  */
 class LambdaClientTest extends TestCase
 {
-    /** @var LambdaClient */
-    private $lambda;
+    private LambdaClient $lambda;
 
     protected function setUp(): void
     {
@@ -32,12 +31,12 @@ protected function tearDown(): void
         ob_end_clean();
     }
 
-    public function test basic behavior()
+    public function test basic behavior(): void
     {
         $this->givenAnEvent(['Hello' => 'world!']);
 
         $output = $this->lambda->processNextEvent(new class implements Handler {
-            public function handle($event, Context $context)
+            public function handle($event, Context $context): array
             {
                 return ['hello' => 'world'];
             }
@@ -47,12 +46,12 @@ public function handle($event, Context $context)
         $this->assertInvocationResult(['hello' => 'world']);
     }
 
-    public function test handler receives context()
+    public function test handler receives context(): void
     {
         $this->givenAnEvent(['Hello' => 'world!']);
 
         $this->lambda->processNextEvent(new class implements Handler {
-            public function handle($event, Context $context)
+            public function handle($event, Context $context): array
             {
                 return ['hello' => 'world', 'received-function-arn' => $context->getInvokedFunctionArn()];
             }
@@ -64,7 +63,7 @@ public function handle($event, Context $context)
         ]);
     }
 
-    public function test exceptions in the handler result in an invocation error()
+    public function test exceptions in the handler result in an invocation error(): void
     {
         $this->givenAnEvent(['Hello' => 'world!']);
 
@@ -80,7 +79,7 @@ public function handle($event, Context $context)
         $this->assertErrorInLogs('RuntimeException', 'This is an exception');
     }
 
-    public function test nested exceptions in the handler result in an invocation error()
+    public function test nested exceptions in the handler result in an invocation error(): void
     {
         $this->givenAnEvent(['Hello' => 'world!']);
 
@@ -99,7 +98,7 @@ public function handle($event, Context $context)
         ]);
     }
 
-    public function test an error is thrown if the runtime API returns a wrong response()
+    public function test an error is thrown if the runtime API returns a wrong response(): void
     {
         $this->expectExceptionMessage('Failed to fetch next Lambda invocation: The requested URL returned error: 404');
         Server::enqueue([
@@ -119,7 +118,7 @@ public function handle($event, Context $context)
         });
     }
 
-    public function test an error is thrown if the invocation id is missing()
+    public function test an error is thrown if the invocation id is missing(): void
     {
         $this->expectExceptionMessage('Failed to determine the Lambda invocation ID');
         Server::enqueue([
@@ -137,7 +136,7 @@ public function handle($event, Context $context)
         });
     }
 
-    public function test an error is thrown if the invocation body is empty()
+    public function test an error is thrown if the invocation body is empty(): void
     {
         $this->expectExceptionMessage('Empty Lambda runtime API response');
         Server::enqueue([
@@ -156,7 +155,7 @@ public function handle($event, Context $context)
         });
     }
 
-    public function test a wrong response from the runtime API turns the invocation into an error()
+    public function test a wrong response from the runtime API turns the invocation into an error(): void
     {
         Server::enqueue([
             new Response( // lambda event
@@ -194,12 +193,12 @@ public function handle($event, Context $context)
         $this->assertErrorInLogs('Exception', 'Error while calling the Lambda runtime API: The requested URL returned error: 400');
     }
 
-    public function test function results that cannot be encoded are reported as invocation errors()
+    public function test function results that cannot be encoded are reported as invocation errors(): void
     {
         $this->givenAnEvent(['hello' => 'world!']);
 
         $this->lambda->processNextEvent(new class implements Handler {
-            public function handle($event, Context $context)
+            public function handle($event, Context $context): string
             {
                 return "\xB1\x31";
             }
@@ -214,7 +213,7 @@ public function handle($event, Context $context)
         $this->assertErrorInLogs('Exception', $message);
     }
 
-    public function test generic event handler()
+    public function test generic event handler(): void
     {
         $handler = new class implements Handler {
             public function handle($event, Context $context)
@@ -245,7 +244,7 @@ private function givenAnEvent($event): void
         ]);
     }
 
-    private function assertInvocationResult($result)
+    private function assertInvocationResult($result): void
     {
         $requests = Server::received();
         $this->assertCount(2, $requests);
@@ -258,7 +257,7 @@ private function assertInvocationResult($result)
         $this->assertEquals($result, json_decode($eventResponse->getBody()->__toString(), true));
     }
 
-    private function assertInvocationErrorResult(string $errorClass, string $errorMessage)
+    private function assertInvocationErrorResult(string $errorClass, string $errorMessage): void
     {
         $requests = Server::received();
         $this->assertCount(2, $requests);
@@ -305,7 +304,7 @@ private function assertErrorInLogs(string $errorClass, string $errorMessage): vo
         $this->assertIsArray($invocationResult['stack']);
     }
 
-    private function assertPreviousErrorsInLogs(array $previousErrors)
+    private function assertPreviousErrorsInLogs(array $previousErrors): void
     {
         // Decode the logs from stdout
         $stdout = $this->getActualOutput();

src/bref/tests/SymfonyRequestBridgeTest.php

@@ -11,7 +11,7 @@
 
 class SymfonyRequestBridgeTest extends TestCase
 {
-    public function testClientIpFromForwardedFor()
+    public function testClientIpFromForwardedFor(): void
     {
         $request = SymfonyRequestBridge::convertRequest(new HttpRequestEvent([
             'requestContext' => ['http' => ['method' => 'GET']],
@@ -23,7 +23,7 @@ public function testClientIpFromForwardedFor()
     /**
      * Raw content should only exist when there is no multipart content.
      */
-    public function testRawContent()
+    public function testRawContent(): void
     {
         // No content type
         $request = SymfonyRequestBridge::convertRequest(new HttpRequestEvent([
@@ -67,7 +67,7 @@ public function testRawContent()
         $this->assertSame('', $request->getContent());
     }
 
-    public function testUploadedFile()
+    public function testUploadedFile(): void
     {
         $request = SymfonyRequestBridge::convertRequest(new HttpRequestEvent([
             'requestContext' => ['http' => ['method' => 'POST']],
@@ -107,7 +107,7 @@ public function testUploadedFile()
         $this->assertSame('bar', $post['foo']);
     }
 
-    public function testEmptyUploadedFile()
+    public function testEmptyUploadedFile(): void
     {
         $request = SymfonyRequestBridge::convertRequest(new HttpRequestEvent([
             'requestContext' => ['http' => ['method' => 'POST']],
@@ -136,7 +136,7 @@ public function testEmptyUploadedFile()
         $this->assertSame('bar', $post['foo']);
     }
 
-    public function testLambdaContext()
+    public function testLambdaContext(): void
     {
         $requestContext = ['http' => ['method' => 'GET']];
         $request = SymfonyRequestBridge::convertRequest(new HttpRequestEvent([
@@ -149,7 +149,7 @@ public function testLambdaContext()
         $this->assertSame(json_encode($requestContext), $request->server->get('LAMBDA_REQUEST_CONTEXT'));
     }
 
-    private function getContext()
+    private function getContext(): Context
     {
         // this is set in LaravelHttpHandler and SymfonyHttpHandler to allow overwrite of this value
         Request::setTrustedProxies(['127.0.0.1'], Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO);