add typehint to every properties

Author: guillaume-sainthillier

src/bref/bref/Context.php

@@ -11,24 +11,14 @@
  */
 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)
+    public function __construct(
+        private string $awsRequestId,
+        /** @var int Holds the deadline Unix timestamp in millis */
+        private int $deadlineMs,
+        private string $invokedFunctionArn,
+        private string $traceId
+    )
     {
-        $this->awsRequestId = $awsRequestId;
-        $this->deadlineMs = $deadlineMs;
-        $this->invokedFunctionArn = $invokedFunctionArn;
-        $this->traceId = $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,7 +15,7 @@
  */
 class ConsoleApplicationHandler implements Handler
 {
-    private $application;
+    private Application $application;
 
     public function __construct(Application $application)
     {

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

@@ -10,16 +10,16 @@
 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

@@ -38,24 +38,20 @@ final class LambdaClient
     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/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

@@ -17,7 +17,7 @@
 class LambdaClientTest extends TestCase
 {
     /** @var LambdaClient */
-    private $lambda;
+    private LambdaClient $lambda;
 
     protected function setUp(): void
     {

src/google-cloud/google/CloudEvent.php

@@ -20,39 +20,20 @@
 
 class CloudEvent implements \JsonSerializable
 {
-    // Required Fields
-    private $id;
-    private $source;
-    private $specversion;
-    private $type;
-
-    // Optional Fields
-    private $datacontenttype;
-    private $dataschema;
-    private $subject;
-    private $time;
-    private $data;
-
     final public function __construct(
-        string $id,
-        string $source,
-        string $specversion,
-        string $type,
-        ?string $datacontenttype,
-        ?string $dataschema,
-        ?string $subject,
-        ?string $time,
-        $data,
-    ) {
-        $this->id = $id;
-        $this->source = $source;
-        $this->specversion = $specversion;
-        $this->type = $type;
-        $this->datacontenttype = $datacontenttype;
-        $this->dataschema = $dataschema;
-        $this->subject = $subject;
-        $this->time = $time;
-        $this->data = $data;
+        // Required Fields
+        private string $id,
+        private string $source,
+        private string $specversion,
+        private string $type,
+        // Optional Fields
+        private ?string $datacontenttype,
+        private ?string $dataschema,
+        private ?string $subject,
+        private ?string $time,
+        private mixed $data
+    )
+    {
     }
 
     public function getId(): string

src/google-cloud/google/Context.php

@@ -20,21 +20,8 @@
 
 class Context
 {
-    private $eventId;
-    private $timestamp;
-    private $eventType;
-    private $resource;
-
-    final public function __construct(
-        ?string $eventId,
-        ?string $timestamp,
-        ?string $eventType,
-        ?array $resource,
-    ) {
-        $this->eventId = $eventId;
-        $this->timestamp = $timestamp;
-        $this->eventType = $eventType;
-        $this->resource = $resource;
+    final public function __construct(private ?string $eventId, private ?string $timestamp, private ?string $eventType, private ?array $resource)
+    {
     }
 
     public function getEventId(): ?string

src/google-cloud/google/LegacyEventMapper.php

@@ -23,7 +23,7 @@ class LegacyEventMapper
     // Maps background/legacy event types to their equivalent CloudEvent types.
     // For more info on event mappings see
     // https://github.com/GoogleCloudPlatform/functions-framework-conformance/blob/master/docs/mapping.md
-    private static $ceTypeMap = [
+    private static array $ceTypeMap = [
         'google.pubsub.topic.publish' => 'google.cloud.pubsub.topic.v1.messagePublished',
         'providers/cloud.pubsub/eventTypes/topic.publish' => 'google.cloud.pubsub.topic.v1.messagePublished',
         'google.storage.object.finalize' => 'google.cloud.storage.object.v1.finalized',
@@ -53,7 +53,7 @@ class LegacyEventMapper
     private const STORAGE_CE_SERVICE = 'storage.googleapis.com';
 
     // Maps background event services to their equivalent CloudEvent services.
-    private static $ceServiceMap = [
+    private static array $ceServiceMap = [
         'providers/cloud.firestore/' => self::FIRESTORE_CE_SERVICE,
         'providers/google.firebase.analytics/' => self::FIREBASE_CE_SERVICE,
         'providers/firebase.auth/' => self::FIREBASE_AUTH_CE_SERVICE,
@@ -66,7 +66,7 @@ class LegacyEventMapper
     // event resource string into CloudEvent resource and subject strings. Each regex
     // must have exactly two capture groups: the first for the resource and the second
     // for the subject.
-    private static $ceResourceRegexMap = [
+    private static array $ceResourceRegexMap = [
         self::FIREBASE_CE_SERVICE => '#^(projects/[^/]+)/(events/[^/]+)$#',
         self::FIREBASE_DB_CE_SERVICE => '#^(projects/_/instances/[^/]+)/(refs/.+)$#',
         self::FIRESTORE_CE_SERVICE => '#^(projects/[^/]+/databases/\(default\))/(documents/.+)$#',
@@ -75,7 +75,7 @@ class LegacyEventMapper
 
     // Maps Firebase Auth background event metadata field names to their equivalent
     // CloudEvent field names.
-    private static $firebaseAuthMetadataFieldMap = [
+    private static array $firebaseAuthMetadataFieldMap = [
         'createdAt' => 'createTime',
         'lastSignedInAt' => 'lastSignInTime',
     ];

src/google-cloud/src/Runtime.php

@@ -18,7 +18,7 @@ class Runtime extends GenericRuntime
     // from this list because the header 'ce-datacontenttype' is not permitted;
     // that data comes from the 'Content-Type' header instead. For more info see
     // https://github.com/cloudevents/spec/blob/v1.0.1/http-protocol-binding.md#311-http-content-type
-    private static $binaryModeHeaderAttrs = [
+    private static array $binaryModeHeaderAttrs = [
         'id',
         'source',
         'specversion',

src/laravel/src/ConsoleApplicationRunner.php

@@ -12,15 +12,9 @@
  */
 class ConsoleApplicationRunner implements RunnerInterface
 {
-    private $application;
-    private $input;
-    private $output;
 
-    public function __construct(ConsoleKernel $application, InputInterface $input, ?OutputInterface $output = null)
+    public function __construct(private ConsoleKernel $application, private InputInterface $input, private ?OutputInterface $output = null)
     {
-        $this->application = $application;
-        $this->input = $input;
-        $this->output = $output;
     }
 
     public function run(): int

src/laravel/src/HttpKernelRunner.php

@@ -8,8 +8,8 @@
 
 class HttpKernelRunner implements RunnerInterface
 {
-    private $kernel;
-    private $request;
+    private Kernel $kernel;
+    private Request $request;
 
     public function __construct(Kernel $kernel, Request $request)
     {

src/psr-17/src/Runtime.php

@@ -19,7 +19,7 @@ class Runtime extends GenericRuntime
     /**
      * @var ServerRequestCreator|null
      */
-    private $requestCreator;
+    private ?ServerRequestCreator $requestCreator = null;
 
     /**
      * @param array{

src/psr-laminas/src/Emitter.php

@@ -2,6 +2,7 @@
 
 namespace Runtime\PsrLaminas;
 
+use Laminas\HttpHandlerRunner\Emitter\EmitterInterface;
 use Laminas\HttpHandlerRunner\Emitter\SapiEmitter;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -13,10 +14,10 @@
  */
 class Emitter implements RunnerInterface
 {
-    private $requestHandler;
-    private $response;
-    private $request;
-    private $emitter;
+    private ?RequestHandlerInterface $requestHandler = null;
+    private ?ResponseInterface $response = null;
+    private ?ServerRequestInterface $request = null;
+    private EmitterInterface $emitter;
 
     private function __construct(array $options)
     {

src/psr-nyholm-laminas/src/LaminasEmitter.php

@@ -2,6 +2,7 @@
 
 namespace Runtime\PsrNyholmLaminas;
 
+use Laminas\HttpHandlerRunner\Emitter\EmitterInterface;
 use Laminas\HttpHandlerRunner\Emitter\SapiEmitter;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -13,10 +14,10 @@
  */
 class LaminasEmitter implements RunnerInterface
 {
-    private $requestHandler;
-    private $response;
-    private $request;
-    private $emitter;
+    private ?RequestHandlerInterface $requestHandler = null;
+    private ?ResponseInterface $response = null;
+    private ?ServerRequestInterface $request = null;
+    private EmitterInterface $emitter;
 
     private function __construct(array $options)
     {

src/psr-nyholm-laminas/src/Runtime.php

@@ -20,7 +20,7 @@ class Runtime extends GenericRuntime
     /**
      * @var ServerRequestCreator|null
      */
-    private $requestCreator;
+    private ?ServerRequestCreator $requestCreator = null;
 
     /**
      * @param array{

src/psr-nyholm/src/Emitter.php

@@ -12,9 +12,9 @@
  */
 class Emitter implements RunnerInterface
 {
-    private $requestHandler;
-    private $response;
-    private $request;
+    private ?RequestHandlerInterface $requestHandler = null;
+    private ?ResponseInterface $response = null;
+    private ?ServerRequestInterface $request = null;
 
     private function __construct()
     {