refactor: Use PHP 8.0 constructor property promotion feature

pact-foundation · Sep 24, 2024 · cad1a9e · cad1a9e
1 parent ac15e32
commit cad1a9e
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 36 deletions.
diff --git a/example/binary/consumer/src/Service/HttpClientService.php b/example/binary/consumer/src/Service/HttpClientService.php
@@ -12,12 +12,9 @@ class HttpClientService
 {
     private Client $httpClient;
 
-    private string $baseUri;
-
-    public function __construct(string $baseUri)
+    public function __construct(private string $baseUri)
     {
         $this->httpClient = new Client();
-        $this->baseUri    = $baseUri;
     }
 
     public function getImageContent(): string

diff --git a/example/csv/consumer/src/Service/HttpClientService.php b/example/csv/consumer/src/Service/HttpClientService.php
@@ -9,12 +9,9 @@ class HttpClientService
 {
     private Client $httpClient;
 
-    private string $baseUri;
-
-    public function __construct(string $baseUri)
+    public function __construct(private string $baseUri)
     {
         $this->httpClient = new Client();
-        $this->baseUri    = $baseUri;
     }
 
     public function getReport(): array

diff --git a/example/generators/consumer/src/Service/HttpClientService.php b/example/generators/consumer/src/Service/HttpClientService.php
@@ -9,12 +9,9 @@ class HttpClientService
 {
     private Client $httpClient;
 
-    private string $baseUri;
-
-    public function __construct(string $baseUri)
+    public function __construct(private string $baseUri)
     {
         $this->httpClient = new Client();
-        $this->baseUri    = $baseUri;
     }
 
     public function sendRequest(): ResponseInterface

diff --git a/example/graphql/consumer/src/Service/HttpClientService.php b/example/graphql/consumer/src/Service/HttpClientService.php
@@ -9,12 +9,9 @@ class HttpClientService
 {
     private Client $httpClient;
 
-    private string $baseUri;
-
-    public function __construct(string $baseUri)
+    public function __construct(private string $baseUri)
     {
         $this->httpClient = new Client();
-        $this->baseUri    = $baseUri;
     }
 
     public function query(): string

diff --git a/example/json/consumer/src/Service/HttpClientService.php b/example/json/consumer/src/Service/HttpClientService.php
@@ -12,12 +12,9 @@ class HttpClientService
 {
     private Client $httpClient;
 
-    private string $baseUri;
-
-    public function __construct(string $baseUri)
+    public function __construct(private string $baseUri)
     {
         $this->httpClient = new Client();
-        $this->baseUri    = $baseUri;
     }
 
     /**

diff --git a/example/matchers/consumer/src/Service/HttpClientService.php b/example/matchers/consumer/src/Service/HttpClientService.php
@@ -9,12 +9,9 @@ class HttpClientService
 {
     private Client $httpClient;
 
-    private string $baseUri;
-
-    public function __construct(string $baseUri)
+    public function __construct(private string $baseUri)
     {
         $this->httpClient = new Client();
-        $this->baseUri    = $baseUri;
     }
 
     public function sendRequest(): ResponseInterface

diff --git a/example/multipart/consumer/src/Service/HttpClientService.php b/example/multipart/consumer/src/Service/HttpClientService.php
@@ -11,12 +11,9 @@ class HttpClientService
 {
     private Client $httpClient;
 
-    private string $baseUri;
-
-    public function __construct(string $baseUri)
+    public function __construct(private string $baseUri)
     {
         $this->httpClient = new Client();
-        $this->baseUri = $baseUri;
     }
 
     public function updateUserProfile(): string

diff --git a/example/stub-server/consumer/src/Service/HttpClientService.php b/example/stub-server/consumer/src/Service/HttpClientService.php
@@ -9,12 +9,9 @@ class HttpClientService
 {
     private Client $httpClient;
 
-    private string $baseUri;
-
-    public function __construct(string $baseUri)
+    public function __construct(private string $baseUri)
     {
         $this->httpClient = new Client();
-        $this->baseUri    = $baseUri;
     }
 
     public function getResults(): array

diff --git a/example/xml/consumer/src/Service/HttpClientService.php b/example/xml/consumer/src/Service/HttpClientService.php
@@ -9,12 +9,9 @@ class HttpClientService
 {
     private Client $httpClient;
 
-    private string $baseUri;
-
-    public function __construct(string $baseUri)
+    public function __construct(private string $baseUri)
     {
         $this->httpClient = new Client();
-        $this->baseUri    = $baseUri;
     }
 
     public function getMovies(): string