refactor: use constructor property promotion

imgix · Jan 31, 2023 · a0e1ffc · a0e1ffc
1 parent e4cc245
commit a0e1ffc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 30 deletions.
diff --git a/src/UrlBuilder.php b/src/UrlBuilder.php
@@ -6,13 +6,6 @@
 
 class UrlBuilder
 {
-    private $domain;
-
-    private $useHttps;
-
-    private $signKey;
-
-    private $includeLibraryParam = true;
     public const VERSION = '4.1.0';
 
     public const TARGET_WIDTHS = [
@@ -34,18 +27,17 @@ class UrlBuilder
 
     public const SRCSET_WIDTH_TOLERANCE = 0.08;
 
-    public function __construct($domain, $useHttps = true, $signKey = '', $includeLibraryParam = true)
-    {
+    public function __construct(
+        private $domain,
+        private $useHttps = true,
+        private $signKey = '',
+        private $includeLibraryParam = true,
+    ) {
         if (! is_string($domain)) {
             throw new InvalidArgumentException('UrlBuilder must be passed a string domain');
         }
 
-        $this->domain = $domain;
         $this->validateDomain($this->domain);
-
-        $this->useHttps = $useHttps;
-        $this->signKey = $signKey;
-        $this->includeLibraryParam = $includeLibraryParam;
     }
 
     private function validateDomain($domain)

diff --git a/src/UrlHelper.php b/src/UrlHelper.php
@@ -4,23 +4,14 @@
 
 class UrlHelper
 {
-    private $domain;
-
-    private $path;
-
-    private $scheme;
-
-    private $signKey;
-
-    private $params;
-
-    public function __construct($domain, $path, $scheme = 'http', $signKey = '', $params = [])
-    {
-        $this->domain = $domain;
+    public function __construct(
+        private $domain,
+        private $path,
+        private $scheme = 'http',
+        private $signKey = '',
+        private $params = [],
+    ) {
         $this->path = $this->formatPath($path);
-        $this->scheme = $scheme;
-        $this->signKey = $signKey;
-        $this->params = $params;
     }
 
     public function formatPath($path)