CS fixes

.php-cs-fixer.dist.php

@@ -1,8 +1,8 @@
 <?php
 
 $finder = PhpCsFixer\Finder::create()
-    ->in([__DIR__ . '/src'])
-;
+    ->in([__DIR__ . '/'])
+    ->exclude(__DIR__ . '/vendor');
 
 return (new PhpCsFixer\Config())
     ->setRules([
@@ -35,5 +35,4 @@
         'no_extra_blank_lines' => true,
         'no_whitespace_in_blank_line' => true,
     ])
-    ->setFinder($finder)
-    ;
+    ->setFinder($finder);

bin/check-versions.php

@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 /**
- * This script check for composer dependency incompatibilities:
+ * This script check for composer dependency incompatibilities:.
  *
  *  - All required dependencies of the extracted packages MUST be
  *    present in the main composer.json's require(-dev) section.
@@ -23,7 +23,6 @@
 
 include_once __DIR__ . '/tools.php';
 
-
 function constraint_has_conflict(string $mainConstraint, string $packageConstraint): bool
 {
     $parser = new VersionParser();
@@ -34,7 +33,6 @@ function constraint_has_conflict(string $mainConstraint, string $packageConstrai
     $packageLowerBound = $packageConstraint->getLowerBound()->getVersion();
     $packageUpperBound = $packageConstraint->getUpperBound()->getVersion();
 
-
     if (Comparator::compare($mainUpperBound, '<=', $packageLowerBound)) {
         return true;
     }
@@ -58,9 +56,15 @@ function constraint_has_conflict(string $mainConstraint, string $packageConstrai
 $mainComposer = $filesystem->read('composer.json');
 /** @var string[] $otherComposers */
 $otherComposers = $filesystem->listContents('src', true)
-    ->filter(function(StorageAttributes $item) { return $item->isFile(); })
-    ->filter(function(FileAttributes $item) { return substr($item->path(), -5) === '.json'; })
-    ->map(function(FileAttributes $item) { return $item->path(); })
+    ->filter(function (StorageAttributes $item) {
+        return $item->isFile();
+    })
+    ->filter(function (FileAttributes $item) {
+        return substr($item->path(), -5) === '.json';
+    })
+    ->map(function (FileAttributes $item) {
+        return $item->path();
+    })
     ->toArray();
 
 $mainInformation = json_decode($mainComposer, true);
@@ -107,4 +111,3 @@ function constraint_has_conflict(string $mainConstraint, string $packageConstrai
 }
 
 write_line("✅ Composer dependencies are looking fine.");
-

bin/set-flysystem-version.php

@@ -19,14 +19,20 @@
 
 /** @var string[] $otherComposers */
 $composerFiles = $filesystem->listContents('src', true)
-    ->filter(function(StorageAttributes $item) { return $item->isFile(); })
-    ->filter(function(FileAttributes $item) { return substr($item->path(), -5) === '.json'; })
-    ->map(function(FileAttributes $item) { return $item->path(); })
+    ->filter(function (StorageAttributes $item) {
+        return $item->isFile();
+    })
+    ->filter(function (FileAttributes $item) {
+        return substr($item->path(), -5) === '.json';
+    })
+    ->map(function (FileAttributes $item) {
+        return $item->path();
+    })
     ->toArray();
 
 foreach ($composerFiles as $composerFile) {
     $contents = $filesystem->read($composerFile);
     $mainVersionRegex = preg_quote($mainVersion, '~');
-    $updated = preg_replace('~("league/flysystem": "\\^[a-zA-Z0-9\\.-]+")~ms', '"league/flysystem": "^'.$mainVersion.'"', $contents);
+    $updated = preg_replace('~("league/flysystem": "\\^[a-zA-Z0-9\\.-]+")~ms', '"league/flysystem": "^' . $mainVersion . '"', $contents);
     $filesystem->write($composerFile, $updated);
 }

composer.json

@@ -29,7 +29,7 @@
         "phpseclib/phpseclib": "^2.0",
         "aws/aws-sdk-php": "^3.198.1",
         "composer/semver": "^3.0",
-        "friendsofphp/php-cs-fixer": "^3.2",
+        "friendsofphp/php-cs-fixer": "^3.5",
         "google/cloud-storage": "^1.23",
         "async-aws/s3": "^1.5",
         "async-aws/simple-s3": "^1.0",

mocked-functions.php

@@ -39,7 +39,8 @@ function filesize(...$arguments)
 }
 
 namespace League\Flysystem\InMemory {
-    function time() {
+    function time()
+    {
         if ( ! is_mocked('time')) {
             return \time();
         }
@@ -141,7 +142,8 @@ function ftp_rawlist(...$arguments)
 }
 
 namespace League\Flysystem\ZipArchive {
-    function stream_get_contents(...$arguments) {
+    function stream_get_contents(...$arguments)
+    {
         if ( ! is_mocked('stream_get_contents')) {
             return \stream_get_contents(...$arguments);
         }

phpunit.php

@@ -1,5 +1,5 @@
 <?php
 
-include __DIR__.'/vendor/autoload.php';
-include __DIR__.'/src/AdapterTestUtilities/test-functions.php';
-include __DIR__.'/mocked-functions.php';
+include __DIR__ . '/vendor/autoload.php';
+include __DIR__ . '/src/AdapterTestUtilities/test-functions.php';
+include __DIR__ . '/mocked-functions.php';

src/AdapterTestUtilities/FilesystemAdapterTestCase.php

@@ -4,8 +4,6 @@
 
 namespace League\Flysystem\AdapterTestUtilities;
 
-use function is_resource;
-use function iterator_to_array;
 use const PHP_EOL;
 use Generator;
 use League\Flysystem\Config;
@@ -21,6 +19,8 @@
 use PHPUnit\Framework\TestCase;
 use Throwable;
 use function file_get_contents;
+use function is_resource;
+use function iterator_to_array;
 
 /**
  * @codeCoverageIgnore
@@ -674,7 +674,7 @@ public function trying_to_delete_a_non_existing_file(): void
      */
     public function checking_if_files_exist(): void
     {
-        $this->runScenario(function() {
+        $this->runScenario(function () {
             $adapter = $this->adapter();
             $fileExistsBefore = $adapter->fileExists('some/path.txt');
             $adapter->write('some/path.txt', 'contents', new Config());

src/AdapterTestUtilities/RetryOnTestException.php

@@ -4,9 +4,9 @@
 
 namespace League\Flysystem\AdapterTestUtilities;
 
-use League\Flysystem\FilesystemException;
 use const PHP_EOL;
 use const STDOUT;
+use League\Flysystem\FilesystemException;
 use Throwable;
 
 /**
@@ -43,6 +43,7 @@ protected function dontRetryOnException(): void
 
     /**
      * @internal
+     *
      * @throws Throwable
      */
     protected function runSetup(callable $scenario): void

src/AsyncAwsS3/AsyncAwsS3AdapterTest.php

@@ -19,7 +19,6 @@
 use League\Flysystem\Config;
 use League\Flysystem\FileAttributes;
 use League\Flysystem\FilesystemAdapter;
-use League\Flysystem\Ftp\UnableToConnectToFtpHost;
 use League\Flysystem\StorageAttributes;
 use League\Flysystem\UnableToCheckFileExistence;
 use League\Flysystem\UnableToDeleteFile;

src/AwsS3V3/AwsS3V3Adapter.php

@@ -328,7 +328,12 @@ private function mapS3ObjectMetadata(array $metadata, string $path = null): Stor
         $lastModified = $dateTime instanceof DateTimeResult ? $dateTime->getTimeStamp() : null;
 
         return new FileAttributes(
-            $path, $fileSize, null, $lastModified, $mimetype, $this->extractExtraMetadata($metadata)
+            $path,
+            $fileSize,
+            null,
+            $lastModified,
+            $mimetype,
+            $this->extractExtraMetadata($metadata)
         );
     }
 

src/Ftp/FtpAdapter.php

@@ -10,7 +10,6 @@
 use League\Flysystem\DirectoryAttributes;
 use League\Flysystem\FileAttributes;
 use League\Flysystem\FilesystemAdapter;
-use League\Flysystem\FilesystemException;
 use League\Flysystem\PathPrefixer;
 use League\Flysystem\StorageAttributes;
 use League\Flysystem\UnableToCopyFile;

src/GoogleCloudStorage/StubRiggedBucket.php

@@ -8,8 +8,6 @@
 use LogicException;
 use Throwable;
 
-use function array_key_exists;
-
 class StubRiggedBucket extends Bucket
 {
     private array $triggers = [];

src/GoogleCloudStorage/StubStorageClient.php

@@ -27,6 +27,7 @@ public function bucket($name, $userProject = false)
                 'requesterProjectId' => $this->projectId,
             ]);
         }
+
         return $name === 'flysystem' ? $this->riggedBucket : parent::bucket($name, $userProject);
     }
 }

src/InMemory/InMemoryFilesystemAdapter.php

@@ -8,7 +8,6 @@
 use League\Flysystem\DirectoryAttributes;
 use League\Flysystem\FileAttributes;
 use League\Flysystem\FilesystemAdapter;
-use League\Flysystem\FilesystemException;
 use League\Flysystem\UnableToCopyFile;
 use League\Flysystem\UnableToMoveFile;
 use League\Flysystem\UnableToReadFile;

src/Local/LocalFilesystemAdapter.php

@@ -4,7 +4,6 @@
 
 namespace League\Flysystem\Local;
 
-use function file_put_contents;
 use const DIRECTORY_SEPARATOR;
 use const LOCK_EX;
 use DirectoryIterator;
@@ -38,11 +37,11 @@
 use function error_clear_last;
 use function error_get_last;
 use function file_exists;
+use function file_put_contents;
 use function is_dir;
 use function is_file;
 use function mkdir;
 use function rename;
-use function stream_copy_to_stream;
 
 class LocalFilesystemAdapter implements FilesystemAdapter
 {

src/Local/LocalFilesystemAdapterTest.php

@@ -4,8 +4,6 @@
 
 namespace League\Flysystem\Local;
 
-use function strnatcasecmp;
-use function usort;
 use const LOCK_EX;
 use League\Flysystem\AdapterTestUtilities\FilesystemAdapterTestCase;
 use League\Flysystem\Config;
@@ -32,7 +30,9 @@
 use function is_resource;
 use function iterator_to_array;
 use function mkdir;
+use function strnatcasecmp;
 use function symlink;
+use function usort;
 
 /**
  * @group local
@@ -305,7 +305,7 @@ public function retrieving_visibility_while_listing_directory_contents(): void
         /** @var Traversable<StorageAttributes> $contentListing */
         $contentListing = $adapter->listContents('/', true);
         $listing = iterator_to_array($contentListing);
-        usort($listing, function(StorageAttributes $a, StorageAttributes $b) {
+        usort($listing, function (StorageAttributes $a, StorageAttributes $b) {
             return strnatcasecmp($a->path(), $b->path());
         });
         /**

test_files/wait_for_ftp.php

@@ -17,7 +17,7 @@
 $start = time();
 $connected = false;
 
-while(time() - $start < 60) {
+while (time() - $start < 60) {
     try {
         $provider->createConnection($options);
         $connected = true;