Merge pull request #1722 from jnoordsij/replace-ternary-with-null-coa…

…lescing

Replace various short-ternary operators with null coalescing ones

src/AsyncAwsS3/AsyncAwsS3Adapter.php

@@ -112,8 +112,8 @@ public function __construct(
         array $metadataFields = self::EXTRA_METADATA_FIELDS,
     ) {
         $this->prefixer = new PathPrefixer($prefix);
-        $this->visibility = $visibility ?: new PortableVisibilityConverter();
-        $this->mimeTypeDetector = $mimeTypeDetector ?: new FinfoMimeTypeDetector();
+        $this->visibility = $visibility ?? new PortableVisibilityConverter();
+        $this->mimeTypeDetector = $mimeTypeDetector ?? new FinfoMimeTypeDetector();
         $this->forwardedOptions = $forwardedOptions;
         $this->metadataFields = $metadataFields;
     }
@@ -315,6 +315,7 @@ public function move(string $source, string $destination, Config $config): void
     public function copy(string $source, string $destination, Config $config): void
     {
         try {
+
             $visibility = $config->get(Config::OPTION_VISIBILITY);
 
             if ($visibility === null && $config->get('retain_visibility', true)) {

src/AsyncAwsS3/S3ClientStub.php

@@ -59,7 +59,7 @@ public function __construct(SimpleS3Client $client, $configuration = [])
 
     public function throwExceptionWhenExecutingCommand(string $commandName, Exception $exception = null): void
     {
-        $this->stagedExceptions[$commandName] = $exception ?: new NetworkException();
+        $this->stagedExceptions[$commandName] = $exception ?? new NetworkException();
     }
 
     public function stageResultForCommand(string $commandName, Result $result): void

src/AwsS3V3/AwsS3V3Adapter.php

@@ -108,8 +108,8 @@ public function __construct(
         private array $multipartUploadOptions = self::MUP_AVAILABLE_OPTIONS,
     ) {
         $this->prefixer = new PathPrefixer($prefix);
-        $this->visibility = $visibility ?: new PortableVisibilityConverter();
-        $this->mimeTypeDetector = $mimeTypeDetector ?: new FinfoMimeTypeDetector();
+        $this->visibility = $visibility ?? new PortableVisibilityConverter();
+        $this->mimeTypeDetector = $mimeTypeDetector ?? new FinfoMimeTypeDetector();
     }
 
     public function fileExists(string $path): bool
@@ -397,8 +397,8 @@ private function retrievePaginatedListing(array $options): Generator
         $resultPaginator = $this->client->getPaginator('ListObjectsV2', $options + $this->options);
 
         foreach ($resultPaginator as $result) {
-            yield from ($result->get('CommonPrefixes') ?: []);
-            yield from ($result->get('Contents') ?: []);
+            yield from ($result->get('CommonPrefixes') ?? []);
+            yield from ($result->get('Contents') ?? []);
         }
     }
 

src/AwsS3V3/S3ClientStub.php

@@ -71,7 +71,7 @@ public function failOnNextCopy(): void
 
     public function throwExceptionWhenExecutingCommand(string $commandName, S3Exception $exception = null): void
     {
-        $this->stagedExceptions[$commandName] = $exception ?: new S3Exception($commandName, new Command($commandName));
+        $this->stagedExceptions[$commandName] = $exception ?? new S3Exception($commandName, new Command($commandName));
     }
 
     public function throw500ExceptionWhenExecutingCommand(string $commandName): void

src/Filesystem.php

@@ -29,7 +29,7 @@ public function __construct(
         private ?TemporaryUrlGenerator $temporaryUrlGenerator = null,
     ) {
         $this->config = new Config($config);
-        $this->pathNormalizer = $pathNormalizer ?: new WhitespacePathNormalizer();
+        $this->pathNormalizer = $pathNormalizer ?? new WhitespacePathNormalizer();
     }
 
     public function fileExists(string $location): bool
@@ -183,15 +183,15 @@ public function visibility(string $path): string
     public function publicUrl(string $path, array $config = []): string
     {
         $this->publicUrlGenerator ??= $this->resolvePublicUrlGenerator()
-            ?: throw UnableToGeneratePublicUrl::noGeneratorConfigured($path);
+            ?? throw UnableToGeneratePublicUrl::noGeneratorConfigured($path);
         $config = $this->config->extend($config);
 
         return $this->publicUrlGenerator->publicUrl($path, $config);
     }
 
     public function temporaryUrl(string $path, DateTimeInterface $expiresAt, array $config = []): string
     {
-        $generator = $this->temporaryUrlGenerator ?: $this->adapter;
+        $generator = $this->temporaryUrlGenerator ?? $this->adapter;
 
         if ($generator instanceof TemporaryUrlGenerator) {
             return $generator->temporaryUrl($path, $expiresAt, $this->config->extend($config));

src/Ftp/FtpAdapter.php

@@ -62,10 +62,10 @@ public function __construct(
         private bool $detectMimeTypeUsingPath = false,
     ) {
         $this->systemType = $this->connectionOptions->systemType();
-        $this->connectionProvider = $connectionProvider ?: new FtpConnectionProvider();
-        $this->connectivityChecker = $connectivityChecker ?: new NoopCommandConnectivityChecker();
-        $this->visibilityConverter = $visibilityConverter ?: new PortableVisibilityConverter();
-        $this->mimeTypeDetector = $mimeTypeDetector ?: new FinfoMimeTypeDetector();
+        $this->connectionProvider = $connectionProvider ?? new FtpConnectionProvider();
+        $this->connectivityChecker = $connectivityChecker ?? new NoopCommandConnectivityChecker();
+        $this->visibilityConverter = $visibilityConverter ?? new PortableVisibilityConverter();
+        $this->mimeTypeDetector = $mimeTypeDetector ?? new FinfoMimeTypeDetector();
         $this->useRawListOptions = $connectionOptions->useRawListOptions();
     }
 

src/GoogleCloudStorage/GoogleCloudStorageAdapter.php

@@ -64,8 +64,8 @@ public function __construct(
         MimeTypeDetector $mimeTypeDetector = null
     ) {
         $this->prefixer = new PathPrefixer($prefix);
-        $this->visibilityHandler = $visibilityHandler ?: new PortableVisibilityHandler();
-        $this->mimeTypeDetector = $mimeTypeDetector ?: new FinfoMimeTypeDetector();
+        $this->visibilityHandler = $visibilityHandler ?? new PortableVisibilityHandler();
+        $this->mimeTypeDetector = $mimeTypeDetector ?? new FinfoMimeTypeDetector();
     }
 
     public function publicUrl(string $path, Config $config): string

src/GoogleCloudStorage/StubRiggedBucket.php

@@ -38,7 +38,7 @@ public function upload($data, array $options = [])
 
     private function setupTrigger(string $method, string $name, ?Throwable $throwable): void
     {
-        $this->triggers[$method][$name] = $throwable ?: new LogicException('unknown error');
+        $this->triggers[$method][$name] = $throwable ?? new LogicException('unknown error');
     }
 
     private function pushTrigger(string $method, string $name): void

src/InMemory/InMemoryFile.php

@@ -19,7 +19,7 @@ class InMemoryFile
     public function updateContents(string $contents, ?int $timestamp): void
     {
         $this->contents = $contents;
-        $this->lastModified = $timestamp ?: time();
+        $this->lastModified = $timestamp ?? time();
     }
 
     public function lastModified(): int

src/InMemory/InMemoryFilesystemAdapter.php

@@ -35,7 +35,7 @@ public function __construct(
         private string $defaultVisibility = Visibility::PUBLIC,
         MimeTypeDetector $mimeTypeDetector = null
     ) {
-        $this->mimeTypeDetector = $mimeTypeDetector ?: new FinfoMimeTypeDetector();
+        $this->mimeTypeDetector = $mimeTypeDetector ?? new FinfoMimeTypeDetector();
     }
 
     public function fileExists(string $path): bool

src/Local/LocalFilesystemAdapter.php

@@ -81,7 +81,7 @@ public function __construct(
         $visibility ??= new PortableVisibilityConverter();
         $this->visibility = $visibility;
         $this->rootLocation = $location;
-        $this->mimeTypeDetector = $mimeTypeDetector ?: new FallbackMimeTypeDetector(new FinfoMimeTypeDetector());
+        $this->mimeTypeDetector = $mimeTypeDetector ?? new FallbackMimeTypeDetector(new FinfoMimeTypeDetector());
 
         if ( ! $lazyRootCreation) {
             $this->ensureRootDirectoryExists();

src/PhpseclibV2/SftpAdapter.php

@@ -63,8 +63,8 @@ public function __construct(
     ) {
         $this->connectionProvider = $connectionProvider;
         $this->prefixer = new PathPrefixer($root);
-        $this->visibilityConverter = $visibilityConverter ?: new PortableVisibilityConverter();
-        $this->mimeTypeDetector = $mimeTypeDetector ?: new FinfoMimeTypeDetector();
+        $this->visibilityConverter = $visibilityConverter ?? new PortableVisibilityConverter();
+        $this->mimeTypeDetector = $mimeTypeDetector ?? new FinfoMimeTypeDetector();
     }
 
     public function fileExists(string $path): bool

src/PhpseclibV2/SftpConnectionProvider.php

@@ -97,7 +97,7 @@ public function __construct(
         $this->port = $port;
         $this->timeout = $timeout;
         $this->hostFingerprint = $hostFingerprint;
-        $this->connectivityChecker = $connectivityChecker ?: new SimpleConnectivityChecker();
+        $this->connectivityChecker = $connectivityChecker ?? new SimpleConnectivityChecker();
         $this->maxTries = $maxTries;
     }
 

src/PhpseclibV3/SftpAdapter.php

@@ -43,8 +43,8 @@ public function __construct(
         private bool $detectMimeTypeUsingPath = false,
     ) {
         $this->prefixer = new PathPrefixer($root);
-        $this->visibilityConverter = $visibilityConverter ?: new PortableVisibilityConverter();
-        $this->mimeTypeDetector = $mimeTypeDetector ?: new FinfoMimeTypeDetector();
+        $this->visibilityConverter = $visibilityConverter ?? new PortableVisibilityConverter();
+        $this->mimeTypeDetector = $mimeTypeDetector ?? new FinfoMimeTypeDetector();
     }
 
     public function fileExists(string $path): bool

src/PhpseclibV3/SftpConnectionProvider.php

@@ -44,7 +44,7 @@ public function __construct(
         private array $preferredAlgorithms = [],
         private bool $disableStatCache = true,
     ) {
-        $this->connectivityChecker = $connectivityChecker ?: new SimpleConnectivityChecker();
+        $this->connectivityChecker = $connectivityChecker ?? new SimpleConnectivityChecker();
     }
 
     public function provideConnection(): SFTP