From fcf4aa59d4740b9347c7cb395b2968b8c8e780d1 Mon Sep 17 00:00:00 2001 From: Kunal Sachdev <57170-kunal.sachdev@users.noreply.drupalcode.org> Date: Mon, 27 Feb 2023 14:08:09 +0000 Subject: [PATCH] Issue #3344556 by kunal.sachdev, phenaproxima: Make ComposerInspector::getVersion() private --- package_manager/src/ComposerInspector.php | 4 +--- .../tests/src/Kernel/ComposerInspectorTest.php | 14 -------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/package_manager/src/ComposerInspector.php b/package_manager/src/ComposerInspector.php index 92158f26f0..9c2d5f5a51 100644 --- a/package_manager/src/ComposerInspector.php +++ b/package_manager/src/ComposerInspector.php @@ -229,10 +229,8 @@ class ComposerInspector { * * @throws \UnexpectedValueException * Thrown if the expect data format is not found. - * - * @todo Make this method private in https://drupal.org/i/3344556. */ - public function getVersion(string $working_dir): string { + private function getVersion(string $working_dir): string { $this->runner->run(['--format=json', "--working-dir=$working_dir"], $this->jsonCallback); $data = $this->jsonCallback->getOutputData(); if (isset($data['application']['name']) diff --git a/package_manager/tests/src/Kernel/ComposerInspectorTest.php b/package_manager/tests/src/Kernel/ComposerInspectorTest.php index f45c969b4f..ef7f12f58c 100644 --- a/package_manager/tests/src/Kernel/ComposerInspectorTest.php +++ b/package_manager/tests/src/Kernel/ComposerInspectorTest.php @@ -59,20 +59,6 @@ class ComposerInspectorTest extends PackageManagerKernelTestBase { $inspector->getConfig('extra', $dir); } - /** - * @covers ::getVersion - */ - public function testGetVersion() { - $dir = __DIR__ . '/../../fixtures/fake_site'; - $inspector = $this->container->get('package_manager.composer_inspector'); - $version = $inspector->getVersion($dir); - // We can assert an exact version of Composer, but we can assert that the - // number is in the expected 'MAJOR.MINOR.PATCH' format. - $parts = explode('.', $version); - $this->assertCount(3, $parts); - $this->assertCount(3, array_filter($parts, 'is_numeric')); - } - /** * {@inheritdoc} */ -- GitLab