Skip to content

Commit e63ebb7

Browse files
committed
Merge remote-tracking branch 'origin/MAGETWO-17292-Move-Io-Sftp' into develop
2 parents 7ec8535 + abef855 commit e63ebb7

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@
305305
'Magento\Core\Model\Design\PackageInterface',
306306
'Magento\Framework\View\Asset\MergeService'
307307
],
308-
['cleanVarFolder', '', 'Magento\Framework\Io\File::rmdirRecursive()'],
308+
['cleanVarFolder', '', 'Magento\Framework\Filesystem\Io\File::rmdirRecursive()'],
309309
[
310310
'cleanVarSubFolders',
311311
'',

dev/tests/unit/testsuite/Magento/Framework/App/ObjectManagerFactoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public static function tearDownAfterClass()
3434
spl_autoload_register($autoloadFunction);
3535
}
3636
set_include_path(self::$originalIncludePath);
37-
\Magento\Framework\Io\File::rmdirRecursive(__DIR__ . '/_files/var/');
37+
\Magento\Framework\Filesystem\Io\File::rmdirRecursive(__DIR__ . '/_files/var/');
3838
}
3939

4040
/**

lib/internal/Magento/Framework/Io/AbstractIo.php renamed to lib/internal/Magento/Framework/Filesystem/Io/AbstractIo.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Magento\Framework\Io;
7+
namespace Magento\Framework\Filesystem\Io;
88

99
/**
1010
* Install and upgrade client abstract class

lib/internal/Magento/Framework/Io/File.php renamed to lib/internal/Magento/Framework/Filesystem/Io/File.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © 2015 Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Framework\Io;
6+
namespace Magento\Framework\Filesystem\Io;
77

88
/**
99
* Filesystem client

lib/internal/Magento/Framework/Io/Ftp.php renamed to lib/internal/Magento/Framework/Filesystem/Io/Ftp.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © 2015 Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Framework\Io;
6+
namespace Magento\Framework\Filesystem\Io;
77

88
/**
99
* FTP client

lib/internal/Magento/Framework/Io/IoException.php renamed to lib/internal/Magento/Framework/Filesystem/Io/IoException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
namespace Magento\Framework\Io;
7+
namespace Magento\Framework\Filesystem\Io;
88

99
/**
1010
* Io exception

lib/internal/Magento/Framework/Io/IoInterface.php renamed to lib/internal/Magento/Framework/Filesystem/Io/IoInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © 2015 Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Framework\Io;
6+
namespace Magento\Framework\Filesystem\Io;
77

88
/**
99
* Input/output client interface

lib/internal/Magento/Framework/Io/Sftp.php renamed to lib/internal/Magento/Framework/Filesystem/Io/Sftp.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66

77
// @codingStandardsIgnoreFile
88

9-
namespace Magento\Framework\Io;
9+
namespace Magento\Framework\Filesystem\Io;
1010

1111
/**
1212
* Sftp client interface
1313
*
1414
* @link http://www.php.net/manual/en/function.ssh2-connect.php
1515
*/
1616
require_once 'phpseclib/Net/SFTP.php';
17-
class Sftp extends AbstractIo implements IoInterface
17+
class Sftp extends AbstractIo
1818
{
1919
const REMOTE_TIMEOUT = 10;
2020

0 commit comments

Comments
 (0)