dependabot-composer 0.112.2 → 0.112.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e02cb47c4ca5f993daba566bec5bb5660fee24982e4f7783bf02a8675ee6009c
-  data.tar.gz: 8fea50518991dd7996f06a4781d231ae5bac20c234fa74bcd20c4b445ecc0943
+  metadata.gz: 595ceeaf8a8c895f03cf3465f0d2f5c6f06d3ecfe02419292dfddf3b9166ad92
+  data.tar.gz: c1023fb95bf5a8fd812e0766d73d53c7ccb8a5c5c7313ee39e6bbe119943e5cf
 SHA512:
-  metadata.gz: 9e85aeb928de67ffb5740b26cc1abc14efa69a30e2a362f3d2ff9a0d02f22399e215f623b9f6c91c3a4fa2f315d4e77cd023e3b3e775b54cbd2fe3b1d6b71cd1
-  data.tar.gz: c92121c7810026fbef9fcac75889a2addff4285bacae6c56870663aa1ec5e50d1e4e8e66a6671eee14f901f517dfa8cbf015522525cacdf72dabe74e64e39b33
+  metadata.gz: 0e48de800d7723a5320cb392e566e438b0eb8b1655d291aacbf1c0103f79d0e4f71c6b4d50e4174bcc50a618be552d877f159287cd97a527b06a5c85faf6f758
+  data.tar.gz: d5c25385d296e7803eb229e971a82923b1629d7852a9987495be7507e3cc220cc2b4b469c7507a86dcd2bec503d7291d4480c4bc20564943718d0569e3f5ef0e

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

@@ -24,7 +24,10 @@ module Dependabot
         end
 
         MISSING_PLATFORM_REQ_REGEX =
-          /\sext\-.*? .*?\s(?=[^\d])|(?<=requires )php .*?\s(?=[^\d])/.freeze
+          /
+            \sext\-.*?\s.*?\s(?=[^\d])|
+            (?<=requires\s)php(?:\-[^\s]+)?\s.*?\s(?=[^\d])
+          /x.freeze
 
         def initialize(dependencies:, dependency_files:, credentials:)
           @dependencies = dependencies

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

@@ -23,7 +23,10 @@ module Dependabot
         end
 
         MISSING_PLATFORM_REQ_REGEX =
-          /\sext\-.*? .*?\s(?=[^\d])|(?<=requires )php .*?\s(?=[^\d])/.freeze
+          /
+            \sext\-.*?\s.*?\s(?=[^\d])|
+            (?<=requires\s)php(?:\-[^\s]+)?\s.*?\s(?=[^\d])
+          /x.freeze
         VERSION_REGEX = /[0-9]+(?:\.[A-Za-z0-9\-_]+)*/.freeze
         SOURCE_TIMED_OUT_REGEX =
           /The "(?<url>[^"]+packages\.json)".*timed out/.freeze
@@ -268,6 +271,17 @@ module Dependabot
 
           true
         rescue SharedHelpers::HelperSubprocessFailed => e
+          if e.message.include?("requires php") ||
+             e.message.include?("requested PHP extension")
+            missing_extensions =
+              e.message.scan(MISSING_PLATFORM_REQ_REGEX).
+              map do |extension_string|
+                name, requirement = extension_string.strip.split(" ", 2)
+                { name: name, requirement: requirement }
+              end
+            raise MissingExtensions, missing_extensions
+          end
+
           raise Dependabot::DependencyFileNotResolvable, e.message
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-composer
 version: !ruby/object:Gem::Version
-  version: 0.112.2
+  version: 0.112.3
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-14 00:00:00.000000000 Z
+date: 2019-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.112.2
+        version: 0.112.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.112.2
+        version: 0.112.3
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement