dependabot-composer 0.129.3 → 0.130.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f73f07592767de723cfd844cdf36783a81b7319371c1051c1c7e22f50d82be0b
-  data.tar.gz: 3dbeba3c9a64e39fb17d7542eee96d5c96da5c39d304234a9bffb65f71e9b352
+  metadata.gz: 3ff0d11ce9d8da233db098f18b7ff0ad6e419d55da4b540a4688934325f16f51
+  data.tar.gz: 8c263e390d8ffc368aac43f5d232386d2912cdf4de57fc8c60860adac88a295a
 SHA512:
-  metadata.gz: 61e597f4eb194d73e85da110581027a064b73924f9abd1567789ceb7fd43c21ff81f9febf581a754fc4e5412300c9666644892cf7383b673cffaa9b4bebdeb41
-  data.tar.gz: 289036bf744c7de9686b3681d1e11e833dc332d167dd7d4975ff816117e0698cf040f9f7f5dad0b1292e0c118a4bc7e3fd4207f95c6f0d4a3b7a883fb245293d
+  metadata.gz: f19e13275d98bffd5243745393bfb3dabc28805c33700111c5534f04fb754814e1958a61a97ddef2a417ad04fff8aa1d7f8af12c8d6df1a5ffb897444f5013b2
+  data.tar.gz: 1b86c7790ddab42c28267b100b0c28fa89603d8da7223df691c6633e82cf6ef143ca08428f64de97d1e5cc2eda8aa1ea176b4a5bc8a47548efdd7ae796d3a2e9

data/helpers/v1/composer.lock

@@ -1838,16 +1838,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "0.12.64",
+            "version": "0.12.68",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa"
+                "reference": "ddbe01af0706ee094c3f1ce9730b35aebb508d3d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa",
-                "reference": "23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ddbe01af0706ee094c3f1ce9730b35aebb508d3d",
+                "reference": "ddbe01af0706ee094c3f1ce9730b35aebb508d3d",
                 "shasum": ""
             },
             "require": {
@@ -1890,7 +1890,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-21T11:59:02+00:00"
+            "time": "2021-01-18T12:29:17+00:00"
         },
         {
             "name": "psr/event-dispatcher",

data/helpers/v2/composer.lock

@@ -1883,16 +1883,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "0.12.64",
+            "version": "0.12.68",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa"
+                "reference": "ddbe01af0706ee094c3f1ce9730b35aebb508d3d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa",
-                "reference": "23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ddbe01af0706ee094c3f1ce9730b35aebb508d3d",
+                "reference": "ddbe01af0706ee094c3f1ce9730b35aebb508d3d",
                 "shasum": ""
             },
             "require": {
@@ -1935,7 +1935,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-21T11:59:02+00:00"
+            "time": "2021-01-18T12:29:17+00:00"
         },
         {
             "name": "psr/event-dispatcher",

data/lib/dependabot/composer/helpers.rb

@@ -10,11 +10,21 @@ module Dependabot
 
       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"]
 
         version = Composer::Version.new(parsed_lockfile["plugin-api-version"])
         version.canonical_segments.first == 1 ? "v1" : "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
+        end
+      end
+      private_class_method :invalid_v2_requirement?
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-composer
 version: !ruby/object:Gem::Version
-  version: 0.129.3
+  version: 0.130.2
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2021-01-19 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.129.3
+        version: 0.130.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.129.3
+        version: 0.130.2
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   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.1.4
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: PHP (Composer) support for dependabot