Merge pull request #129 from adamj88/depends-exclusion

Add negated dependency support

Author: jooname

docs/USAGE_BASIC.md

@@ -150,7 +150,7 @@ to the user when patch is being applied.
 @label <value> (optional) overrides the description above when provided. Otherwise above info used
 @ticket <value> (optional) reference to some issue ID that relates to this fix (added to label)
 @link <value> (optional) url to additional data about this patch (added to label)
-@depends <value> (optional) other/package (make version constraint target another package instead) 
+@depends <value> (optional) other/package (make version constraint target another package instead). Use !other/package to apply patch only when package is NOT installed 
 @version <value> (optional) >=1.1.0 <1.4.0
 @after <value> (optional) Used in case a patch should be applied after another branch
 @before <value> (optional) Used in case a patch should be applied before another branch
@@ -232,6 +232,12 @@ apply correctly.
             "other/package": ">=2.1.7",
             "php": ">=7.1.0"
           }
+        },
+        "applies when unwanted/package is NOT installed": {
+          "source": "example/negated-dependency.patch",
+          "depends": {
+            "!unwanted/package": ">=1.0.0"
+          }
         }
       }
     }

src/Patch/Definition/NormalizerComponents/DependencyComponent.php

@@ -46,6 +46,9 @@ function ($pattern) use ($target) {
             );
         }
 
+        // Handle negated dependencies in JSON config
+        $depends = $this->processNegatedDependencies($depends);
+
         return array(
             PatchDefinition::DEPENDS => $depends
         );
@@ -84,4 +87,21 @@ private function generateDependencyMatchPatterns(array $config)
 
         return $patternValues;
     }
+
+    private function processNegatedDependencies(array $depends)
+    {
+        $processedDepends = array();
+
+        foreach ($depends as $packageName => $version) {
+            // Handle negated dependencies with ! prefix in JSON config
+            if (strpos($packageName, '!') === 0) {
+                $packageName = substr($packageName, 1);
+                $version = array('version' => $version, 'negated' => true);
+            }
+
+            $processedDepends[$packageName] = $version;
+        }
+
+        return $processedDepends;
+    }
 }

src/Patch/DefinitionList/LoaderComponents/ConstraintsComponent.php

@@ -93,55 +93,82 @@ private function resolveComparisonResults(array $patchConstraints, array $packag
     {
         $comparisonResults = array();
 
-        foreach ($patchConstraints as $constraintTarget => $version) {
+        foreach ($patchConstraints as $constraintTarget => $constraint) {
+            // Check if this is a negated dependency (array format)
+            if (is_array($constraint) && isset($constraint['negated']) && $constraint['negated']) {
+                $version = $constraint['version'];
+                $packageExists = isset($packages[$constraintTarget]);
+
+                if (!$packageExists) {
+                    // Package not installed - negated dependency satisfied
+                    $comparisonResults[] = true;
+                    continue;
+                }
+
+                // Package is installed - check if version constraint fails
+                $package = $packages[$constraintTarget];
+                $matchResult = $this->checkVersionConstraint($package, $version, $rootRequires, $constraintTarget);
+                $comparisonResults[] = !$matchResult; // Negate the result
+                continue;
+            }
+
+            // Handle regular string constraints
+            $version = $constraint;
+
             if (!isset($packages[$constraintTarget])) {
                 continue;
             }
 
             $package = $packages[$constraintTarget];
 
-            $packageVersion = $package->getVersion();
-            $packageVersions = array($package->getVersion());
+            $matchResult = $this->checkVersionConstraint($package, $version, $rootRequires, $constraintTarget);
+            $comparisonResults[] = $matchResult;
+        }
 
-            if (isset($rootRequires[$constraintTarget])) {
-                /** @var \Composer\Package\CompletePackageInterface $targetRootPackage */
-                $targetRootPackage = $rootRequires[$constraintTarget];
+        return $comparisonResults;
+    }
 
-                $prettyVersion = $this->packageUtils->getPrettyVersion($targetRootPackage);
+    private function checkVersionConstraint($package, $version, $rootRequires, $constraintTarget)
+    {
+        $packageVersion = $package->getVersion();
+        $packageVersions = array($package->getVersion());
 
-                $matches = array();
-                preg_match('/.* as (.*)$/', $prettyVersion, $matches);
+        if (isset($rootRequires[$constraintTarget])) {
+            /** @var \Composer\Package\CompletePackageInterface $targetRootPackage */
+            $targetRootPackage = $rootRequires[$constraintTarget];
 
-                if (isset($matches[1])) {
-                    $packageVersions[] = $matches[1];
-                }
-            }
+            $prettyVersion = $this->packageUtils->getPrettyVersion($targetRootPackage);
 
-            if ($this->constraintUtils->isDevConstraint($packageVersion)) {
-                $definedVersion = $this->configExtractor->getConfig(
-                    $package,
-                    'version'
-                );
+            $matches = array();
+            preg_match('/.* as (.*)$/', $prettyVersion, $matches);
 
-                $packageVersions[] = $definedVersion;
+            if (isset($matches[1])) {
+                $packageVersions[] = $matches[1];
             }
+        }
 
-            $matchResult = false;
+        if ($this->constraintUtils->isDevConstraint($packageVersion)) {
+            $definedVersion = $this->configExtractor->getConfig(
+                $package,
+                'version'
+            );
 
-            foreach (array_filter($packageVersions) as $packageVersion) {
-                $packageConstraint = $this->versionParser->parseConstraints($packageVersion);
-                $patchConstraint = $this->versionParser->parseConstraints($version);
+            $packageVersions[] = $definedVersion;
+        }
 
-                $matchResult = $patchConstraint->matches($packageConstraint);
+        $matchResult = false;
 
-                if ($matchResult) {
-                    break;
-                }
-            }
+        foreach (array_filter($packageVersions) as $packageVersion) {
+            $packageConstraint = $this->versionParser->parseConstraints($packageVersion);
+            $patchConstraint = $this->versionParser->parseConstraints($version);
 
-            $comparisonResults[] = $matchResult;
+            $matchResult = $patchConstraint->matches($packageConstraint);
+
+            if ($matchResult) {
+                break;
+            }
         }
 
-        return $comparisonResults;
+        return $matchResult;
     }
 }

src/Patch/SourceLoaders/PatchesSearch.php

@@ -269,9 +269,17 @@ private function normalizeDependencies($dependsList)
         $dependsNormalized = array_map(
             function ($item) {
                 $valueParts = explode(':', $item);
+                $packageName = trim(array_shift($valueParts) ?? '');
+                $version = trim(array_shift($valueParts) ?? '') ?: '>=0.0.0';
+
+                // Handle negated dependencies with ! prefix
+                if (strpos($packageName, '!') === 0) {
+                    $packageName = substr($packageName, 1);
+                    $version = array('version' => $version, 'negated' => true);
+                }
 
                 return array(
-                    trim(array_shift($valueParts) ?? '') => trim(array_shift($valueParts) ?? '') ?: '>=0.0.0'
+                    $packageName => $version
                 );
             },
             array_unique($dependsList)