dependabot-composer 0.98.15 → 0.98.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edb69ccc5b37b511d71ad19133980ca3f8c6af5a908c58cb960b8550bed8c420
-  data.tar.gz: 5dfe9f7929c2adca37b7347ce11b654cc6174a3f3ab7113d20b57b3e6af3af1f
+  metadata.gz: dd7e8ff47d423afb00e3e7019c0ac804e37deb0d7bd7ffa0f5b5ac97bf614335
+  data.tar.gz: 920c9f4ccbc95ffdc1e2a657d87496377e03cfd915ef876a56fa8bbef69b3519
 SHA512:
-  metadata.gz: 295596a3cbbba4c9e9754756aeec51a4f526c8eb71255bfc709d94f7e0df29821a5f6b2206fe87b2d7f74f0065a6538cd5486d60f05495b54e0fed21350dd40d
-  data.tar.gz: e8a76d448d0aa590c929a18922b260e9fd44021ae2a2d7d920563450592e667f82f2e4827e482ce15bc061625e21e4e810cb7d46ae441b520946edd633476fc6
+  metadata.gz: 28accfc3dd3d00903a6291b87fc1f0c52a03c46531efab3487855f6e7f1c47720c2182d0ff8a8e4ee0e7b6a5047fd649e277618a481133a811ce20fc3369a893
+  data.tar.gz: 6103d756d62f11037be891f68ffa1260fd244ad0e68e46c44c816b28a28195a3fe37c334958388c5afe51100364bfc61a47445761fff391e58b2963ba542bef8

data/helpers/bin/run

@@ -11,38 +11,34 @@ require __DIR__ . '/../vendor/autoload.php';
 // and an `args` method, as passed in by UpdateCheckers::Php
 $request = json_decode(file_get_contents('php://stdin'), true);
 
-// Increase the default memory limit. Calling `composer update` is otherwise
-// vulnerable to scenarios where there are unconstrained versions, resulting in
-// it checking huge numbers of dependency combinations and causing OOM issues.
-// This logic is a duplicate of the logic found in Composer
-$memoryInBytes = function ($value) {
-    $unit = strtolower(substr($value, -1, 1));
-    $value = (int) $value;
-    switch ($unit) {
-        case 'g':
+// Increase the default memory limit the same way Composer does (but clearer)
+if (function_exists('ini_set')) {
+    $memoryInBytes = function ($value) {
+        $unit = strtolower(substr($value, -1, 1));
+        $value = (int) $value;
+        if ($unit == 'g') {
+            $value *= (1024 * 1024 * 1024);
+        } elseif ($unit == 'm') {
+            $value *= (1024 * 1024);
+        } elseif ($unit == 'k') {
             $value *= 1024;
-        // no break (cumulative multiplier)
-        case 'm':
-            $value *= 1024;
-        // no break (cumulative multiplier)
-        case 'k':
-            $value *= 1024;
-    }
+        }
 
-    return $value;
-};
+        return $value;
+    };
 
-$memoryLimit = trim(ini_get('memory_limit'));
-// Increase memory_limit if it is lower than 1900MB
-if ($memoryLimit != -1 && $memoryInBytes($memoryLimit) < 1024 * 1024 * 1900) {
-    ini_set('memory_limit', '1900M');
-}
+    $memoryLimit = trim(ini_get('memory_limit'));
+    // Increase memory_limit if it is lower than 1900MB
+    if ($memoryLimit != -1 && $memoryInBytes($memoryLimit) < 1024 * 1024 * 1900) {
+        @ini_set('memory_limit', '1900M');
+    }
 
-// Set user defined memory limit
-if ($memoryLimit = getenv('COMPOSER_MEMORY_LIMIT')) {
-    ini_set('memory_limit', $memoryLimit);
+    // Set user defined memory limit
+    if ($memoryLimit = getenv('COMPOSER_MEMORY_LIMIT')) {
+        @ini_set('memory_limit', $memoryLimit);
+    }
+    unset($memoryInBytes, $memoryLimit);
 }
-unset($memoryInBytes, $memoryLimit);
 
 date_default_timezone_set('Europe/London');
 

data/helpers/src/UpdateChecker.php

@@ -69,11 +69,15 @@ class UpdateChecker
             ->setRunScripts(false);
 
         /*
-         * If a platform is set we assume people know what they are doing and we respect the setting.
-         * If no platform is set we ignore it so that the php we run as doesn't interfere
+         * If a platform is set we assume people know what they are doing and
+         * we respect the setting.
+         * If no platform is set we ignore it so that the php we run as doesn't
+         * interfere with resolution.
          */
         if ($config->get('platform') === []) {
             $install->setIgnorePlatformRequirements(true);
+        } else {
+            $install->setIgnorePlatformRequirements(false);
         }
 
         $install->run();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-composer
 version: !ruby/object:Gem::Version
-  version: 0.98.15
+  version: 0.98.16
 platform: ruby
 authors:
 - Dependabot
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.98.15
+        version: 0.98.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.98.15
+        version: 0.98.16
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement