#AC-10721::Investigate the league/flysystem Composer dependencies upgrading to latest version- refactoring for interface declaration

Author: glo05363

app/code/Magento/AwsS3/Driver/AwsS3.php

@@ -20,7 +20,7 @@
 use Magento\Framework\Phrase;
 use Magento\RemoteStorage\Driver\Adapter\MetadataProviderInterface;
 use Magento\RemoteStorage\Driver\DriverException;
-use Magento\RemoteStorage\Driver\RemoteDriverInterface;
+use Magento\RemoteStorage\Driver\ExtendedRemoteDriverInterface;
 use Psr\Log\LoggerInterface;
 use Throwable;
 
@@ -30,7 +30,7 @@
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class AwsS3 implements RemoteDriverInterface
+class AwsS3 implements ExtendedRemoteDriverInterface
 {
     public const TYPE_DIR = 'dir';
     public const TYPE_FILE = 'file';

app/code/Magento/AwsS3/Driver/AwsS3Factory.php

@@ -16,7 +16,7 @@
 use Magento\RemoteStorage\Driver\Adapter\MetadataProviderInterfaceFactory;
 use Magento\RemoteStorage\Driver\DriverException;
 use Magento\RemoteStorage\Driver\DriverFactoryInterface;
-use Magento\RemoteStorage\Driver\RemoteDriverInterface;
+use Magento\RemoteStorage\Driver\ExtendedRemoteDriverInterface;
 use Magento\RemoteStorage\Model\Config;
 
 /**
@@ -90,7 +90,7 @@ public function __construct(
     /**
      * @inheritDoc
      */
-    public function create(): RemoteDriverInterface
+    public function create(): ExtendedRemoteDriverInterface
     {
         try {
             return $this->createConfigured(
@@ -141,7 +141,7 @@ public function createConfigured(
         string $prefix,
         string $cacheAdapter = '',
         array $cacheConfig = []
-    ): RemoteDriverInterface {
+    ): ExtendedRemoteDriverInterface {
         $config = $this->prepareConfig($config);
         $client = new S3Client($config);
         $adapter = new AwsS3V3Adapter($client, $config['bucket'], $prefix);

app/code/Magento/RemoteStorage/Driver/DriverFactoryInterface.php

@@ -16,11 +16,11 @@ interface DriverFactoryInterface
     /**
      * Creates driver from stored config.
      *
-     * @return RemoteDriverInterface
+     * @return ExtendedRemoteDriverInterface
      *
      * @throws DriverException
      */
-    public function create(): RemoteDriverInterface;
+    public function create(): ExtendedRemoteDriverInterface;
 
     /**
      * Creates driver from config.
@@ -29,7 +29,7 @@ public function create(): RemoteDriverInterface;
      * @param string $prefix
      * @param string $cacheAdapter
      * @param array $cacheConfig
-     * @return RemoteDriverInterface
+     * @return ExtendedRemoteDriverInterface
      *
      * @throws DriverException
      */
@@ -38,5 +38,5 @@ public function createConfigured(
         string $prefix,
         string $cacheAdapter = '',
         array $cacheConfig = []
-    ): RemoteDriverInterface;
+    ): ExtendedRemoteDriverInterface;
 }

app/code/Magento/RemoteStorage/Driver/ExtendedRemoteDriverInterface.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained from
+ * Adobe.
+ */
+declare(strict_types=1);
+
+namespace Magento\RemoteStorage\Driver;
+
+use Magento\RemoteStorage\Driver\RemoteDriverInterface;
+
+interface ExtendedRemoteDriverInterface extends RemoteDriverInterface
+{
+    /**
+     * To check if directory exists
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function isDirectoryExists($path): bool;
+}

app/code/Magento/RemoteStorage/Driver/RemoteDriverInterface.php

@@ -21,12 +21,4 @@ interface RemoteDriverInterface extends ExtendedDriverInterface
      * @throws DriverException
      */
     public function test(): void;
-
-    /**
-     * To check if directory exists
-     *
-     * @param string $path
-     * @return bool
-     */
-    public function isDirectoryExists($path): bool;
 }

app/code/Magento/RemoteStorage/Test/Unit/Setup/ConfigOptionsListTest.php

@@ -10,7 +10,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\RemoteStorage\Driver\DriverFactoryInterface;
 use Magento\RemoteStorage\Driver\DriverFactoryPool;
-use Magento\RemoteStorage\Driver\RemoteDriverInterface;
+use Magento\RemoteStorage\Driver\ExtendedRemoteDriverInterface;
 use Magento\RemoteStorage\Setup\ConfigOptionsList;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -86,7 +86,7 @@ public function testValidate(array $input, bool $isDeploymentConfigExists, array
                 ->with($input['remote-storage-driver'])
                 ->willReturn($driverFactoryMock);
 
-            $remoteDriverMock = $this->getMockBuilder(RemoteDriverInterface::class)
+            $remoteDriverMock = $this->getMockBuilder(ExtendedRemoteDriverInterface::class)
                 ->disableOriginalConstructor()
                 ->getMock();