Skip to content

Commit b4d2dc9

Browse files
MAGETWO-51566: Magento version is not updated after code update
- make ComposerFactory a required parameter for ComposerInformation
1 parent 40491b7 commit b4d2dc9

File tree

3 files changed

+7
-12
lines changed

3 files changed

+7
-12
lines changed

dev/tests/integration/testsuite/Magento/Setup/Model/UpdatePackagesCacheTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace Magento\Setup\Model;
88

9+
use Magento\Framework\Composer\ComposerFactory;
910
use Magento\TestFramework\Helper\Bootstrap;
1011
use Magento\Framework\Composer\ComposerJsonFinder;
1112
use Magento\Framework\Composer\MagentoComposerApplicationFactory;
@@ -66,9 +67,9 @@ private function setupDirectory($composerDir)
6667
$this->composerInformation = $this->objectManager->create(
6768
'Magento\Framework\Composer\ComposerInformation',
6869
[
69-
'applicationFactory' => new MagentoComposerApplicationFactory(
70-
$this->composerJsonFinder,
71-
$this->directoryList
70+
'composerFactory' => new ComposerFactory(
71+
$this->directoryList,
72+
$this->composerJsonFinder
7273
)
7374
]
7475
);

lib/internal/Magento/Framework/App/ProductMetadata.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ private function getComposerInformation()
121121
if (!$this->composerInformation) {
122122
$directoryList = new DirectoryList(BP);
123123
$composerFactory = new ComposerFactory($directoryList, $this->composerJsonFinder);
124-
$this->composerInformation = new ComposerInformation(null, $composerFactory);
124+
$this->composerInformation = new ComposerInformation($composerFactory);
125125
}
126126
return $this->composerInformation;
127127
}

lib/internal/Magento/Framework/Composer/ComposerInformation.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,10 @@
33
* Copyright © 2016 Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
76
namespace Magento\Framework\Composer;
87

9-
use Composer\IO\BufferIO;
108
use Composer\Package\Link;
119
use Composer\Package\CompletePackageInterface;
12-
use Magento\Framework\App\Filesystem\DirectoryList;
1310
use Magento\Framework\App\ObjectManager;
1411

1512
/**
@@ -92,15 +89,12 @@ class ComposerInformation
9289
private $composerFactory;
9390

9491
/**
95-
* @param MagentoComposerApplicationFactory $applicationFactory
9692
* @param ComposerFactory $composerFactory
9793
*
9894
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
9995
*/
100-
public function __construct(
101-
MagentoComposerApplicationFactory $applicationFactory = null,
102-
\Magento\Framework\Composer\ComposerFactory $composerFactory = null
103-
) {
96+
public function __construct(ComposerFactory $composerFactory)
97+
{
10498
$this->composerFactory = $composerFactory;
10599
}
106100

0 commit comments

Comments
 (0)