diff --git a/package_manager/src/ComposerUtility.php b/package_manager/src/ComposerUtility.php index 8b1fcec9dbe6c1a3150f87cee129020ee48f2e52..c8149a1a78baeba6c65c2372dd98d0aaef4128d0 100644 --- a/package_manager/src/ComposerUtility.php +++ b/package_manager/src/ComposerUtility.php @@ -255,12 +255,6 @@ class ComposerUtility { public function getPackageForProject(string $project_name): ?string { $installed = $this->getInstalledPackagesData(); - // If we're lucky, the package name is the project name, prefixed with - // `drupal/`. - if (array_key_exists("drupal/$project_name", $installed)) { - return "drupal/$project_name"; - } - $installed = array_keys($installed); foreach ($installed as $package_name) { if ($this->getProjectForPackage($package_name) === $project_name) { diff --git a/package_manager/tests/fixtures/project_package_conversion/vendor/composer/installed.json b/package_manager/tests/fixtures/project_package_conversion/vendor/composer/installed.json index eecd41db82b95770692cdc4961d659d54fd5684f..216c981a15b7846019cdc299051c0acae7df2d12 100644 --- a/package_manager/tests/fixtures/project_package_conversion/vendor/composer/installed.json +++ b/package_manager/tests/fixtures/project_package_conversion/vendor/composer/installed.json @@ -10,6 +10,11 @@ "version": "6.1.3", "type": "drupal-theme" }, + { + "name": "drupal/not_match_path_project", + "version": "6.1.3", + "type": "drupal-module" + }, { "name": "non_drupal/other_project", "version": "6.1.3", diff --git a/package_manager/tests/fixtures/project_package_conversion/vendor/composer/installed.php b/package_manager/tests/fixtures/project_package_conversion/vendor/composer/installed.php index 303ef1a8e8a8f514215e03dfb8959bf8d080839a..301eb95cf7692d55bb6af6ab3df791ad41310e2d 100644 --- a/package_manager/tests/fixtures/project_package_conversion/vendor/composer/installed.php +++ b/package_manager/tests/fixtures/project_package_conversion/vendor/composer/installed.php @@ -15,6 +15,10 @@ return [ 'type' => 'drupal-module', 'install_path' => $projects_dir . '/not_match_project', ], + 'drupal/not_match_path_project' => [ + 'type' => 'drupal-module', + 'install_path' => $projects_dir . '/not_match_project', + ], 'drupal/nested_no_match_package' => [ 'type' => 'drupal-module', 'install_path' => $projects_dir . '/any_folder_name', diff --git a/package_manager/tests/fixtures/project_package_conversion/web/projects/not_match_path_project/not_match_path_project.info.yml.hide b/package_manager/tests/fixtures/project_package_conversion/web/projects/not_match_path_project/not_match_path_project.info.yml.hide new file mode 100644 index 0000000000000000000000000000000000000000..af58278b9d1bbbf3ebaa06e2733953d5bb67e6f9 --- /dev/null +++ b/package_manager/tests/fixtures/project_package_conversion/web/projects/not_match_path_project/not_match_path_project.info.yml.hide @@ -0,0 +1 @@ +project: not_match_path_project diff --git a/package_manager/tests/src/Kernel/ComposerUtilityTest.php b/package_manager/tests/src/Kernel/ComposerUtilityTest.php index 29023f1d4575b56aa9d6d61618e4724a3338adb6..7741b0b6341c72c22947c9e08b1bb02ecf68a512 100644 --- a/package_manager/tests/src/Kernel/ComposerUtilityTest.php +++ b/package_manager/tests/src/Kernel/ComposerUtilityTest.php @@ -187,6 +187,10 @@ class ComposerUtilityTest extends KernelTestBase { 'not_match_project', 'drupal/not_match_package', ], + 'package and project match + wrong installed path' => [ + 'not_match_path_project', + NULL, + ], 'vendor is not drupal' => [ 'other_project', NULL,