dependabot-composer 0.129.5 → 0.130.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce4ad47d42658462deff666823ef0e451b2ae722699d96a0aa145c36853d6322
-  data.tar.gz: 12187d65b7e4f1b3108f2e5cc8e57b99f4f9c2f9ee32c58195a1c008aa001708
+  metadata.gz: 5cbe9486ee5ed458a2d3bf2ab51ae24b24f8f880ff460d16e0ee66b9199d66ee
+  data.tar.gz: ac69caf247b603159e8ae3a3c711f1f0f14f525202bba80add8c602e8cb029ae
 SHA512:
-  metadata.gz: 63d2bc7d13cf39dea33f8b0a77ef99cf75f1d33d91b94d2dc8e74247afe201bd3ae5de011f33914f29f05333e3c037d08167b8f6967b83b7c565b0156fe8d0b6
-  data.tar.gz: a9d42d22eb42c399593de2eff88d3beafedae461ff396733d65061527979027523589bf35cc74f596037ba69f56d9f776f8929cdbc068ac38dcafc3a18884c8a
+  metadata.gz: 7365106b9dfa875610c275eb9ca2f26bb2877690a5cacc375535778379d4feed1cfbc322f7c6b7b491579e058f925c2d72e6b44424971616f960d5d123aa2cb8
+  data.tar.gz: 2914b7773cce8f54e735dc3aa08ea7cb777eabf1c34823a8b3d3bdd3be8b10178fe08de70f921c3942b7965fc0315b0a614356a2ae7243092c4b9cc20521ced1

data/helpers/v1/composer.lock

@@ -1838,16 +1838,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "0.12.64",
+            "version": "0.12.66",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa"
+                "reference": "4110a2425c6bd53acbdfcda07885e87b66e9ba3e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa",
-                "reference": "23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/4110a2425c6bd53acbdfcda07885e87b66e9ba3e",
+                "reference": "4110a2425c6bd53acbdfcda07885e87b66e9ba3e",
                 "shasum": ""
             },
             "require": {
@@ -1890,7 +1890,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-21T11:59:02+00:00"
+            "time": "2021-01-11T16:43:15+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.66",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa"
+                "reference": "4110a2425c6bd53acbdfcda07885e87b66e9ba3e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa",
-                "reference": "23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/4110a2425c6bd53acbdfcda07885e87b66e9ba3e",
+                "reference": "4110a2425c6bd53acbdfcda07885e87b66e9ba3e",
                 "shasum": ""
             },
             "require": {
@@ -1935,7 +1935,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-21T11:59:02+00:00"
+            "time": "2021-01-11T16:43:15+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.5
+  version: 0.130.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2021-01-13 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.5
+        version: 0.130.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.129.5
+        version: 0.130.0
 - !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