dependabot-composer 0.130.2 → 0.130.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ff0d11ce9d8da233db098f18b7ff0ad6e419d55da4b540a4688934325f16f51
-  data.tar.gz: 8c263e390d8ffc368aac43f5d232386d2912cdf4de57fc8c60860adac88a295a
+  metadata.gz: f12166d2e05b5890fe2ff233b25aea5d130090d99878a341d4ac295da986b7e2
+  data.tar.gz: 6a837db7643f74f7202629151218d23b9fb39852de41773bee5c587b4a503768
 SHA512:
-  metadata.gz: f19e13275d98bffd5243745393bfb3dabc28805c33700111c5534f04fb754814e1958a61a97ddef2a417ad04fff8aa1d7f8af12c8d6df1a5ffb897444f5013b2
-  data.tar.gz: 1b86c7790ddab42c28267b100b0c28fa89603d8da7223df691c6633e82cf6ef143ca08428f64de97d1e5cc2eda8aa1ea176b4a5bc8a47548efdd7ae796d3a2e9
+  metadata.gz: 1592b144516035f747cf1add393a3db1d7c4d05ddde1d61f1457db0f8ef05b263328ef7d62c0698db86ead36410fe19b4808c44856d85b9a229515146fd26ed6
+  data.tar.gz: c07d99fb3fa07a1fd6e7e63533d3cffbf6f1076cdccc8b8b298046a717f16028cbeb64265b6dc665ef70f6d81f3e3bb12d1daaeee1147bd0e42e7e82c26b50d2

data/lib/dependabot/composer/helpers.rb

@@ -7,21 +7,29 @@ module Dependabot
     module Helpers
       # From composers json-schema: https://getcomposer.org/schema.json
       COMPOSER_V2_NAME_REGEX = %r{^[a-z0-9]([_.-]?[a-z0-9]+)*/[a-z0-9](([_.]?|-{0,2})[a-z0-9]+)*$}.freeze
+      # From https://github.com/composer/composer/blob/b7d770659b4e3ef21423bd67ade935572913a4c1/src/Composer/Repository/PlatformRepository.php#L33
+      PLATFORM_PACKAGE_REGEX = /
+        ^(?:php(?:-64bit|-ipv6|-zts|-debug)?|hhvm|(?:ext|lib)-[a-z0-9](?:[_.-]?[a-z0-9]+)*
+        |composer-(?:plugin|runtime)-api)$
+      /x.freeze
 
       def self.composer_version(composer_json, parsed_lockfile = nil)
-        return "v1" if composer_json["name"] && composer_json["name"] !~ COMPOSER_V2_NAME_REGEX
-        return "v1" if invalid_v2_requirement?(composer_json)
-        return "v2" unless parsed_lockfile && parsed_lockfile["plugin-api-version"]
+        if parsed_lockfile && parsed_lockfile["plugin-api-version"]
+          version = Composer::Version.new(parsed_lockfile["plugin-api-version"])
+          return version.canonical_segments.first == 1 ? "v1" : "v2"
+        else
+          return "v1" if composer_json["name"] && composer_json["name"] !~ COMPOSER_V2_NAME_REGEX
+          return "v1" if invalid_v2_requirement?(composer_json)
+        end
 
-        version = Composer::Version.new(parsed_lockfile["plugin-api-version"])
-        version.canonical_segments.first == 1 ? "v1" : "v2"
+        "v2"
       end
 
       def self.invalid_v2_requirement?(composer_json)
         return false unless composer_json.key?("require")
 
         composer_json["require"].keys.any? do |key|
-          key != "php" && key !~ COMPOSER_V2_NAME_REGEX
+          key !~ PLATFORM_PACKAGE_REGEX && key !~ COMPOSER_V2_NAME_REGEX
         end
       end
       private_class_method :invalid_v2_requirement?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-composer
 version: !ruby/object:Gem::Version
-  version: 0.130.2
+  version: 0.130.3
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-01-26 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.130.2
+        version: 0.130.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.130.2
+        version: 0.130.3
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.0
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: PHP (Composer) support for dependabot