File tree Expand file tree Collapse file tree 3 files changed +7
-12
lines changed
dev/tests/integration/testsuite/Magento/Setup/Model
lib/internal/Magento/Framework Expand file tree Collapse file tree 3 files changed +7
-12
lines changed Original file line number Diff line number Diff line change 6
6
7
7
namespace Magento \Setup \Model ;
8
8
9
+ use Magento \Framework \Composer \ComposerFactory ;
9
10
use Magento \TestFramework \Helper \Bootstrap ;
10
11
use Magento \Framework \Composer \ComposerJsonFinder ;
11
12
use Magento \Framework \Composer \MagentoComposerApplicationFactory ;
@@ -66,9 +67,9 @@ private function setupDirectory($composerDir)
66
67
$ this ->composerInformation = $ this ->objectManager ->create (
67
68
'Magento\Framework\Composer\ComposerInformation ' ,
68
69
[
69
- 'applicationFactory ' => new MagentoComposerApplicationFactory (
70
- $ this ->composerJsonFinder ,
71
- $ this ->directoryList
70
+ 'composerFactory ' => new ComposerFactory (
71
+ $ this ->directoryList ,
72
+ $ this ->composerJsonFinder
72
73
)
73
74
]
74
75
);
Original file line number Diff line number Diff line change @@ -121,7 +121,7 @@ private function getComposerInformation()
121
121
if (!$ this ->composerInformation ) {
122
122
$ directoryList = new DirectoryList (BP );
123
123
$ composerFactory = new ComposerFactory ($ directoryList , $ this ->composerJsonFinder );
124
- $ this ->composerInformation = new ComposerInformation (null , $ composerFactory );
124
+ $ this ->composerInformation = new ComposerInformation ($ composerFactory );
125
125
}
126
126
return $ this ->composerInformation ;
127
127
}
Original file line number Diff line number Diff line change 3
3
* Copyright © 2016 Magento. All rights reserved.
4
4
* See COPYING.txt for license details.
5
5
*/
6
-
7
6
namespace Magento \Framework \Composer ;
8
7
9
- use Composer \IO \BufferIO ;
10
8
use Composer \Package \Link ;
11
9
use Composer \Package \CompletePackageInterface ;
12
- use Magento \Framework \App \Filesystem \DirectoryList ;
13
10
use Magento \Framework \App \ObjectManager ;
14
11
15
12
/**
@@ -92,15 +89,12 @@ class ComposerInformation
92
89
private $ composerFactory ;
93
90
94
91
/**
95
- * @param MagentoComposerApplicationFactory $applicationFactory
96
92
* @param ComposerFactory $composerFactory
97
93
*
98
94
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
99
95
*/
100
- public function __construct (
101
- MagentoComposerApplicationFactory $ applicationFactory = null ,
102
- \Magento \Framework \Composer \ComposerFactory $ composerFactory = null
103
- ) {
96
+ public function __construct (ComposerFactory $ composerFactory )
97
+ {
104
98
$ this ->composerFactory = $ composerFactory ;
105
99
}
106
100
You can’t perform that action at this time.
0 commit comments