From 07dc5ab28140f08cf151967b76bc1fc519818f62 Mon Sep 17 00:00:00 2001
From: Frank de Jonge <info@frankdejonge.nl>
Date: Wed, 26 Oct 2022 20:03:44 +0200
Subject: [PATCH] Convert properties to model ones

---
 src/AsyncAwsS3/AsyncAwsS3Adapter.php       | 33 ++--------
 src/AwsS3V3/AwsS3V3Adapter.php             | 73 +++-------------------
 src/Ftp/ConnectivityCheckerThatCanFail.php | 13 +---
 src/Ftp/FtpAdapter.php                     | 52 +++------------
 4 files changed, 26 insertions(+), 145 deletions(-)

diff --git a/src/AsyncAwsS3/AsyncAwsS3Adapter.php b/src/AsyncAwsS3/AsyncAwsS3Adapter.php
index 750509a03..9fdbde8c4 100644
--- a/src/AsyncAwsS3/AsyncAwsS3Adapter.php
+++ b/src/AsyncAwsS3/AsyncAwsS3Adapter.php
@@ -84,30 +84,9 @@ class AsyncAwsS3Adapter implements FilesystemAdapter, PublicUrlGenerator, Checks
         'VersionId',
     ];
 
-    /**
-     * @var S3Client
-     */
-    private $client;
-
-    /**
-     * @var PathPrefixer
-     */
-    private $prefixer;
-
-    /**
-     * @var string
-     */
-    private $bucket;
-
-    /**
-     * @var VisibilityConverter
-     */
-    private $visibility;
-
-    /**
-     * @var MimeTypeDetector
-     */
-    private $mimeTypeDetector;
+    private PathPrefixer $prefixer;
+    private VisibilityConverter $visibility;
+    private MimeTypeDetector $mimeTypeDetector;
 
     /**
      * @var array|string[]
@@ -123,17 +102,15 @@ class AsyncAwsS3Adapter implements FilesystemAdapter, PublicUrlGenerator, Checks
      * @param S3Client|SimpleS3Client $client Uploading of files larger than 5GB is only supported with SimpleS3Client
      */
     public function __construct(
-        S3Client $client,
-        string $bucket,
+        private S3Client $client,
+        private string $bucket,
         string $prefix = '',
         VisibilityConverter $visibility = null,
         MimeTypeDetector $mimeTypeDetector = null,
         array $forwardedOptions = self::AVAILABLE_OPTIONS,
         array $metadataFields = self::EXTRA_METADATA_FIELDS,
     ) {
-        $this->client = $client;
         $this->prefixer = new PathPrefixer($prefix);
-        $this->bucket = $bucket;
         $this->visibility = $visibility ?: new PortableVisibilityConverter();
         $this->mimeTypeDetector = $mimeTypeDetector ?: new FinfoMimeTypeDetector();
         $this->forwardedOptions = $forwardedOptions;
diff --git a/src/AwsS3V3/AwsS3V3Adapter.php b/src/AwsS3V3/AwsS3V3Adapter.php
index b329acc39..60f634282 100644
--- a/src/AwsS3V3/AwsS3V3Adapter.php
+++ b/src/AwsS3V3/AwsS3V3Adapter.php
@@ -91,78 +91,25 @@ class AwsS3V3Adapter implements FilesystemAdapter, PublicUrlGenerator, ChecksumP
         'VersionId',
     ];
 
-    /**
-     * @var S3ClientInterface
-     */
-    private $client;
-
-    /**
-     * @var PathPrefixer
-     */
-    private $prefixer;
-
-    /**
-     * @var string
-     */
-    private $bucket;
-
-    /**
-     * @var VisibilityConverter
-     */
-    private $visibility;
-
-    /**
-     * @var MimeTypeDetector
-     */
-    private $mimeTypeDetector;
-
-    /**
-     * @var array
-     */
-    private $options;
-
-    /**
-     * @var bool
-     */
-    private $streamReads;
-
-    /**
-     * @var string[]
-     */
-    private array $forwardedOptions;
-
-    /**
-     * @var string[]
-     */
-    private array $metadataFields;
-
-    /**
-     * @var string[]
-     */
-    private array $multipartUploadOptions;
+    private PathPrefixer $prefixer;
+    private VisibilityConverter $visibility;
+    private MimeTypeDetector $mimeTypeDetector;
 
     public function __construct(
-        S3ClientInterface $client,
-        string $bucket,
+        private S3ClientInterface $client,
+        private string $bucket,
         string $prefix = '',
         VisibilityConverter $visibility = null,
         MimeTypeDetector $mimeTypeDetector = null,
-        array $options = [],
-        bool $streamReads = true,
-        array $forwardedOptions = self::AVAILABLE_OPTIONS,
-        array $metadataFields = self::EXTRA_METADATA_FIELDS,
-        array $multipartUploadOptions = self::MUP_AVAILABLE_OPTIONS,
+        private array $options = [],
+        private bool $streamReads = true,
+        private array $forwardedOptions = self::AVAILABLE_OPTIONS,
+        private array $metadataFields = self::EXTRA_METADATA_FIELDS,
+        private array $multipartUploadOptions = self::MUP_AVAILABLE_OPTIONS,
     ) {
-        $this->client = $client;
         $this->prefixer = new PathPrefixer($prefix);
-        $this->bucket = $bucket;
         $this->visibility = $visibility ?: new PortableVisibilityConverter();
         $this->mimeTypeDetector = $mimeTypeDetector ?: new FinfoMimeTypeDetector();
-        $this->options = $options;
-        $this->streamReads = $streamReads;
-        $this->forwardedOptions = $forwardedOptions;
-        $this->metadataFields = $metadataFields;
-        $this->multipartUploadOptions = $multipartUploadOptions;
     }
 
     public function fileExists(string $path): bool
diff --git a/src/Ftp/ConnectivityCheckerThatCanFail.php b/src/Ftp/ConnectivityCheckerThatCanFail.php
index a373b007a..3bdbf264d 100644
--- a/src/Ftp/ConnectivityCheckerThatCanFail.php
+++ b/src/Ftp/ConnectivityCheckerThatCanFail.php
@@ -6,19 +6,10 @@
 
 class ConnectivityCheckerThatCanFail implements ConnectivityChecker
 {
-    /**
-     * @var bool
-     */
-    private $failNextCall = false;
-
-    /**
-     * @var ConnectivityChecker
-     */
-    private $connectivityChecker;
+    private bool $failNextCall = false;
 
-    public function __construct(ConnectivityChecker $connectivityChecker)
+    public function __construct(private ConnectivityChecker $connectivityChecker)
     {
-        $this->connectivityChecker = $connectivityChecker;
     }
 
     public function failNextCall(): void
diff --git a/src/Ftp/FtpAdapter.php b/src/Ftp/FtpAdapter.php
index e0a9fd517..b78ba8ba8 100644
--- a/src/Ftp/FtpAdapter.php
+++ b/src/Ftp/FtpAdapter.php
@@ -37,63 +37,29 @@ class FtpAdapter implements FilesystemAdapter
     private const SYSTEM_TYPE_WINDOWS = 'windows';
     private const SYSTEM_TYPE_UNIX = 'unix';
 
-    /**
-     * @var FtpConnectionOptions
-     */
-    private $connectionOptions;
-
-    /**
-     * @var FtpConnectionProvider
-     */
-    private $connectionProvider;
-
-    /**
-     * @var ConnectivityChecker
-     */
-    private $connectivityChecker;
+    private FtpConnectionProvider $connectionProvider;
+    private ConnectivityChecker $connectivityChecker;
 
     /**
      * @var resource|false|\FTP\Connection
      */
-    private $connection = false;
-
-    /**
-     * @var PathPrefixer
-     */
-    private $prefixer;
-
-    /**
-     * @var VisibilityConverter
-     */
-    private $visibilityConverter;
-
-    /**
-     * @var bool|null
-     */
-    private $isPureFtpdServer;
-
+    private mixed $connection = false;
+    private PathPrefixer $prefixer;
+    private VisibilityConverter $visibilityConverter;
+    private ?bool $isPureFtpdServer = null;
     private ?bool $useRawListOptions = null;
-
-    /**
-     * @var null|string
-     */
-    private $systemType;
-
-    /**
-     * @var MimeTypeDetector
-     */
-    private $mimeTypeDetector;
+    private ?string $systemType = null;
+    private MimeTypeDetector $mimeTypeDetector;
 
     private ?string $rootDirectory = null;
 
     public function __construct(
-        FtpConnectionOptions $connectionOptions,
+        private FtpConnectionOptions $connectionOptions,
         FtpConnectionProvider $connectionProvider = null,
         ConnectivityChecker $connectivityChecker = null,
         VisibilityConverter $visibilityConverter = null,
         MimeTypeDetector $mimeTypeDetector = null
     ) {
-        $this->connectionOptions = $connectionOptions;
         $this->connectionProvider = $connectionProvider ?: new FtpConnectionProvider();
         $this->connectivityChecker = $connectivityChecker ?: new NoopCommandConnectivityChecker();
         $this->visibilityConverter = $visibilityConverter ?: new PortableVisibilityConverter();