Type Flysystem

src/Gaufrette/Adapter/FileFactory.php

@@ -14,11 +14,6 @@ interface FileFactory
 {
     /**
      * Creates a new File instance and returns it.
-     *
-     * @param string     $key
-     * @param Filesystem $filesystem
-     *
-     * @return File
      */
-    public function createFile($key, Filesystem $filesystem);
+    public function createFile(string $key, Filesystem $filesystem): File;
 }

src/Gaufrette/Adapter/Flysystem.php

@@ -6,61 +6,52 @@
 use Gaufrette\Exception\UnsupportedAdapterMethodException;
 use League\Flysystem\AdapterInterface;
 use League\Flysystem\Util;
+use League\Flysystem\Config;
 
 class Flysystem implements Adapter, ListKeysAware
 {
-    /**
-     * @var AdapterInterface
-     */
-    private $adapter;
-
-    /**
-     * @var Config
-     */
-    private $config;
+    private Config $config;
 
     /**
-     * @param AdapterInterface  $adapter
-     * @param \League\Flysystem\Config|array|null $config
+     * @param Config|array|null $config
      */
-    public function __construct(AdapterInterface $adapter, $config = null)
+    public function __construct(private readonly AdapterInterface $adapter, $config = null)
     {
         if (!interface_exists(AdapterInterface::class)) {
             throw new \LogicException('You need to install package "league/flysystem" to use this adapter');
         }
 
-        $this->adapter = $adapter;
         $this->config = Util::ensureConfig($config);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function read($key)
+    public function read(string $key): string|bool
     {
         return $this->adapter->read($key)['contents'];
     }
 
     /**
      * {@inheritdoc}
      */
-    public function write($key, $content)
+    public function write(string $key, mixed $content): int|bool
     {
         return $this->adapter->write($key, $content, $this->config);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function exists($key)
+    public function exists(string $key): bool
     {
         return (bool) $this->adapter->has($key);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function keys()
+    public function keys(): array
     {
         return array_map(function ($content) {
             return $content['path'];
@@ -70,7 +61,7 @@ public function keys()
     /**
      * {@inheritdoc}
      */
-    public function listKeys($prefix = '')
+    public function listKeys(string $prefix = ''): array
     {
         $dirs = [];
         $keys = [];
@@ -94,31 +85,31 @@ public function listKeys($prefix = '')
     /**
      * {@inheritdoc}
      */
-    public function mtime($key)
+    public function mtime(string $key): int|bool
     {
         return $this->adapter->getTimestamp($key);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function delete($key)
+    public function delete(string $key): bool
     {
         return $this->adapter->delete($key);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function rename($sourceKey, $targetKey)
+    public function rename(string $sourceKey, string $targetKey): bool
     {
         return $this->adapter->rename($sourceKey, $targetKey);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function isDirectory($key)
+    public function isDirectory(string $key): bool
     {
         throw new UnsupportedAdapterMethodException('isDirectory is not supported by this adapter.');
     }