Fix ftp testing

Author: papac

phpunit.dist.xml

@@ -13,6 +13,6 @@
         <env name="FTP_PASSWORD" value="password"/>
         <env name="FTP_USERNAME" value="username"/>
         <env name="FTP_PORT" value="21"/>
-        <env name="FTP_ROOT" value="."/>
+        <env name="FTP_ROOT" value="/tmp"/>
     </php>
 </phpunit>

src/Storage/Service/FTPService.php

@@ -94,7 +94,7 @@ private function __construct(array $config)
     {
         $this->validateConfiguration($config);
         $this->config = $this->normalizeConfiguration($config);
-        $this->use_passive_mode = (bool)($this->config[self::CONFIG_PASSIVE] ?? self::DEFAULT_PASSIVE);
+        $this->use_passive_mode = (bool) ($this->config[self::CONFIG_PASSIVE] ?? self::DEFAULT_PASSIVE);
 
         $this->connect();
     }
@@ -147,9 +147,9 @@ public function connect(): void
         }
 
         $host = $this->config[self::CONFIG_HOSTNAME];
-        $port = (int)$this->config[self::CONFIG_PORT];
-        $timeout = (int)$this->config[self::CONFIG_TIMEOUT];
-        $use_tls = (bool)$this->config[self::CONFIG_TLS];
+        $port = (int) $this->config[self::CONFIG_PORT];
+        $timeout = (int) $this->config[self::CONFIG_TIMEOUT];
+        $use_tls = (bool) $this->config[self::CONFIG_TLS];
 
         $connection = $this->attemptConnection($host, $port, $timeout, $use_tls);
 
@@ -171,7 +171,6 @@ public function connect(): void
             $this->login();
             $this->changePath();
             $this->activePassiveMode();
-            $this->is_connected = true;
         } catch (RuntimeException $e) {
             $this->disconnect();
             throw $e;
@@ -251,7 +250,6 @@ public function disconnect(): void
     {
         if ($this->connection !== null) {
             @ftp_close($this->connection);
-            $this->is_connected = false;
         }
     }
 
@@ -283,7 +281,7 @@ public function changePath(?string $path = null): void
      */
     private function ensureConnection(): void
     {
-        if (!$this->is_connected || $this->connection === null) {
+        if ($this->connection === null) {
             throw new RuntimeException('FTP connection is not established');
         }
     }

src/Storage/Storage.php

@@ -99,7 +99,7 @@ public static function configure(array $config): FilesystemInterface
         static::$config = $config;
 
         if (is_null(static::$disk)) {
-            static::$disk = static::disk($config['disk']['mount']);
+            static::$disk = static::local($config['disk']['mount']);
         }
 
         return static::$disk;
@@ -130,12 +130,26 @@ public static function local(?string $disk = null): DiskFilesystemService
 
         $config = static::$config['disk']['path'][$disk];
 
+        if (is_null($config)) {
+            throw new DiskNotFoundException('The ' . $disk . ' disk is not define.');
+        }
+
+        if (!is_dir($config)) {
+            // Try to create the directory
+            if (!mkdir($config, 0755, true)) {
+                throw new DiskNotFoundException('The ' . $disk . ' disk directory does not exist.');
+            }
+        }
+
         return static::$disk = new DiskFilesystemService($config);
     }
 
     /**
      * Mount disk
-     * @deprecated version
+     * 
+     * @param string|null $disk
+     * @return DiskFilesystemService
+     * @throws DiskNotFoundException
      */
     public static function disk(?string $disk = null): DiskFilesystemService
     {

tests/Filesystem/FTPServiceTest.php

@@ -20,6 +20,16 @@ public static function setUpBeforeClass(): void
         Storage::configure($config["storage"]);
     }
 
+    protected function setUp(): void
+    {
+        $this->ftp_service = Storage::service('ftp');
+    }
+
+    protected function tearDown(): void
+    {
+        $this->ftp_service->changePath();
+    }
+
     public function test_the_connection()
     {
         $this->assertInstanceOf(FTPService::class, $this->ftp_service);
@@ -59,8 +69,8 @@ private function createFile(FTPService $ftp_service, $filename, $content = ''):
 
     public function test_file_should_not_be_existe()
     {
-        $this->expectException(\Bow\Storage\Exception\ResourceException::class);
-        $this->ftp_service->get('dummy.txt');
+        $this->expectException(\InvalidArgumentException::class);
+        $this->ftp_service->get('');
     }
 
     public function test_create_the_new_file_and_the_content()
@@ -77,8 +87,7 @@ public function test_delete_file_from_ftp_service()
         $result = $this->ftp_service->delete($file_name);
 
         $this->assertTrue($result);
-        $this->expectException(\Bow\Storage\Exception\ResourceException::class);
-        $this->ftp_service->get($file_name);
+        $this->assertEmpty($this->ftp_service->get($file_name));
     }
 
     public function test_rename_file()
@@ -180,14 +189,4 @@ public function test_put_content_into_file()
 
         $this->assertTrue(true);
     }
-
-    protected function setUp(): void
-    {
-        $this->ftp_service = Storage::service('ftp');
-    }
-
-    protected function tearDown(): void
-    {
-        $this->ftp_service->changePath();
-    }
 }