dependabot-composer 0.111.54 → 0.111.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a32770823cb9f92d315079703028191fe7b8ff1cbefbf98d5c3ecaaf286b4f3
-  data.tar.gz: 15b49d88abbe460fc47a45ed7aa35396ce3743107b37d5bf8e8428f61aac660c
+  metadata.gz: fe47592ab00b6f540a8b83441daabf7f79a09f349e67e030d0bd811fb1ee1099
+  data.tar.gz: 652051d720e65987e5699743cd79e629d759e4678d0476c4b9efa557e79e0088
 SHA512:
-  metadata.gz: e4f4462196576304e6b1e0d0c52711aaa641d6c98c0570c0dd29d4601205fb4df5af7eb90afa60829873f97e63247d8fc998b735aadc9b6c9207b02f9e50fd81
-  data.tar.gz: 4d0c01a80fbe729f46db9d9ae14abc41f5cae361267acfcbc1d210477a01a0272f447cb30f1437f0c90d28ded83bb2c76b64a082fba42ef118e16248ebd0a1dc
+  metadata.gz: 0d6c07aab04b35e0ac0961b11563c6b8a3aba509a12ebfd006c46e1be3bf55c93404ea378bb9d0a482c34e43f1fa55f6194747da4113d48e1907a1a602a22ee9
+  data.tar.gz: dd69bd32d4fd27f43cbc04d97c79a38247f33aaab63363b30fc892c0f2b1ffe7f6a2213e516f8f49193287656a0764987c3705079c5ff4b6e31c7ddbcb1cf3cc

data/lib/dependabot/composer/file_updater/lockfile_updater.rb

@@ -23,6 +23,9 @@ module Dependabot
           end
         end
 
+        MISSING_PLATFORM_REQ_REGEX =
+          /\sext\-.*? .*?\s(?=[^\d])|(?<=requires )php .*?\s(?=[^\d])/.freeze
+
         def initialize(dependencies:, dependency_files:, credentials:)
           @dependencies = dependencies
           @dependency_files = dependency_files
@@ -112,9 +115,9 @@ module Dependabot
           if error.message.include?("package requires php") ||
              error.message.include?("requested PHP extension")
             missing_extensions =
-              error.message.scan(/\sext\-.*? .*?\s|(?<=requires )php .*?\s/).
+              error.message.scan(MISSING_PLATFORM_REQ_REGEX).
               map do |extension_string|
-                name, requirement = extension_string.strip.split(" ")
+                name, requirement = extension_string.strip.split(" ", 2)
                 { name: name, requirement: requirement }
               end
             raise MissingExtensions, missing_extensions

data/lib/dependabot/composer/update_checker/version_resolver.rb

@@ -21,6 +21,8 @@ module Dependabot
           end
         end
 
+        MISSING_PLATFORM_REQ_REGEX =
+          /\sext\-.*? .*?\s(?=[^\d])|(?<=requires )php .*?\s(?=[^\d])/.freeze
         VERSION_REGEX = /[0-9]+(?:\.[A-Za-z0-9\-_]+)*/.freeze
         SOURCE_TIMED_OUT_REGEX =
           /The "(?<url>[^"]+packages\.json)".*timed out/.freeze
@@ -185,9 +187,9 @@ module Dependabot
           elsif error.message.include?("package requires php") ||
                 error.message.include?("requested PHP extension")
             missing_extensions =
-              error.message.scan(/\sext\-.*? .*?\s|(?<=requires )php .*?\s/).
+              error.message.scan(MISSING_PLATFORM_REQ_REGEX).
               map do |extension_string|
-                name, requirement = extension_string.strip.split(" ")
+                name, requirement = extension_string.strip.split(" ", 2)
                 { name: name, requirement: requirement }
               end
             raise MissingExtensions, missing_extensions

metadata

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