From 3072f841ab96369546a6ddb7d0b5d14d84db2c0b Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sat, 2 Nov 2019 07:51:59 +0100
Subject: [PATCH] Issue #3088403 by Mile23, Mixologic: Defensive coding: Vendor
hardening plugin sometimes receives AliasPackage
---
.../VendorHardening/VendorHardeningPlugin.php | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/composer/Plugin/VendorHardening/VendorHardeningPlugin.php b/composer/Plugin/VendorHardening/VendorHardeningPlugin.php
index 71410c4dd6dd..373b0654c8cb 100644
--- a/composer/Plugin/VendorHardening/VendorHardeningPlugin.php
+++ b/composer/Plugin/VendorHardening/VendorHardeningPlugin.php
@@ -7,7 +7,7 @@
use Composer\Installer\PackageEvent;
use Composer\Installer\PackageEvents;
use Composer\IO\IOInterface;
-use Composer\Package\CompletePackage;
+use Composer\Package\BasePackage;
use Composer\Plugin\PluginInterface;
use Composer\Script\Event;
use Composer\Script\ScriptEvents;
@@ -150,13 +150,21 @@ public function onPostPackageUpdate(PackageEvent $event) {
* Where the configured bin files are in the directories to be removed, remove
* the bin config.
*
- * @param \Composer\Package\CompletePackage $package
+ * @param \Composer\Package\BasePackage $package
* The package we're cleaning up.
*/
- protected function removeBinBeforeCleanup(CompletePackage $package) {
- // Only do this if there are binaries and cleanup paths.
+ protected function removeBinBeforeCleanup(BasePackage $package) {
+ // We can process AliasPackage and Package objects, and they share the
+ // BasePackage parent class. However, since there is no common interface for
+ // these package types that allow for the setBinaries() method, and since
+ // BasePackage does not include the setBinaries() method, we have to make
+ // sure we're processing a class with a setBinaries() method.
+ if (!method_exists($package, 'setBinaries')) {
+ return;
+ }
$binaries = $package->getBinaries();
$clean_paths = $this->config->getPathsForPackage($package->getName());
+ // Only do this if there are binaries and cleanup paths.
if (!$binaries || !$clean_paths) {
return;
}
--
GitLab